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

Common/Drawings/CommonController.js

@@ -4731,7 +4731,7 @@ DrawingObjectsController.prototype =
             if (oTargetTextObject) {
 
                 var oBodyPr = oTargetTextObject.getBodyPr && oTargetTextObject.getBodyPr();
-                if(oBodyPr && oBodyPr.prstTxWarp)
+                if((oBodyPr && oBodyPr.prstTxWarp && oBodyPr.prstTxWarp.preset !== "textNoShape") || oTargetTextObject.checkContentWordArt && oTargetTextObject.checkContentWordArt(oTargetTextObject.getDocContent()))
                 {
                     if (oTargetTextObject.recalcInfo.bRecalculatedTitle)
                     {

Common/Drawings/Format/Shape.js

@@ -4206,6 +4206,8 @@ CShape.prototype =
 
     checkContentWordArt: function(oContent)
     {
+        if(!oContent)
+            return false;
         var i, j, k, oElement, aRows, oRow;
         for(i = 0; i < oContent.Content.length; ++i)
         {