баги в вордартах

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

Common/Drawings/Format/TextBody.js

@@ -501,7 +501,7 @@ CTextBody.prototype =
 
     Check_AutoFit: function()
     {
-        return this.parent && this.parent.checkAutofit && this.parent.checkAutofit(true) || false;
+        return this.parent && this.parent.Check_AutoFit && this.parent.Check_AutoFit(true) || false;
     },
 
     Refresh_RecalcData: function()

Common/Drawings/TextDrawer.js

@@ -111,6 +111,28 @@ CDocContentStructure.prototype.checkByWarpStruct = function(oWarpStruct, dWidth,
         nLastIndex = nIndex;
     }
 
+    this.checkUnionPaths(aWarpedObjects2);
+};
+
+CDocContentStructure.prototype.checkUnionPaths = function(aWarpedObjects)
+{
+    var aWarpedObjects2;
+    if(Array.isArray(aWarpedObjects))
+    {
+        aWarpedObjects2 = aWarpedObjects;
+    }
+    else
+    {
+        aWarpedObjects2 = [];
+		for(var j = 0; j < this.m_aByLines.length; ++j)
+		{
+			var oTemp = this.m_aByLines[j];
+			for(var t = 0; t < oTemp.length; ++t)
+			{
+				oTemp[t].GetAllWarped(aWarpedObjects2);
+			}
+		}
+    }
     var oLastObjectToDraw = null, oCurObjectToDraw;
     for(i = 0; i < aWarpedObjects2.length; ++i)
     {
@@ -130,7 +152,6 @@ CDocContentStructure.prototype.checkByWarpStruct = function(oWarpStruct, dWidth,
             oLastObjectToDraw = oCurObjectToDraw;
         }
     }
-
 };
 
 function CParagraphStructure()

Excel/model/DrawingObjects/Format/ShapePrototype.js

@@ -418,21 +418,23 @@ CShape.prototype.recalculateContent = function()
         {
             this.recalcInfo.bRecalculatedTitle = true;
             this.recalcInfo.recalcTitle = null;
-            if(body_pr.prstTxWarp && body_pr.prstTxWarp.preset !== "textNoShape")
-            {
-                body_pr.prstTxWarp.Recalculate(oRecalcObj.w + oRecalcObj.correctW, oRecalcObj.h + oRecalcObj.correctH);
-                this.recalcInfo.warpGeometry = body_pr.prstTxWarp;
-            }
-            else
-            {
-                this.recalcInfo.warpGeometry = null;
-            }
+
+
+            var oTextWarpContent = this.checkTextWarp(content, body_pr, oRecalcObj.w + oRecalcObj.correctW, oRecalcObj.h + oRecalcObj.correctH, true, false);
+            this.txWarpStructParamarks = oTextWarpContent.oTxWarpStructParamarks;
+            this.txWarpStruct = oTextWarpContent.oTxWarpStruct;
+
+            this.txWarpStructParamarksNoTransform = oTextWarpContent.oTxWarpStructParamarksNoTransform;
+            this.txWarpStructNoTransform = oTextWarpContent.oTxWarpStructNoTransform;
         }
         else
         {
-            var oTextWarpContent = this.checkTextWarp(content, body_pr, oRecalcObj.w + oRecalcObj.correctW, oRecalcObj.h + oRecalcObj.correctH);
+            var oTextWarpContent = this.checkTextWarp(content, body_pr, oRecalcObj.w + oRecalcObj.correctW, oRecalcObj.h + oRecalcObj.correctH, true, true);
             this.txWarpStructParamarks = oTextWarpContent.oTxWarpStructParamarks;
             this.txWarpStruct = oTextWarpContent.oTxWarpStruct;
+
+            this.txWarpStructParamarksNoTransform = oTextWarpContent.oTxWarpStructParamarksNoTransform;
+            this.txWarpStructNoTransform = oTextWarpContent.oTxWarpStructNoTransform;
         }
         return oRecalcObj;
     }

PowerPoint/Editor/Format/ShapePrototype.js

@@ -500,21 +500,22 @@ CShape.prototype.recalculateContent = function()
             this.recalcInfo.bRecalculatedTitle = true;
             this.recalcInfo.recalcTitle = null;
 
