Bug 24595 - После смены автофигуры на "text box", она перестает отображаться

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

Common/Drawings/Format/Shape.js

@@ -360,6 +360,15 @@ CShape.prototype =
     {
         History.Add(this, { Type: historyitem_ShapeSetStyle, oldPr: this.style, newPr: style });
         this.style = style;
+        var content = this.getDocContent();
+
+        this.recalcInfo.recalculateShapeStyleForParagraph = true;
+        if(this.recalcTextStyles)
+            this.recalcTextStyles();
+        if(content)
+        {
+            content.Recalc_AllParagraphs_CompiledPr();
+        }
     },
 
     setTxBody: function (txBody)
@@ -4007,6 +4016,16 @@ CShape.prototype =
             case historyitem_ShapeSetStyle:
             {
                 this.style = data.oldPr;
+
+
+                this.recalcInfo.recalculateShapeStyleForParagraph = true;
+                if(this.recalcTextStyles)
+                    this.recalcTextStyles();
+                var content = this.getDocContent();
+                if(content)
+                {
+                    content.Recalc_AllParagraphs_CompiledPr();
+                }
                 break;
             }
             case historyitem_ShapeSetTxBody:
@@ -4079,6 +4098,15 @@ CShape.prototype =
             case historyitem_ShapeSetStyle:
             {
                 this.style = data.newPr;
+                var content = this.getDocContent();
+
+                this.recalcInfo.recalculateShapeStyleForParagraph = true;
+                if(this.recalcTextStyles)
+                    this.recalcTextStyles();
+                if(content)
+                {
+                    content.Recalc_AllParagraphs_CompiledPr();
+                }
                 break;
             }
             case historyitem_ShapeSetTxBody:
@@ -4221,6 +4249,15 @@ CShape.prototype =
                 case historyitem_ShapeSetStyle:
                 {
                     this.style = readObject(r);
+                    var content = this.getDocContent();
+
+                    this.recalcInfo.recalculateShapeStyleForParagraph = true;
+                    if(this.recalcTextStyles)
+                        this.recalcTextStyles();
+                    if(content)
+                    {
+                        content.Recalc_AllParagraphs_CompiledPr();
+                    }
                     break;
                 }
                 case historyitem_ShapeSetTxBody:

Excel/model/DrawingObjects/Format/ShapePrototype.js

@@ -202,7 +202,7 @@ CShape.prototype.recalcTransparent = function()
 };
 CShape.prototype.recalcTextStyles = function()
 {
-    this.recalcInfo.recalculateTextStyles = true;
+    this.recalcInfo.recalculateTextStyles =  [true, true, true, true, true, true, true, true, true];
 };
 CShape.prototype.addToRecalculate = function()
 {