checkGraphicObjectPosition

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

Common/Charts/DrawingObjects.js

@@ -3378,8 +3378,8 @@ function DrawingObjects() {
 
         var response = { result: true, x: 0, y: 0 };
 
-        var bottom = worksheet.getCellTop(worksheet.rows.length - 1, 3);
-        var right = worksheet.getCellLeft(worksheet.cols.length - 1, 3);
+        var bottom = worksheet.getCellTop(worksheet.rows.length - 1, 3) + worksheet.getRowHeight(worksheet.rows.length - 1, 3) - worksheet.getCellTop(0, 3);
+        var right = worksheet.getCellLeft(worksheet.cols.length - 1, 3) + worksheet.getColumnWidth(worksheet.cols.length - 1, 3) - worksheet.getCellLeft(0, 3);
 
         // выход за границу слева или сверху
         if ( y < 0 ) {

Common/Drawings/States.js

@@ -521,8 +521,8 @@ function MoveState(drawingObjects, majorObject, startX, startY)
     }
     this.rectX = Math.min.apply(Math, arr_x);
     this.rectY = Math.min.apply(Math, arr_y);
-    this.rectW = Math.max.apply(Math, arr_x);
-    this.rectH = Math.max.apply(Math, arr_y);
+    this.rectW = Math.max.apply(Math, arr_x) - this.rectX;
+    this.rectH = Math.max.apply(Math, arr_y) - this.rectY;
 
 }