настройки вордартов для меню.

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

Common/Drawings/CommonController.js

@@ -4786,6 +4786,7 @@ DrawingObjectsController.prototype =
                 }
                 else
                 {
+                    nPageNum1 = 0;
                     chart_selection.addToRecalculate();
                 }
                 chart_selection.recalcInfo.bRecalculatedTitle = false;
@@ -4856,6 +4857,7 @@ DrawingObjectsController.prototype =
                 }
                 else
                 {
+                    nPageNum2 = 0;
                     oTargetTextObject.addToRecalculate();
                 }
             }
@@ -5448,7 +5450,8 @@ DrawingObjectsController.prototype =
                         h: drawing.extY ,
                         canChangeArrows: drawing.canChangeArrows(),
                         bFromChart: false,
-                        locked: locked
+                        locked: locked,
+                        textArtProperties: drawing.getTextArtProperties()
                     };
                     if(!shape_props)
                         shape_props = new_shape_props;
@@ -5544,7 +5547,8 @@ DrawingObjectsController.prototype =
                         h: drawing.extY ,
                         canChangeArrows: false,
                         bFromChart: true,
-                        locked: locked
+                        locked: locked,
+                        textArtProperties: null
                     };
                     if(!shape_props)
                         shape_props = new_shape_props;

Common/Drawings/Format/Format.js

@@ -5177,13 +5177,34 @@ function CompareShapeProperties(shapeProp1, shapeProp2)
         _result_shape_prop.bFromChart = false;
     }
 
-    if(shapeProp1.locked || shapeProp1.locked)
+    if(shapeProp1.locked || shapeProp2.locked)
     {
         _result_shape_prop.locked = true;
     }
+    _result_shape_prop.textArtProperties = CompareTextArtProperties(shapeProp1.textArtProperties, shapeProp2.textArtProperties)
     return _result_shape_prop;
 }
 
+function CompareTextArtProperties(oProps1, oProps2)
+{
+    if(!oProps1 || !oProps2)
+        return null;
+    var oRet = {Fill: undefined, Line: undefined, Form: undefined};
+    if(oProps1.Form === oProps2.Form)
+    {
+        oRet.From = oProps1.Form;
+    }
+    if(oProps1.Fill && oProps2.Fill)
+    {
+        oRet.Fill = CompareUniFill(oProps1.Fill, oProps2.Fill);
+    }
+    if(oProps1.Line && oProps2.Line)
+    {
+        oRet.Line = oProps1.Line.compare(oProps2.Line);
+    }
+    return oRet;
+}
+
 // LN --------------------------
 // размеры стрелок;
 var lg=500,  mid=300, sm=200;
@@ -12676,10 +12697,11 @@ TextListStyle.prototype =
     }
 };
 
-var PARRUN_TYPE_NONE    = 0;
-var PARRUN_TYPE_RUN		= 1;
-var PARRUN_TYPE_FLD		= 2;
-var PARRUN_TYPE_BR		= 3;
+var PARRUN_TYPE_NONE      = 0;
+var PARRUN_TYPE_RUN		  = 1;
+var PARRUN_TYPE_FLD		  = 2;
+var PARRUN_TYPE_BR		  = 3;
+var PARRUN_TYPE_TEXT_MATH = 4;
 
 
 // DEFAULT OBJECTS

Common/Drawings/Format/Shape.js

@@ -3754,6 +3754,42 @@ CShape.prototype =
         return false;
     },
 
