печать для chromium версии

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@62325 954022d7-b5bf-4e40-9824-e11837661b57

Excel/api.js

@@ -3564,7 +3564,7 @@ var ASC_DOCS_API_USE_EMBEDDED_FONTS = "@@ASC_DOCS_API_USE_EMBEDDED_FONTS";
                 {
                     var pagescount = _printer.DocumentRenderer.m_lPagesCount;
 
-                    window["AscDesktopEditor"]["Print_Start"](this.documentUrl, pagescount);
+                    window["AscDesktopEditor"]["Print_Start"](this.documentUrl, pagescount, "");
 
                     for (var i = 0; i < pagescount; i++)
                     {
@@ -3573,7 +3573,8 @@ var ASC_DOCS_API_USE_EMBEDDED_FONTS = "@@ASC_DOCS_API_USE_EMBEDDED_FONTS";
                         if (i != (pagescount - 1))
                             _end = _printer.DocumentRenderer.m_arrayPages[i + 1].StartOffset;
 
-                        window["AscDesktopEditor"]["Print_Page"](oDocRenderer.Memory.GetBase64Memory2(_start, _end - _start));
+                        window["AscDesktopEditor"]["Print_Page"](oDocRenderer.Memory.GetBase64Memory2(_start, _end - _start),
+                            _printer.DocumentRenderer.m_arrayPages[i].Width, _printer.DocumentRenderer.m_arrayPages[i].Height);
                     }
 
                     window["AscDesktopEditor"]["Print_End"]();

PowerPoint/api.js

@@ -5556,7 +5556,7 @@ window["asc_docs_api"].prototype["asc_nativePrint"] = function(_printer, _page)
             var _drawing_document = this.WordControl.m_oDrawingDocument;
             var pagescount = _drawing_document.SlidesCount;
 
-            window["AscDesktopEditor"]["Print_Start"](this.DocumentUrl, pagescount);
+            window["AscDesktopEditor"]["Print_Start"](this.DocumentUrl, pagescount, this.ThemeLoader.ThemesUrl);
 
             var oDocRenderer = new CDocumentRenderer();
             oDocRenderer.VectorMemoryForPrint = new CMemory();
@@ -5573,7 +5573,7 @@ window["asc_docs_api"].prototype["asc_nativePrint"] = function(_printer, _page)
                 this.WordControl.m_oLogicDocument.DrawPage(i, oDocRenderer);
                 oDocRenderer.EndPage();
 
-                window["AscDesktopEditor"]["Print_Page"](oDocRenderer.Memory.GetBase64Memory());
+                window["AscDesktopEditor"]["Print_Page"](oDocRenderer.Memory.GetBase64Memory(), _drawing_document.m_oLogicDocument.Width, _drawing_document.m_oLogicDocument.Height);
             }
 
             if (0 == pagescount)

Word/api.js

@@ -7711,7 +7711,7 @@ window["asc_docs_api"].prototype["asc_nativePrint"] = function(_printer, _page)
             var _drawing_document = this.WordControl.m_oDrawingDocument;
             var pagescount = Math.min(_drawing_document.m_lPagesCount, _drawing_document.m_lCountCalculatePages);
 
-            window["AscDesktopEditor"]["Print_Start"](this.DocumentUrl, pagescount);
+            window["AscDesktopEditor"]["Print_Start"](this.DocumentUrl, pagescount, "");
 
             var oDocRenderer = new CDocumentRenderer();
             oDocRenderer.VectorMemoryForPrint = new CMemory();
@@ -7728,7 +7728,7 @@ window["asc_docs_api"].prototype["asc_nativePrint"] = function(_printer, _page)
                 this.WordControl.m_oLogicDocument.DrawPage(i, oDocRenderer);
                 oDocRenderer.EndPage();
 
-                window["AscDesktopEditor"]["Print_Page"](oDocRenderer.Memory.GetBase64Memory());
+                window["AscDesktopEditor"]["Print_Page"](oDocRenderer.Memory.GetBase64Memory(), page.width_mm, page.height_mm);
             }
 
             this.ShowParaMarks = bOldShowMarks;