git-svn-id:...

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

Excel/model/DrawingObjects/Overlay.js

@@ -724,8 +724,8 @@ CAutoshapeTrack.prototype =
 
         var drPage = this.CurrentPageInfo.drawingPage;
 
-        var xDst = drPage.left;
-        var yDst = drPage.top;
+        var xDst = drPage.left + (this.Graphics ? this.Graphics.m_oCoordTransform.tx : 0);
+        var yDst = drPage.top + (this.Graphics ? this.Graphics.m_oCoordTransform.ty : 0);
         var wDst = drPage.right - drPage.left;
         var hDst = drPage.bottom - drPage.top;
 
@@ -1169,8 +1169,8 @@ CAutoshapeTrack.prototype =
 
         var drPage = this.CurrentPageInfo.drawingPage;
 
-        var xDst = drPage.left;
-        var yDst = drPage.top;
+        var xDst = drPage.left + (this.Graphics ? this.Graphics.m_oCoordTransform.tx : 0);
+        var yDst = drPage.top + (this.Graphics ? this.Graphics.m_oCoordTransform.ty : 0);
         var wDst = drPage.right - drPage.left;
         var hDst = drPage.bottom - drPage.top;
 
@@ -1368,8 +1368,8 @@ CAutoshapeTrack.prototype =
 
         var drPage = this.CurrentPageInfo.drawingPage;
 
-        var xDst = drPage.left;
-        var yDst = drPage.top;
+        var xDst = drPage.left + (this.Graphics ? this.Graphics.m_oCoordTransform.tx : 0);
+        var yDst = drPage.top + (this.Graphics ? this.Graphics.m_oCoordTransform.ty : 0);
         var wDst = drPage.right - drPage.left;
         var hDst = drPage.bottom - drPage.top;
 

Excel/model/DrawingObjects/States.js

@@ -69,7 +69,7 @@ function NullState(drawingObjectsController, drawingObjects)
                         this.drawingObjectsController.addPreTrackObject(new XYAdjustmentTrack(selected_objects[0], hit_to_adj.adjNum));
                     else
                         this.drawingObjectsController.addPreTrackObject(new PolarAdjustmentTrack(selected_objects[0], hit_to_adj.adjNum));
-                    this.drawingObjectsController.changeCurrentState(new PreChangeAdjState(this.drawingObjectsController, this.drawingObjects));
+                    this.drawingObjectsController.changeCurrentState(new PreChangeAdjState(this.drawingObjectsController, this.drawingObjects, selected_objects[0]));
                 }
                 return;
             }
@@ -957,11 +957,12 @@ function MoveState(drawingObjectsController, drawingObjects, startX, startY, rec
 }
 
 
-function PreChangeAdjState(drawingObjectsController, drawingObjects)
+function PreChangeAdjState(drawingObjectsController, drawingObjects, majorObject)
 {
     this.id = STATES_ID_PRE_CHANGE_ADJ;
     this.drawingObjectsController = drawingObjectsController;
     this.drawingObjects = drawingObjects;
+    this.majorObject = majorObject;
 
     this.onMouseDown = function(e, x, y)
     {