Bug 25177 - Не срабатывает опция "distance from text" при обтекании "sqaure" у автофигуры

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

Common/Charts/DrawingObjects.js

@@ -1785,7 +1785,6 @@ function DrawingObjects() {
 
         _this.resizeCanvas();
         _this.setScrollOffset();
-        _this.rebuildChartGraphicObjects();
     };
 
     _this.resizeCanvas = function() {
@@ -2761,7 +2760,7 @@ function DrawingObjects() {
         {
             if(aObjects[i].graphicObject.rebuildSeries)
             {
-                aObjects[i].graphicObject.rebuildSeries();
+                aObjects[i].graphicObject.rebuildSeries(data);
             }
         }
     };

Common/Drawings/Format/ChartSpace.js

@@ -703,7 +703,7 @@ CChartSpace.prototype =
                                 cell = worksheet.getCell(new CellAddress(j, k, 0));
                                 pt = new pointConstructor();
                                 pt.setIdx(idx);
-                                pt.setFormatCode(cell.getNumFormatStr());
+                                pt.setFormatCode && pt.setFormatCode(cell.getNumFormatStr());
                                 pt.setVal(cell.getValue());
                                 cache.addPt(pt);
                             }
@@ -760,6 +760,7 @@ CChartSpace.prototype =
 
     rebuildSeries: function()
     {
+
         this.setRecalculateInfo();
         this.checkSeriesRefs(this.clearCacheVal);
         this.recalculate();
@@ -2560,10 +2561,7 @@ CChartSpace.prototype =
                                         pt = new CStringPoint();
                                         pt.setIdx(pt_index++);
                                         pt.setVal(cell.getValue());
-                                        if(cell.getNumFormatStr() !== "General")
-                                        {
-                                            pt.setFormatCode(cell.getNumFormatStr())
-                                        }
+
                                         str_cache.addPt(pt);
                                     }
                                 }
@@ -2575,10 +2573,7 @@ CChartSpace.prototype =
                                         pt = new CStringPoint();
                                         pt.setIdx(pt_index++);
                                         pt.setVal(cell.getValue());
-                                        if(cell.getNumFormatStr() !== "General")
-                                        {
-                                            pt.setFormatCode(cell.getNumFormatStr())
-                                        }
+
                                         str_cache.addPt(pt);
                                     }
                                 }

Word/Editor/GraphicObjects/WrapManager.js

@@ -104,7 +104,6 @@ CWrapPolygon.prototype =
     {
     },
 
-
     getIntersection: function(y)
     {
         var min_x = null;

Word/Editor/ParagraphContent.js

@@ -4938,6 +4938,7 @@ ParaDrawing.prototype =
                 this.Distance.R = Data.Old.Right;
                 this.Distance.B = Data.Old.Bottom;
 
+                this.GraphicObj.recalcWrapPolygon && this.GraphicObj.recalcWrapPolygon();
                 break;
             }
 
@@ -5083,6 +5084,7 @@ ParaDrawing.prototype =
                 this.Distance.R = Data.New.Right;
                 this.Distance.B = Data.New.Bottom;
 
+                this.GraphicObj.recalcWrapPolygon && this.GraphicObj.recalcWrapPolygon();
                 break;
             }
 
@@ -5196,10 +5198,18 @@ ParaDrawing.prototype =
             return this.Parent.Get_ParentObject_or_DocumentPos();
     },
 
-    Refresh_RecalcData : function()
+    Refresh_RecalcData : function(Data)
     {
         if ( undefined != this.Parent && null != this.Parent )
+        {
+            if(Data && Data.Type === historyitem_Drawing_Distance)
+            {
+                this.GraphicObj.recalcWrapPolygon && this.GraphicObj.recalcWrapPolygon();
+                this.GraphicObj.addToRecalculate();
+            }
+
             return this.Parent.Refresh_RecalcData2();
+        }
     },
 //-----------------------------------------------------------------------------------
 // Функции для совместного редактирования
@@ -5662,6 +5672,7 @@ ParaDrawing.prototype =
                 this.Distance.R = Reader.GetDouble();
                 this.Distance.B = Reader.GetDouble();
 
+                this.GraphicObj.recalcWrapPolygon && this.GraphicObj.recalcWrapPolygon();
                 break;
             }