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

Common/FontsFreeType/FontManager.js

@@ -1447,6 +1447,18 @@ function CFontManager()
 
         return true;
     }
+
+    this.SetTextMatrix2 = function(fA, fB, fC, fD, fE, fF)
+    {
+        if (!this.m_pFont)
+            return false;
+
+        this.m_pFont.SetTextMatrix (fA, fB, fC, fD, 0, 0);
+        this.m_oGlyphString.SetCTM(fA, fB, fC, fD, 0, 0);
+        this.m_oGlyphString.SetTrans(fE, fF);
+
+        return true;
+    }
 	
 	this.SetStringGID = function(bStringGID)
 	{

Word/Drawing/Externals.js

@@ -746,9 +746,9 @@ function CFontInfo(sName, thumbnail, type, indexR, faceIndexR, indexI, faceIndex
         pFontFile.SetCharSpacing(fontManager.m_fCharSpacing);
 
         fontManager.m_oGlyphString.ResetCTM();
-		if (undefined !== transform)
+        if (undefined !== transform)
         {
-            fontManager.SetTextMatrix(transform.sx,transform.shy,transform.shx,transform.sy,transform.tx,transform.ty);
+            fontManager.SetTextMatrix2(transform.sx,transform.shy,transform.shx,transform.sy,transform.tx,transform.ty);
         }
         else
         {

Word/Drawing/Graphics.js

@@ -1091,7 +1091,7 @@ CGraphics.prototype =
         this.m_oLastFont.SetUpSize = font.FontSize;
         this.m_oLastFont.SetUpStyle = oFontStyle;
 
-        g_font_infos[font.FontFamily.Index].LoadFont(g_font_loader, this.m_oFontManager, font.FontSize, oFontStyle, this.m_dDpiX, this.m_dDpiY, undefined/*this.m_oTransform*/);
+        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);
 
         var _mD = this.m_oLastFont.SetUpMatrix;
         var _mS = this.m_oTransform;
@@ -1103,8 +1103,8 @@ CGraphics.prototype =
         _mD.tx = _mS.tx;
         _mD.ty = _mS.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);
+        //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)