-            if(body_pr.prstTxWarp && body_pr.prstTxWarp.preset !== "textNoShape")
-            {
-                body_pr.prstTxWarp.Recalculate(oRecalcObject.w + oRecalcObject.correctW, oRecalcObject.h + oRecalcObject.correctH);
-                this.recalcInfo.warpGeometry = body_pr.prstTxWarp;
-            }
-            else
-            {
-                this.recalcInfo.warpGeometry = null;
-            }
+
+            var oTextWarpContent = this.checkTextWarp(content, body_pr, oRecalcObject.w + oRecalcObject.correctW, oRecalcObject.h + oRecalcObject.correctH, true, false);
+            this.txWarpStructParamarks = oTextWarpContent.oTxWarpStructParamarks;
+            this.txWarpStruct = oTextWarpContent.oTxWarpStruct;
+
+            this.txWarpStructParamarksNoTransform = oTextWarpContent.oTxWarpStructParamarksNoTransform;
+            this.txWarpStructNoTransform = oTextWarpContent.oTxWarpStructNoTransform;
         }
         else
         {
-            var oTextWarpContent = this.checkTextWarp(content, body_pr, oRecalcObject.w + oRecalcObject.correctW, oRecalcObject.h + oRecalcObject.correctH);
+            var oTextWarpContent = this.checkTextWarp(content, body_pr, oRecalcObject.w + oRecalcObject.correctW, oRecalcObject.h + oRecalcObject.correctH, true, true);
             this.txWarpStructParamarks = oTextWarpContent.oTxWarpStructParamarks;
             this.txWarpStruct = oTextWarpContent.oTxWarpStruct;
+
+            this.txWarpStructParamarksNoTransform = oTextWarpContent.oTxWarpStructParamarksNoTransform;
+            this.txWarpStructNoTransform = oTextWarpContent.oTxWarpStructNoTransform;
         }
         return oRecalcObject;
     }
@@ -638,7 +639,7 @@ CShape.prototype.recalculateContent2 = function()
             content.Reset(0, 0, w, 20000);
             content.Recalculate_Page(content.StartPage, true);
 
-            var oTextWarpContent = this.checkTextWarp(content, body_pr, this.txBody.contentWidth2, this.txBody.contentHeight2);
+            var oTextWarpContent = this.checkTextWarp(content, body_pr, this.txBody.contentWidth2, this.txBody.contentHeight2, false, true);
             this.txWarpStructParamarks2 = oTextWarpContent.oTxWarpStructParamarks;
             this.txWarpStruct2 = oTextWarpContent.oTxWarpStruct;
 

Word/Editor/GraphicObjects/Format/ShapePrototype.js

@@ -224,21 +224,22 @@ CShape.prototype.recalculateTxBoxContent = function()
     {
         this.recalcInfo.bRecalculatedTitle = true;
         this.recalcInfo.recalcTitle = null;
-        if(oBodyPr.prstTxWarp && oBodyPr.prstTxWarp.preset !== "textNoShape")
-        {
-            oBodyPr.prstTxWarp.Recalculate(oRecalcObj.w, oRecalcObj.h);
-            this.recalcInfo.warpGeometry = oBodyPr.prstTxWarp;
-        }
-        else
-        {
-            this.recalcInfo.warpGeometry = null;
-        }
+
+        var oTextWarpContent = this.checkTextWarp(this.textBoxContent, oBodyPr, oRecalcObj.w, oRecalcObj.h, true, false);
+        this.txWarpStructParamarks = oTextWarpContent.oTxWarpStructParamarks;
+        this.txWarpStruct = oTextWarpContent.oTxWarpStruct;
+
+        this.txWarpStructParamarksNoTransform = oTextWarpContent.oTxWarpStructParamarksNoTransform;
+        this.txWarpStructNoTransform = oTextWarpContent.oTxWarpStructNoTransform;
     }
     else
     {
-       var oTextWarpContent = this.checkTextWarp(this.textBoxContent, oBodyPr, oRecalcObj.w, oRecalcObj.h);
-       this.txWarpStructParamarks = oTextWarpContent.oTxWarpStructParamarks;
-       this.txWarpStruct = oTextWarpContent.oTxWarpStruct;
+        var oTextWarpContent = this.checkTextWarp(this.textBoxContent, oBodyPr, oRecalcObj.w, oRecalcObj.h, true, true);
+        this.txWarpStructParamarks = oTextWarpContent.oTxWarpStructParamarks;
+        this.txWarpStruct = oTextWarpContent.oTxWarpStruct;
+
+        this.txWarpStructParamarksNoTransform = oTextWarpContent.oTxWarpStructParamarksNoTransform;
+        this.txWarpStructNoTransform = oTextWarpContent.oTxWarpStructNoTransform;
     }
     return oRecalcObj;
 };