правка бага 21617 - [CoEdit] Некорректное изменение размера диаграммы,...

правка бага 21617 - [CoEdit] Некорректное изменение размера диаграммы, вставленной в автофигуру у 2-ого пользователя

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

Word/Editor/GraphicObjects/ObjectTypes/Chart.js

@@ -199,12 +199,12 @@ CChartAsGroup.prototype =
 
         this.spPr.xfrm.extX = w;
         this.spPr.xfrm.extY = h;
-        this.spPr.xfrm.flipH = flipH;
-        this.spPr.xfrm.flipV = flipV;
+        //this.spPr.xfrm.flipH = flipH;
+        //this.spPr.xfrm.flipV = flipV;
         this.absExtX = w;
         this.absExtY = h;
-        this.absFlipH = flipH;
-        this.absFlipV = flipV;
+        //this.absFlipH = flipH;
+        //this.absFlipV = flipV;
         this.absOffsetX = posX;
         this.absOffsetY = posY;
         if(this.parent)
@@ -213,8 +213,8 @@ CChartAsGroup.prototype =
             this.parent.absOffsetY = posY;
             this.parent.absExtX = w;
             this.parent.absExtY = h;
-            this.parent.flipH = flipH;
-            this.parent.flipV = flipV;
+            //this.parent.flipH = flipH;
+            //this.parent.flipV = flipV;
         }
         this.calculateAfterResize();
     },
@@ -2004,12 +2004,12 @@ CChartAsGroup.prototype =
             {
                 this.spPr.xfrm.extX = data.oldW;
                 this.spPr.xfrm.extY = data.oldH;
-                this.spPr.xfrm.flipH = data.oldFlipH;
-                this.spPr.xfrm.flipV = data.oldFlipV;
+                //this.spPr.xfrm.flipH = data.oldFlipH;
+                //this.spPr.xfrm.flipV = data.oldFlipV;
                 this.absExtX = data.oldW;
                 this.absExtY = data.oldH;
-                this.absFlipH = data.oldFlipH;
-                this.absFlipV = data.oldFlipV;
+                //this.absFlipH = data.oldFlipH;
+                //this.absFlipV = data.oldFlipV;
                 this.absOffsetX = data.oldPosX;
                 this.absOffsetY = data.oldPosY;
                 if(this.parent)
@@ -2018,8 +2018,8 @@ CChartAsGroup.prototype =
                     this.parent.absOffsetY = data.oldPosY;
                     this.parent.absExtX = data.oldW;
                     this.parent.absExtY = data.oldH;
-                    this.parent.flipH = data.oldFlipH;
-                    this.parent.flipV = data.oldFlipV;
+                    //this.parent.flipH = data.oldFlipH;
+                    //this.parent.flipV = data.oldFlipV;
                 }
 
                 this.calculateAfterResize();
@@ -2140,12 +2140,12 @@ CChartAsGroup.prototype =
                 var flipV = reader.GetBool();
                 this.spPr.xfrm.extX = extX;
                 this.spPr.xfrm.extY = extY;
-                this.spPr.xfrm.flipH = flipH;
-                this.spPr.xfrm.flipV = flipV;
+                //this.spPr.xfrm.flipH = flipH;
+                //this.spPr.xfrm.flipV = flipV;
                 this.absExtX = extX;
                 this.absExtY = extY;
-                this.absFlipH = flipH;
-                this.absFlipV = flipV;
+                //this.absFlipH = flipH;
+                //this.absFlipV = flipV;
                 this.absOffsetX = posX;
                 this.absOffsetY = posY;
                 if(this.parent)
@@ -2154,8 +2154,8 @@ CChartAsGroup.prototype =
                     this.parent.absOffsetY = posY;
                     this.parent.absExtX = extX;
                     this.parent.absExtY = extY;
-                    this.parent.absFlipH = flipH;
-                    this.parent.absFlipV = flipV;
+                    //this.parent.absFlipH = flipH;
+                    //this.parent.absFlipV = flipV;
                 }
 
                 this.calculateAfterResize();
@@ -2239,12 +2239,12 @@ CChartAsGroup.prototype =
             {
                 this.spPr.xfrm.extX = data.oldW;
                 this.spPr.xfrm.extY = data.oldH;
-                this.spPr.xfrm.flipH = data.oldFlipH;
-                this.spPr.xfrm.flipV = data.oldFlipV;
+                //this.spPr.xfrm.flipH = data.oldFlipH;
+                //this.spPr.xfrm.flipV = data.oldFlipV;
                 this.absExtX = data.oldW;
                 this.absExtY = data.oldH;
-                this.absFlipH = data.oldFlipH;
-                this.absFlipV = data.oldFlipV;
+                //this.absFlipH = data.oldFlipH;
+                //this.absFlipV = data.oldFlipV;
                 this.absOffsetX = data.oldPosX;
                 this.absOffsetY = data.oldPosY;
                 if(this.parent)
@@ -2253,8 +2253,8 @@ CChartAsGroup.prototype =
                     this.parent.absOffsetY = data.oldPosY;
                     this.parent.absExtX = data.oldW;
                     this.parent.absExtY = data.oldH;
-                    this.parent.flipH = data.oldFlipH;
-                    this.parent.flipV = data.oldFlipV;
+                    //this.parent.flipH = data.oldFlipH;
+                    //this.parent.flipV = data.oldFlipV;
                 }
 
                 this.calculateAfterResize();

Word/Editor/GraphicObjects/ObjectTypes/WordShape.js

@@ -1035,6 +1035,23 @@ WordShape.prototype =
     },
 
 
+    getMainGroup: function()
+    {
+        var cur_group = this.group;
+        if(isRealObject(cur_group))
+        {
+            while(isRealObject(cur_group.group))
+            {
+                cur_group = cur_group.group;
+            }
+            return cur_group;
+        }
+        else
+        {
+            return null;
+        }
+    },
+
 
     getOwnTransform: function()
     {

Word/Editor/GraphicObjects/States.js

@@ -6297,7 +6297,32 @@ function ResizeState(graphicObjects, majorHandleNum)
             if(tracks[0].originalGraphicObject.Is_Inline())
             {
                 para_drawing = tracks[0].originalGraphicObject;
-                if(false === editor.isViewMode && false === doc.Document_Is_SelectionLocked(changestype_Drawing_Props, {Type : changestype_Drawing_Props, Element : para_drawing.Parent, CheckType : changestype_Paragraph_Content} ))
+                var paragraph = null;
+                if(!para_drawing.isShapeChild())
+                {
+                    paragraph = para_drawing.Parent;
+                }
+                else
+                {
+                    var parent_shape = para_drawing.getParentShape();
+                    if(!parent_shape.group)
+                    {
+                        paragraph = parent_shape.parent.Parent;
+                    }
+                    else
+                    {
+                        main_group = parent_shape.getMainGroup();
+                        if(isRealObject(main_group))
+                        {
+                            paragraph = main_group.parent.Parent;
+                        }
+                        else
+                        {
+                            paragraph = para_drawing.Parent;
+                        }
+                    }
+                }
+                if(false === editor.isViewMode && false === doc.Document_Is_SelectionLocked(changestype_Drawing_Props, {Type : changestype_2_Element_and_Type, Element : paragraph, CheckType : changestype_Paragraph_Content} ))
                 {
                     tracks[0].trackEnd();
                     bounds = para_drawing.getBounds();