fix Bug 34236

cell/model/DrawingObjects/Format/ShapePrototype.js

@@ -552,8 +552,7 @@ CShape.prototype.recalculateBounds = function()
 CShape.prototype.recalculateContent = function()
 {
     var content = this.getDocContent();
-    if(content)
-    {
+    if(content){
         var body_pr = this.getBodyPr();
 
         var oRecalcObj = this.recalculateDocContent(content, body_pr);
@@ -589,6 +588,15 @@ CShape.prototype.recalculateContent = function()
         }
         return oRecalcObj;
     }
+    else{
+        this.txWarpStructParamarks = null;
+        this.txWarpStruct = null;
+
+        this.txWarpStructParamarksNoTransform = null;
+        this.txWarpStructNoTransform = null;
+
+        this.recalcInfo.warpGeometry = null;
+    }
     return null;
 };
 

common/Drawings/Format/Shape.js

@@ -4107,7 +4107,7 @@ CShape.prototype.draw = function (graphics, transform, transformText, pageIndex)
     }
 
     var oController = this.getDrawingObjectsController && this.getDrawingObjectsController();
-    if(!this.txWarpStruct && !this.txWarpStructParamarksNoTransform || (!this.txWarpStructParamarksNoTransform && oController && (AscFormat.getTargetTextObject(oController) === this)) /*|| this.haveSelectedDrawingInContent()*/)
+    if(!this.txWarpStruct && !this.txWarpStructParamarksNoTransform || (!this.txWarpStructParamarksNoTransform && oController && (AscFormat.getTargetTextObject(oController) === this) || (!this.txBody && !this.textBoxContent)) /*|| this.haveSelectedDrawingInContent()*/)
     {
         if (this.txBody)
         {

slide/Editor/Format/ShapePrototype.js

@@ -546,6 +546,15 @@ CShape.prototype.recalculateContent = function()
         }
         return oRecalcObject;
     }
+    else{
+        this.txWarpStructParamarks = null;
+        this.txWarpStruct = null;
+
+        this.txWarpStructParamarksNoTransform = null;
+        this.txWarpStructNoTransform = null;
+
+        this.recalcInfo.warpGeometry = null;
+    }
     return null;
 };
 
@@ -678,7 +687,10 @@ CShape.prototype.recalculateContent2 = function()
             this.txWarpStruct2 = null;
         }
     }
-
+    else{
+        this.txWarpStructParamarks2 = null;
+        this.txWarpStruct2 = null;
+    }
 };
 
 CShape.prototype.Get_ColorMap = function()

word/Editor/GraphicObjects/Format/ShapePrototype.js

@@ -268,7 +268,14 @@ CShape.prototype.getParentObjects = function ()
 CShape.prototype.recalculateTxBoxContent = function()
 {
     if(this.textBoxContent === null || this.textBoxContent.Parent !== this)
+    {
+        this.txWarpStructParamarks = null;
+        this.txWarpStruct = null;
+        this.txWarpStructParamarksNoTransform = null;
+        this.txWarpStructNoTransform = null;
+        this.recalcInfo.warpGeometry = null;
         return;
+    }
     this.txWarpStruct = null;
     var oBodyPr = this.getBodyPr();
     var oRecalcObj = this.recalculateDocContent(this.textBoxContent, oBodyPr);