баги в текстартах

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

Common/Drawings/Format/Format.js

@@ -5020,6 +5020,17 @@ function CompareUnifillBool(u1, u2)
         {
             if(u1.fill.colors.length !== u2.fill.colors.length)
                 return false;
+            if(isRealObject(u1.fill.path) !== isRealObject(u2.fill.path))
+                return false;
+            if(u1.fill.path && !u1.fill.path.IsIdentical(u2.fill.path))
+                return false;
+
+            if(isRealObject(u1.fill.lin) !== isRealObject(u2.fill.lin))
+                return false;
+
+            if(u1.fill.lin && !u1.fill.lin.IsIdentical(u2.fill.lin))
+                return false;
+
             for(var i = 0; i < u1.fill.colors.length; ++i)
             {
                 if(u1.fill.colors[i].pos !== u2.fill.colors[i].pos

Common/Drawings/TextDrawer.js

@@ -111,45 +111,52 @@ CDocContentStructure.prototype.checkByWarpStruct = function(oWarpStruct, dWidth,
         nLastIndex = nIndex;
     }
 
-    this.checkUnionPaths(aWarpedObjects2);
+    this.checkUnionPaths(aWarpedObjects2, typeof oWarpStruct.preset.length === "string" && oWarpStruct.preset.length.length > 0 && oWarpStruct.preset.length.length !== "textNoShape");
 };
 
 CDocContentStructure.prototype.checkUnionPaths = function(aWarpedObjects)
 {
-    var aWarpedObjects2;
+    var aToCheck = [];
+    var aWarpedObjects2, i, j, k;
     if(Array.isArray(aWarpedObjects))
     {
-        aWarpedObjects2 = aWarpedObjects;
+        aToCheck.push(aWarpedObjects);
     }
     else
     {
-        aWarpedObjects2 = [];
-		for(var j = 0; j < this.m_aByLines.length; ++j)
+		for(j = 0; j < this.m_aByLines.length; ++j)
 		{
+            aWarpedObjects2 = [];
 			var oTemp = this.m_aByLines[j];
 			for(var t = 0; t < oTemp.length; ++t)
 			{
 				oTemp[t].GetAllWarped(aWarpedObjects2);
 			}
+            aToCheck.push(aWarpedObjects2);
 		}
     }
-    var oLastObjectToDraw = null, oCurObjectToDraw;
-    for(i = 0; i < aWarpedObjects2.length; ++i)
+    for(j = 0; j < aToCheck.length; ++j)
     {
-        if(oLastObjectToDraw === null)
+        var aByProps = [], oCurObjectToDraw;
+        aWarpedObjects2 = aToCheck[j];
+        for(i = 0; i < aWarpedObjects2.length; ++i)
         {
-            oLastObjectToDraw = aWarpedObjects2[i];
-            continue;
-        }
-        oCurObjectToDraw = aWarpedObjects2[i];
-        if(oLastObjectToDraw  && CompareBrushes(oLastObjectToDraw.brush, oCurObjectToDraw.brush) && ComparePens(oLastObjectToDraw.pen, oCurObjectToDraw.pen))
-        {
-            oLastObjectToDraw.geometry.pathLst = oLastObjectToDraw.geometry.pathLst.concat(oCurObjectToDraw.geometry.pathLst);
-            oCurObjectToDraw.geometry.pathLst.length = 0;
-        }
-        else
-        {
-            oLastObjectToDraw = oCurObjectToDraw;
+
+            oCurObjectToDraw = aWarpedObjects2[i];
+            for(k = 0; k < aByProps.length; ++k)
+            {
+                var oObjToDraw = aByProps[k];
+                if(CompareBrushes(oObjToDraw.brush, oCurObjectToDraw.brush) && ComparePens(oObjToDraw.pen, oCurObjectToDraw.pen))
+                {
+                    oObjToDraw.geometry.pathLst = oObjToDraw.geometry.pathLst.concat(oCurObjectToDraw.geometry.pathLst);
+                    oCurObjectToDraw.geometry.pathLst.length = 0;
+                    break;
+                }
+            }
+            if(k === aByProps.length)
+            {
+                aByProps.push(oCurObjectToDraw);
+            }
         }
     }
 };