git-svn-id:...

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

Word/Drawing/Externals.js

@@ -744,11 +744,11 @@ function CFontInfo(sName, thumbnail, type, indexR, faceIndexR, indexI, faceIndex
         fontManager.m_oGlyphString.ResetCTM();
 		if (undefined !== transform)
         {
-            fontManager.m_pFont.SetTextMatrix(transform.sx,transform.shy,transform.shx,transform.sy,transform.tx,transform.ty);
+            fontManager.SetTextMatrix(transform.sx,transform.shy,transform.shx,transform.sy,transform.tx,transform.ty);
         }
         else
         {
-            fontManager.m_pFont.SetTextMatrix(1, 0, 0, 1, 0, 0);
+            fontManager.SetTextMatrix(1, 0, 0, 1, 0, 0);
         }
 
         fontManager.AfterLoad();

Word/Drawing/Graphics.js

@@ -1090,8 +1090,8 @@ CGraphics.prototype =
 
         g_font_infos[font.FontFamily.Index].LoadFont(g_font_loader, this.m_oFontManager, font.FontSize, oFontStyle, this.m_dDpiX, this.m_dDpiY, this.m_oTransform);
 
-        this.m_oFontManager.SetTextMatrix(this.m_oTransform.sx,this.m_oTransform.shy,this.m_oTransform.shx,
-            this.m_oTransform.sy,this.m_oTransform.tx,this.m_oTransform.ty);
+        //this.m_oFontManager.SetTextMatrix(this.m_oTransform.sx,this.m_oTransform.shy,this.m_oTransform.shx,
+        //    this.m_oTransform.sy,this.m_oTransform.tx,this.m_oTransform.ty);
     },
 
     SetTextPr : function(textPr)
@@ -1191,8 +1191,8 @@ CGraphics.prototype =
             g_font_infos[_lastFont.SetUpIndex].LoadFont(g_font_loader, this.m_oFontManager, _lastFont.SetUpSize, _lastFont.SetUpStyle, this.m_dDpiX, this.m_dDpiY, this.m_oTransform);
         }
 
-        this.m_oFontManager.SetTextMatrix(this.m_oTransform.sx,this.m_oTransform.shy,this.m_oTransform.shx,
-            this.m_oTransform.sy,this.m_oTransform.tx,this.m_oTransform.ty);
+        //this.m_oFontManager.SetTextMatrix(this.m_oTransform.sx,this.m_oTransform.shy,this.m_oTransform.shx,
+        //    this.m_oTransform.sy,this.m_oTransform.tx,this.m_oTransform.ty);
     },
 
     GetTextPr : function()