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

Common/Native/Wrappers/DrawingDocument.js

@@ -375,7 +375,7 @@ CDrawingDocument.prototype =
     },
     DrawAdjustment : function(matrix, x, y)
     {
-        this.DrawAdjustment.DrawAdjustment(matrix, x, y);
+        this.AutoShapesTrack.DrawAdjustment(matrix, x, y);
     },
 
     LockTrackPageNum : function(nPageNum)
@@ -462,16 +462,18 @@ CDrawingDocument.prototype =
         {
             for (var indP = drawingFirst; indP <= drawingEnd; indP++)
             {
-                this.AutoShapesTrack.PageIndex = indP;
+                this.AutoShapesTrack.SetPageIndexSimple(indP);
                 this.LogicDocument.DrawingObjects.drawSelect(indP);
             }
 
+            this.AutoShapesTrack.SetCurrentPage(-100);
             if (this.LogicDocument.DrawingObjects.needUpdateOverlay())
             {
                 this.AutoShapesTrack.PageIndex = -1;
                 this.LogicDocument.DrawingObjects.drawOnOverlay(this.AutoShapesTrack);
                 this.AutoShapesTrack.CorrectOverlayBounds();
             }
+            this.AutoShapesTrack.SetCurrentPage(-101);
         }
 
         this.Native["DD_Overlay_DrawTableTrack"]();

Common/Native/Wrappers/Overlay.js

@@ -30,6 +30,11 @@ CAutoshapeTrack.prototype =
         this.Native["DD_SetCurrentPage"](nPageIndex);
     },
     
+    SetPageIndexSimple : function(nPageIndex)
+    {
+        this.Native["DD_SetPageIndexSimple"](nPageIndex);
+    },
+    
     transform3 : function(m)
     {
         this.Native["PD_transform3"](m.sx,m.shy,m.shx,m.sy,m.tx,m.ty);

Common/Native/Wrappers/ShapeDrawer.js

@@ -84,7 +84,7 @@ CShapeDrawer.prototype =
         if (graphics.IsSlideBoundsCheckerType)
             this.Graphics = graphics;
         else if (graphics.IsTrack)
-            this.Graphics = graphics;
+            this.Graphics = graphics.Native;
 
         this.UniFill        = shape.brush;
         this.Ln             = shape.pen;