Bug 31137 - [FastEdit] Не переносится текст в ячейке таблицы, вставленной внутрь автофигуры

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

Word/Editor/GraphicObjects/Format/GroupPrototype.js

@@ -12,7 +12,7 @@ CGroupShape.prototype.handleUpdateFill = function()
         this.spTree[i].handleUpdateFill();
     }
 };
-CGroupShape.prototype.recalcText = function()
+CGroupShape.prototype.recalcText = function(bResetCache)
 {
     if(this.spTree)
     {
@@ -20,7 +20,7 @@ CGroupShape.prototype.recalcText = function()
         {
             if(this.spTree[i].recalcText)
             {
-                this.spTree[i].recalcText();
+                this.spTree[i].recalcText(bResetCache);
             }
         }
     }

Word/Editor/GraphicObjects/Format/ShapePrototype.js

@@ -875,12 +875,18 @@ CShape.prototype.Is_TopDocument = function()
     return false;
 };
 
-CShape.prototype.recalcText = function()
+CShape.prototype.recalcText = function(bResetRecalcCache)
 {
     if(this.recalculateText && this.recalcTxBoxContent && this.recalculateText)
     {
         this.recalcTxBoxContent();
         this.recalcTransformText();
+        if(bResetRecalcCache){
+            var oContent = this.getDocContent();
+            if(oContent){
+                oContent.Reset_RecalculateCache();
+            }
+        }
         if(this.checkAutofit && this.checkAutofit())
         {
             this.recalcGeometry();

Word/Editor/GraphicObjects/GraphicObjects.js

@@ -303,7 +303,7 @@ CGraphicObjects.prototype =
                 {
                     if(this.drawingObjects[i].GraphicObj.recalcText)
                     {
-                        this.drawingObjects[i].GraphicObj.recalcText();
+                        this.drawingObjects[i].GraphicObj.recalcText(true);
                     }
                     this.drawingObjects[i].GraphicObj.recalculate();
                 }