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

PowerPoint/Editor/Format/GraphicFrame.js

@@ -722,8 +722,8 @@ CGraphicFrame.prototype =
             this.graphicObject.Draw(0, graphics);
             if(locktype_None != this.Lock.Get_Type())
                 graphics.DrawLockObjectRect(this.Lock.Get_Type() , 0, 0, this.extX, this.extY);
-            graphics.SetIntegerGrid(true);
             graphics.reset();
+            graphics.SetIntegerGrid(true);
         }
     },
 

Word/Drawing/Graphics.js

@@ -795,7 +795,9 @@ CGraphics.prototype =
     {
         this.m_oTransform.Reset();
         this.CalculateFullTransform(false);
-        this.m_oContext.setTransform(this.m_oCoordTransform.sx,0,0,this.m_oCoordTransform.sy,0, 0);
+
+        if (!this.m_bIntegerGrid)
+            this.m_oContext.setTransform(this.m_oCoordTransform.sx,0,0,this.m_oCoordTransform.sy,0, 0);
     },
 
     transform3 : function(m, isNeedInvert)