+    getTextArtProperties: function()
+    {
+        var oContent = this.getDocContent(), oTextPr, oRet = null;
+        if(oContent)
+        {
+            oRet = {Fill: undefined, Line: undefined, Form: undefined};
+            var oController = this.getDrawingObjectsController();
+            if(oController)
+            {
+                var oTargetDocContent = oController.getTargetDocContent();
+                if(oTargetDocContent === oContent)
+                {
+                    oTextPr = oContent.Get_Paragraph_TextPr();
+                }
+                else
+                {
+                    oContent.Set_ApplyToAll(true);
+                    oTextPr = oContent.Get_Paragraph_TextPr();
+                    oContent.Set_ApplyToAll(false);
+                }
+                oRet.Fill = oTextPr.TextFill;
+                oRet.Line = oTextPr.TextOutline;
+                var oBodyPr = this.getBodyPr();
+                if(oBodyPr && oBodyPr.prstTxWarp)
+                {
+                    oRet.Form = oBodyPr.prstTxWarp.preset;
+                }
+                else
+                {
+                    oRet.Form = "textNoShape";
+                }
+            }
+        }
+        return oRet;
+    },
+
     getParagraphParaPr: function () {
         if (this.txBody && this.txBody.content) {
             var _result;

Common/apiCommon.js

@@ -1792,7 +1792,8 @@
         this.w = null;
         this.h = null;
         this.vert = null;
-        this.verticalTextAlign = null
+        this.verticalTextAlign = null;
+        this.textArtProperties = null;
     }
 
     asc_CShapeProperty.prototype = {
@@ -1821,7 +1822,9 @@
         asc_getVerticalTextAlign: function(){return this.verticalTextAlign},
         asc_putVerticalTextAlign: function(v){this.verticalTextAlign = v;},
         asc_getVert: function(){return this.vert},
-        asc_putVert: function(v){this.vert = v;}
+        asc_putVert: function(v){this.vert = v;},
+        asc_getTextArtProperties: function(){return this.textArtProperties},
+        asc_putTextArtProperties: function(v){this.textArtProperties = v;}
     };
 
 //{ asc_CShapeProperty export
@@ -1852,10 +1855,61 @@
     prot["put_VerticalTextAlign"] = prot["asc_putVerticalTextAlign"] = prot.asc_putVerticalTextAlign;
     prot["get_Vert"] = prot["asc_getVert"] = prot.asc_getVert;
     prot["put_Vert"] = prot["asc_putVert"] = prot.asc_putVert;
+    prot["get_TextArtProperties"] = prot["asc_getTextArtProperties"] = prot.asc_getTextArtProperties;
+    prot["put_TextArtProperties"] = prot["asc_putTextArtProperties"] = prot.asc_putTextArtProperties;
 
 // ---------------------------------------------------------------
 
 
+
+    function asc_TextArtProperties(obj)
+    {
+        if(obj)
+        {
+            this.Fill = obj.Fill;//asc_Fill
+            this.Line  = obj.Line;//asc_Stroke
+            this.Form  = obj.Form;//srting
+        }
+        else
+        {
+            this.Fill = undefined;
+            this.Line  = undefined;
+            this.Form  = undefined;
+        }
+    }
+
+    asc_TextArtProperties.prototype["asc_putFill"] = asc_TextArtProperties.prototype.asc_putFill = function(oAscFill)
+    {
+        this.Fill = oAscFill;
+    };
+    asc_TextArtProperties.prototype["asc_getFill"] = asc_TextArtProperties.prototype.asc_getFill = function()
+    {
+        return this.Fill;
+    };
+
+
+    asc_TextArtProperties.prototype["asc_putLine"] = asc_TextArtProperties.prototype.asc_putLine = function(oAscStroke)
+    {
+        this.Line = oAscStroke;
+    };
+    asc_TextArtProperties.prototype["asc_getLine"] = asc_TextArtProperties.prototype.asc_getLine = function()
+    {
+        return this.Line;
+    };
+
+
+    asc_TextArtProperties.prototype["asc_putForm"] = asc_TextArtProperties.prototype.asc_putForm = function(sForm)
+    {
+        this.Form = sForm;
+    };
+    asc_TextArtProperties.prototype["asc_getForm"] = asc_TextArtProperties.prototype.asc_getForm = function()
+    {
+        return this.Form;
+    };
+	
+	
+    window["asc_TextArtProperties"] = window["Asc"]["asc_TextArtProperties"] = window["asc_TextArtProperties"] = asc_TextArtProperties;
+
     // CImgProperty
 //-----------------------------------------------------------------------------------
     /** @constructor */
@@ -3225,6 +3279,10 @@ function CreateAscShapePropFromProp(shapeProp)
     obj.h = shapeProp.h;
     obj.vert = shapeProp.vert;
     obj.verticalTextAlign = shapeProp.verticalTextAlign;
+    if(shapeProp.textArtProperties)
+    {
+        obj.textArtProperties = CreateAscTextArtProps(shapeProp.textArtProperties);
+    }
     return obj;
 }
 
@@ -3237,6 +3295,25 @@ function CorrectShapeProp(asc_shape_prop, shape)
     shape.spPr.ln = CorrectUniFill(asc_shape_prop.asc_getStroke(), shape.spPr.ln);
 }
 
+
+function CreateAscTextArtProps(oTextArtProps)
+{
+    if(!oTextArtProps)
+    {
+        return undefined;
+    }
+    var oRet = new asc_TextArtProperties();
+    if(oTextArtProps.Fill)
+    {
+        oRet.asc_putFill(CreateAscFill(oTextArtProps.Fill));
+    }
+    if(oTextArtProps.Line)
+    {
+        oRet.asc_putLine(CreateAscStroke(oTextArtProps.Line, false));
+    }
+    oRet.asc_putForm(oTextArtProps.Form);
+    return oRet;
+}
 // эта функция ДОЛЖНА минимизироваться
 
 function CreateAscColorCustom(r, g, b, auto)