textArts

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

Common/Drawings/CommonController.js

@@ -2013,17 +2013,35 @@ DrawingObjectsController.prototype =
             }
             else
             {
-                if(bWord)
+                var oAscFill = oAscTextArtProperties.asc_getFill(), oAscStroke = oAscTextArtProperties.asc_getLine();
+                if(oAscFill || oAscStroke)
                 {
-                    oParaTextPr = new ParaTextPr({TextFill: CorrectUniFill(oAscTextArtProperties.asc_getFill(), new CUniFill()), TextOutline: CorrectUniStroke(oAscTextArtProperties.asc_getLine(), new CLn())});
+                    if(bWord)
+                    {
+                        oParaTextPr = new ParaTextPr({TextFill: oAscFill ? CorrectUniFill(oAscFill, new CUniFill()) : undefined, TextOutline: oAscStroke ?  CorrectUniStroke(oAscStroke, new CLn()) : undefined});
+                    }
+                    else
+                    {
+                        oParaTextPr = new ParaTextPr({Unifill: oAscFill ? CorrectUniFill(oAscFill, new CUniFill()) : undefined, TextOutline: oAscStroke ?  CorrectUniStroke(oAscStroke, new CLn()) : undefined});
+                    }
                 }
-                else
+            }
+            if(oParaTextPr)
+            {
+                this.paragraphAdd(oParaTextPr);
+            }
+            var oPreset = oAscTextArtProperties.asc_getForm();
+            if(typeof oPreset === "string")
+            {
+                for(i = 0; i < objects_by_type.shapes.length; ++i)
                 {
-                    oParaTextPr = new ParaTextPr({Unifill: CorrectUniFill(oAscTextArtProperties.asc_getFill(), new CUniFill()), TextOutline: CorrectUniStroke(oAscTextArtProperties.asc_getLine(), new CLn())});
-
+                    objects_by_type.shapes[i].applyTextArtForm(oPreset);
+                }
+                for(i = 0; i < objects_by_type.groups.length; ++i)
+                {
+                    objects_by_type.groups[i].applyTextArtForm(oPreset);
                 }
             }
-            this.paragraphAdd(oParaTextPr);
         }
         return objects_by_type;
     },

Common/Drawings/Format/GroupShape.js

@@ -1335,6 +1335,17 @@ CGroupShape.prototype =
         return (CARD_DIRECTION_N - (num - num_north)+ 8)%8;
     },
 
+    applyTextArtForm: function(sPreset)
+    {
+        for(var i = 0; i < this.spTree.length; ++i)
+        {
+            if(this.spTree[i].applyTextArtForm)
+            {
+                this.spTree[i].applyTextArtForm(sPreset);
+            }
+        }
+    },
+
     getNumByCardDirection: function(cardDirection)
     {
         var hc = this.extX*0.5;

Excel/api.js

@@ -3896,6 +3896,7 @@ var ASC_DOCS_API_USE_EMBEDDED_FONTS = "@@ASC_DOCS_API_USE_EMBEDDED_FONTS";
 		prot["asc_setInterfaceDrawImagePlaceShape"] = prot.asc_setInterfaceDrawImagePlaceShape;
 		prot["asc_changeImageFromFile"] = prot.asc_changeImageFromFile;
 		prot["asc_putPrLineSpacing"] = prot.asc_putPrLineSpacing;
+		prot["asc_addTextArt"] = prot.asc_addTextArt;
 		prot["asc_putLineSpacingBeforeAfter"] = prot.asc_putLineSpacingBeforeAfter;
 		prot["asc_setDrawImagePlaceParagraph"] = prot.asc_setDrawImagePlaceParagraph;
 		prot["asc_changeShapeImageFromFile"] = prot.asc_changeShapeImageFromFile;

Word/Editor/GraphicObjects/GraphicObjects.js

@@ -1034,6 +1034,7 @@ CGraphicObjects.prototype =
     },
 
     getTargetDocContent: DrawingObjectsController.prototype.getTargetDocContent,
+    getTextArtPreviewManager: DrawingObjectsController.prototype.getTextArtPreviewManager,
 
     handleChartDoubleClick: function(drawing, chart, e, x, y, pageIndex)
     {