правка бага с разлетанием группы при изменении внутри

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

Common/Drawings/CommonController.js

@@ -347,7 +347,7 @@ DrawingObjectsController.prototype =
                 {
                     this.resetInternalSelection();
                     if(!b_is_inline)
-                        this.changeCurrentState(new PreMoveState(this, x, y, e.ShiftKey, e.CtrlKey,  object, is_selected, true));
+                        this.changeCurrentState(new PreMoveState(this, x, y, e.ShiftKey, e.CtrlKey,  object, is_selected, /*true*/!bInSelect));
                     else
                     {
                         this.changeCurrentState(new PreMoveInlineObject(this, object, is_selected, true));
@@ -3641,7 +3641,6 @@ DrawingObjectsController.prototype =
 
     unGroupCallback: function()
     {
-        History.Create_NewPoint();
         var ungroup_arr = this.canUnGroup(true);
         if(ungroup_arr.length > 0)
         {
@@ -3652,6 +3651,7 @@ DrawingObjectsController.prototype =
             for(i = 0; i < ungroup_arr.length; ++i)
             {
                 cur_group = ungroup_arr[i];
+                cur_group.normalize();
                 sp_tree = cur_group.spTree;
                 for(j = 0; j < sp_tree.length; ++j)
                 {
@@ -3760,6 +3760,14 @@ DrawingObjectsController.prototype =
                 this.selectObject(selection_state.selection[i].object, selection_state.selection[i].pageIndex);
             }
         }
+       //if(this.drawingObjects && this.selectedObjects.length > 0)
+       //{
+       //    var ws_view = this.drawingObjects.getWorksheet();
+       //    if(ws_view)
+       //    {
+       //        ws_view.isSelectOnShape = true;
+       //    }
+       //}
     },
 
 

Common/Drawings/Format/GroupShape.js

@@ -1496,10 +1496,20 @@ CGroupShape.prototype =
 
     updateCoordinatesAfterInternalResize: function()
     {
+        this.normalize();
+        //var scale_coeffs = this.getResultScaleCoefficients();
         for(var i = 0; i < this.spTree.length; ++i)
         {
             if(this.spTree[i].isGroup())
                 this.spTree[i].updateCoordinatesAfterInternalResize();
+          /*  else
+            {
+                var xfrm2 = this.spTree[i].spPr.xfrm;
+                xfrm2.setOffX(xfrm2.offX*scale_coeffs.cx);
+                xfrm2.setOffY(xfrm2.offY*scale_coeffs.cy);
+                xfrm2.setExtX(xfrm2.extX*scale_coeffs.cx);
+                xfrm2.setExtY(xfrm2.extY*scale_coeffs.cy);
+            }*/
         }
 
         var sp_tree = this.spTree;
@@ -1604,6 +1614,8 @@ CGroupShape.prototype =
         xfrm.setExtY(Math.abs(max_y - min_y));
         xfrm.setChExtX(Math.abs(max_x - min_x));
         xfrm.setChExtY(Math.abs(max_y - min_y));
+        xfrm.setChOffX(0);
+        xfrm.setChOffY(0);
         for(i = 0; i < sp_tree.length; ++i)
         {
             sp_tree[i].spPr.xfrm.setOffX(sp_tree[i].spPr.xfrm.offX - x_min_clear);

Common/Shapes/Serialize.js

@@ -3745,6 +3745,7 @@ function BinaryPPTYLoader()
                 case 0:
                 {
                     spPr.setXfrm(this.ReadXfrm());
+                    spPr.xfrm.setParent(spPr);
                     break;
                 }
                 case 1:
@@ -4495,6 +4496,7 @@ function BinaryPPTYLoader()
                     var spPr = new CSpPr();
                     this.ReadGrSpPr(spPr);
                     shape.setSpPr(spPr);
+                    spPr.setParent(shape);
                     break;
                 }
                 case 2: