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

PowerPoint/Editor/Shape.js

@@ -2263,7 +2263,7 @@ CShape.prototype =
                     graphics.p_color(127,127,127,255);
 
                     graphics._s();
-                    editor.WordControl.m_oDrawingDocument.AddRectDash(graphics.m_oContext, x1, y1, x2, y2, x3, y3, x4, y4, 2, 2);
+                    editor.WordControl.m_oDrawingDocument.AutoShapesTrack.AddRectDash(graphics.m_oContext, x1, y1, x2, y2, x3, y3, x4, y4, 2, 2);
                     graphics.ds();
                 }
             }

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, 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, undefined/*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)