Bug 30022 - Не срабатывает контрол "изменить границы обтекания" для автофигуры небольшого размера

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

Common/Drawings/CommonController.js

@@ -6120,6 +6120,8 @@ DrawingObjectsController.prototype =
         oXfrm.setParent(oSpPr);
         oSpPr.setFill(CreateNoFillUniFill());
         oSpPr.setLn(CreateNoFillLine());
+        oSpPr.setGeometry(CreateGeometry("rect"));
+        oSpPr.geometry.setParent(oSpPr);
         oShape.setSpPr(oSpPr);
         oSpPr.setParent(oShape);
         var oContent = oShape.getDocContent();

Word/Editor/ParagraphContent.js

@@ -4775,6 +4775,10 @@ ParaDrawing.prototype =
     {
         History.Add( this, { Type : historyitem_Drawing_WrappingType, New : WrapType, Old : this.wrappingType } );
         this.wrappingType = WrapType;
+        if(WrapType === WRAPPING_TYPE_TIGHT || WrapType === WRAPPING_TYPE_THROUGH)
+        {
+            this.Check_WrapPolygon();
+        }
     },
 
     Set_BehindDoc : function(BehindDoc)
@@ -5056,6 +5060,13 @@ ParaDrawing.prototype =
             case historyitem_Drawing_DrawingType:
             {
                 this.DrawingType = Data.Old;
+                if(Data.Old === WRAPPING_TYPE_TIGHT || Data.Old === WRAPPING_TYPE_THROUGH)
+                {
+                    if(this.GraphicObj)
+                    {
+                        this.GraphicObj.recalcWrapPolygon && this.GraphicObj.recalcWrapPolygon();
+                    }
+                }
                 break;
             }
 
@@ -5185,6 +5196,13 @@ ParaDrawing.prototype =
             case historyitem_Drawing_WrappingType:
             {
                 this.wrappingType = Data.New;
+                if(Data.New === WRAPPING_TYPE_TIGHT || Data.New === WRAPPING_TYPE_THROUGH)
+                {
+                    if(this.GraphicObj)
+                    {
+                        this.GraphicObj.recalcWrapPolygon && this.GraphicObj.recalcWrapPolygon();
+                    }
+                }
                 break;
             }
 
@@ -5291,10 +5309,14 @@ ParaDrawing.prototype =
                 {
                     case historyitem_Drawing_Distance:
                     {
-                        this.GraphicObj && this.GraphicObj.recalcWrapPolygon && this.GraphicObj.recalcWrapPolygon();
-                        this.GraphicObj && this.GraphicObj.addToRecalculate();
+                        if( this.GraphicObj)
+                        {
+                            this.GraphicObj.recalcWrapPolygon && this.GraphicObj.recalcWrapPolygon();
+                            this.GraphicObj.addToRecalculate();
+                        }
                         break;
                     }
+
                     case historyitem_SetExtent:
                     {
                         var Run = this.Parent.Get_DrawingObjectRun( this.Id );
@@ -5304,6 +5326,15 @@ ParaDrawing.prototype =
                         }
                         break;
                     }
+                    case historyitem_Drawing_WrappingType:
+                    {
+                        if(this.GraphicObj)
+                        {
+                            this.GraphicObj.recalcWrapPolygon && this.GraphicObj.recalcWrapPolygon();
+                            this.GraphicObj.addToRecalculate()
+                        }
+                        break;
+                    }
                     case historyitem_Drawing_SetRelativeHeight:
                     {
                         //TODO