Bug 26706 - [CoEdit] Смещение автофигур, построенных в расширенных строках или столбцах

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

Common/Charts/DrawingObjects.js

@@ -2427,37 +2427,6 @@ function DrawingObjects() {
         }
     };
 
-    _this.insertUngroupedObjects = function(idGroup, aGraphics) {
-
-        if ( idGroup && aGraphics.length ) {
-
-            var i, aSingleObjects = [];
-            for (i = 0; i < aGraphics.length; i++) {
-
-                var obj = _this.createDrawingObject();
-                obj.graphicObject = aGraphics[i];
-                aGraphics[i].setDrawingBase(obj);
-                obj.graphicObject.select(_this.controller);
-                obj.setGraphicObjectCoords();
-                aSingleObjects.push(obj);
-            }
-
-            for (i = 0; i < aObjects.length; i++) {
-
-                if ( idGroup == aObjects[i].graphicObject.Id ) {
-
-                    aObjects.splice(i, 1);
-
-                    for (var j = aSingleObjects.length - 1; j > -1; j--) {
-                        aObjects.splice(i, 0, aSingleObjects[j]);
-                    }
-                    _this.showDrawingObjects(true);
-                    break;
-                }
-            }
-        }
-    };
-
     _this.getDrawingBase = function(graphicId) {
         for (var i = 0; i < aObjects.length; i++) {
             if ( aObjects[i].graphicObject.Id == graphicId )

Common/Drawings/Format/GroupShape.js

@@ -809,10 +809,10 @@ CGroupShape.prototype =
             global_MatrixTransformer.MultiplyAppend(this.transform, this.group.getTransformMatrix());
         }
         this.invertTransform = global_MatrixTransformer.Invert(this.transform);
-        if(this.drawingBase && !this.group)
-        {
-            this.drawingBase.setGraphicObjectCoords();
-        }
+        //if(this.drawingBase && !this.group)
+        //{
+        //    this.drawingBase.setGraphicObjectCoords();
+        //}
     },
 
     getTransformMatrix: function()

Common/Drawings/Format/Image.js

@@ -535,10 +535,10 @@ CImageShape.prototype =
             global_MatrixTransformer.MultiplyAppend(this.transform, this.group.getTransformMatrix());
         }
         this.invertTransform = global_MatrixTransformer.Invert(this.transform);
-        if(this.drawingBase && !this.group)
-        {
-            this.drawingBase.setGraphicObjectCoords();
-        }
+       //if(this.drawingBase && !this.group)
+       //{
+       //    this.drawingBase.setGraphicObjectCoords();
+       //}
     },
 
     Refresh_RecalcData: function(data)

Common/Drawings/Format/Shape.js

@@ -2126,10 +2126,10 @@ CShape.prototype =
         this.cachedImage = null;
         this.recalculateLocalTransform(this.transform);
         this.invertTransform = global_MatrixTransformer.Invert(this.transform);
-        if(this.drawingBase && !this.group)
-        {
-            this.drawingBase.setGraphicObjectCoords();
-        }
+        //if(this.drawingBase && !this.group)
+        //{
+        //    this.drawingBase.setGraphicObjectCoords();
+        //}
         this.localTransform = this.transform.CreateDublicate();
     },