поправлен баг 26758 - При смене типа на "bar chart" подпись горизонтальной оси...

поправлен баг 26758 - При смене типа на "bar chart" подпись горизонтальной оси отображается вертикально. Перенёс методы CBodyPr в прототип.

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

Common/Drawings/CommonController.js

@@ -1892,6 +1892,7 @@ DrawingObjectsController.prototype =
                     if(cat_ax.axPos !== AX_POS_L)
                     {
                         cat_ax.setAxPos(AX_POS_L);
+                       // if(cat_ax.title && cat_ax.title.tx && cat_ax.title.tx.rich)
                     }
                     if(val_ax.axPos !== AX_POS_B)
                     {
@@ -2244,24 +2245,39 @@ DrawingObjectsController.prototype =
                     }
                     case c_oAscChartHorAxisLabelShowSettings.noOverlay:
                     {
-                        if(!hor_axis.title)
+                        var _text_body;
+                        if(hor_axis.title && hor_axis.title.tx && hor_axis.title.tx.rich)
                         {
-                            hor_axis.setTitle(new CTitle());
+                            _text_body = hor_axis.title.tx.rich;
                         }
-                        if(!hor_axis.title.txPr)
-                        {
-                            hor_axis.title.setTxPr(new CTextBody());
-                        }
-                        if(!hor_axis.title.txPr.bodyPr)
-                        {
-                            hor_axis.title.txPr.setBodyPr(new CBodyPr());
-                        }
-                        if(!hor_axis.title.txPr.content)
+                        else
                         {
-                            hor_axis.title.txPr.setContent(new CDocumentContent(hor_axis.title.txPr, chart_space.getDrawingDocument(), 0, 0, 100, 500, false, false, true));
+                            if(!hor_axis.title)
+                            {
+                                hor_axis.setTitle(new CTitle());
+                            }
+                            if(!hor_axis.title.txPr)
+                            {
+                                hor_axis.title.setTxPr(new CTextBody());
+                            }
+                            if(!hor_axis.title.txPr.bodyPr)
+                            {
+                                hor_axis.title.txPr.setBodyPr(new CBodyPr());
+                            }
+                            if(!hor_axis.title.txPr.content)
+                            {
+                                hor_axis.title.txPr.setContent(new CDocumentContent(hor_axis.title.txPr, chart_space.getDrawingDocument(), 0, 0, 100, 500, false, false, true));
+                            }
+                            _text_body = hor_axis.title.txPr;
                         }
                         if(hor_axis.title.overlay !== false)
                             hor_axis.title.setOverlay(false);
+
+                        if(!_text_body.bodyPr || _text_body.bodyPr.isNotNull())
+                        {
+                            _text_body.setBodyPr(new CBodyPr());
+                        }
+
                         break;
                     }
                 }

Common/Drawings/Format/ChartSpace.js

@@ -6686,7 +6686,6 @@ CChartSpace.prototype =
                 {
                     if(pts[j].compiledMarker)
                     {
-
                         pts[j].compiledMarker.pen &&  pts[j].compiledMarker.pen.calculate(parents.theme, parents.slide, parents.layout, parents.master, RGBA);
                         pts[j].compiledMarker.brush &&  pts[j].compiledMarker.brush.calculate(parents.theme, parents.slide, parents.layout, parents.master, RGBA);
 

Common/Drawings/Format/Format.js

@@ -11554,20 +11554,61 @@ function CBodyPr()
 
 
     this.parent = null;
+  // this.Id = g_oIdCounter.Get_NewId();
+  // g_oTableId.Add(this, this.Id);
+}
 
+CBodyPr.prototype =
+{
+    Get_Id: function()
+    {
+        return this.Id;
+    },
 
+    Refresh_RecalcData: function()
+    {},
 
-    this.setVert = function(val)
+    isNotNull: function()
+    {
+        return this.flatTx          !== null ||
+        this.anchor           !== null ||
+        this.anchorCtr        !== null ||
+        this.bIns             !== null ||
+        this.compatLnSpc      !== null ||
+        this.forceAA          !== null ||
+        this.fromWordArt      !== null ||
+        this.horzOverflow     !== null ||
+        this.lIns             !== null ||
+        this.numCol           !== null ||
+        this.rIns             !== null ||
+        this.rot              !== null ||
+        this.rtlCol           !== null ||
+        this.spcCol           !== null ||
+        this.spcFirstLastPara !== null ||
+        this.tIns             !== null ||
+        this.upright          !== null ||
+        this.vert             !== null ||
+        this.vertOverflow     !== null ||
+        this.wrap             !== null ||
+        this.textFit          !== null;
+    },
+
+    setAnchor: function(val)
+    {
+        this.anchor = val;
+    },
+
+    setVert: function(val)
     {
         this.vert = val;
-    };
+    },
 
-    this.setRot = function(val)
+    setRot: function(val)
     {
         this.rot = val;
-    };
+    },
 
-    this.reset = function()
+    reset: function()
     {
         this.flatTx           = null;
         this.anchor           = null;
@@ -11590,10 +11631,10 @@ function CBodyPr()
         this.vertOverflow     = null;
         this.wrap             = null;
         this.textFit          = null;
-    };
+    },
 
 
-    this.Write_ToBinary2 = function(w)
+    Write_ToBinary2: function(w)
     {
         var flag = this.flatTx != null;
         w.WriteBool(flag);
@@ -11736,9 +11777,9 @@ function CBodyPr()
         {
             w.WriteLong(this.wrap);
         }
-    };
+    },
 
-    this.Read_FromBinary2 = function(r)
+    Read_FromBinary2: function(r)
     {
         var flag = r.GetBool();
         if(flag)
@@ -11881,9 +11922,9 @@ function CBodyPr()
         {
             this.wrap = r.GetLong();
         }
-    };
+    },
 
-    this.setDefault =  function()
+    setDefault:  function()
     {
         this.flatTx         = null;
         this.anchor         = 4;
@@ -11905,9 +11946,9 @@ function CBodyPr()
         this.vert           = nVertTThorz;
         this.vertOverflow   = nOTOwerflow;
         this.wrap           = nTWTSquare;
-    };
+    },
 
-    this.createDuplicate = function()
+    createDuplicate: function()
     {
 
         var duplicate = new CBodyPr();
@@ -11932,9 +11973,9 @@ function CBodyPr()
         duplicate.wrap           = this.wrap;
 
         return duplicate;
-    };
+    },
 
-    this.merge = function(bodyPr)
+    merge: function(bodyPr)
     {
         if(!bodyPr)
             return;
@@ -12023,25 +12064,6 @@ function CBodyPr()
             this.wrap = bodyPr.wrap;
         }
         return this;
-    }
-
-  // this.Id = g_oIdCounter.Get_NewId();
-  // g_oTableId.Add(this, this.Id);
-}
-
-CBodyPr.prototype =
-{
-    Get_Id: function()
-    {
-        return this.Id;
-    } ,
-
-    Refresh_RecalcData: function()
-    {},
-
-    setAnchor: function(val)
-    {
-        this.anchor = val;
     },
 
     Write_ToBinary: function(w)