git-svn-id:...

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

Word/Drawing/HtmlPage.js

@@ -851,6 +851,9 @@ function CEditorPage(api)
         // нужно проверить режим и сбросить кеш грамотно (ie version)
         g_fontManager.ClearRasterMemory();
 
+        if (window.g_fontManager2 !== undefined && window.g_fontManager2 !== null)
+            window.g_fontManager2.ClearRasterMemory();
+
         var oWordControl = oThis;
 
         oWordControl.m_bIsRePaintOnScroll = false;
@@ -3117,6 +3120,9 @@ function CEditorPage(api)
         {
             this.m_oDrawingDocument.ClearCachePages();
             g_fontManager.ClearFontsRasterCache();
+
+            if (window.g_fontManager2 !== undefined && window.g_fontManager2 !== null)
+                window.g_fontManager2.ClearFontsRasterCache();
         }
 
         return bFlag;

Word/Editor/GraphicObjects/ObjectTypes/WordShape.js

@@ -1982,7 +1982,6 @@ WordShape.prototype =
 
                 graphics.SetIntegerGrid(false);
                 graphics.transform3(this.transformText, true);
-
             }
             else
             {
@@ -1991,7 +1990,8 @@ WordShape.prototype =
                 graphics.transform3(this.transformText, true);
                 graphics.AddClipRect(clip_rect.x, clip_rect.y, clip_rect.w, clip_rect.h);
             }
-           /* if (_rect != null)
+            /*
+            if (_rect != null)
             {
                 graphics.SaveGrState();
                 // TODO: !!!
@@ -1999,10 +1999,18 @@ WordShape.prototype =
                 var l_ins = typeof body_pr.lIns === "number" ? body_pr.lIns : 2.54;
                 var t_ins = typeof body_pr.tIns === "number" ? body_pr.tIns : 1.27;
                 graphics.AddClipRect(-(l_ins), -(t_ins ), _rect.w, _rect.h );
-            }            */
+            }
+            */
             var result_page_index = typeof pageIndex === "number" ? pageIndex : this.pageIndex;
+
+            if (graphics.CheckUseFonts2 !== undefined)
+                graphics.CheckUseFonts2(this.transformText);
+
             this.textBoxContent.Draw(result_page_index, graphics);
 
+            if (graphics.UncheckUseFonts2 !== undefined)
+                graphics.UncheckUseFonts2();
+
             if(typeof pageIndex === "number")
             {
                 this.textBoxContent.Set_StartPage(old_start_page);

Word/api.js

@@ -2564,6 +2564,9 @@ asc_docs_api.prototype.SetFontRenderingMode = function(mode)
     this.WordControl.m_oDrawingDocument.ClearCachePages();
     g_fontManager.ClearFontsRasterCache();
 
+    if (window.g_fontManager2 !== undefined && window.g_fontManager2 !== null)
+        window.g_fontManager2.ClearFontsRasterCache();
+
     if (this.bInit_word_control)
         this.WordControl.OnScroll();
 }