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

Common/Drawings/Format/ChartFormat.js

@@ -494,7 +494,7 @@ CDLbl.prototype =
             global_MatrixTransformer.TranslateAppend(_text_transform, 0, _vertical_shift);
             if (_body_pr.vert === nVertTTvert) {
                 global_MatrixTransformer.TranslateAppend(_text_transform, -_content_width * 0.5, -content_height2 * 0.5);
-                global_MatrixTransformer.RotateRadAppend(_text_transform, -Math.PI * 0.5);
+                global_MatrixTransformer.RotateRadAppend(_text_transform, -Math.PI * 1.5);
                 global_MatrixTransformer.TranslateAppend(_text_transform, _content_width * 0.5, content_height2 * 0.5);
 
             }
@@ -604,7 +604,7 @@ CDLbl.prototype =
                 style.TextPr.Merge(this.legend.txPr.content.Content[0].Pr.DefaultRunPr);
         }
 
-        if(this.parent && this.parent.txPr
+        if(!(this instanceof  CTitle) && this.parent && this.parent.txPr
             && this.parent.txPr.content
             && this.parent.txPr.content.Content[0]
             && this.parent.txPr.content.Content[0].Pr)
@@ -705,7 +705,7 @@ CDLbl.prototype =
 
     getMaxWidth: function(bodyPr)
     {
-        if(!(this.parent && this.chart && this.chart.plotArea && this.chart.plotArea.valAx === this.parent))
+        if(!(this.parent && (this.parent.axPos === AX_POS_L || this.parent.axPos === AX_POS_R)))
         {
             switch (bodyPr.vert)
             {
@@ -740,6 +740,15 @@ CDLbl.prototype =
         {
             ret.merge(this.txPr.bodyPr);
         }
+        if(this.parent && isRealNumber(this.parent.axPos) && (this.parent.axPos === AX_POS_L || this.parent.axPos === AX_POS_R)
+            && (!this.txPr || !this.txPr.bodyPr || !isRealNumber(this.txPr.bodyPr.vert)))
+        {
+            ret.vert = nVertTTvert270;
+        }
+        if( (!this.txPr || !this.txPr.bodyPr || !isRealNumber(this.txPr.bodyPr.anchor)))
+        {
+            ret.anchor = 1;
+        }
 
         switch (ret.vert)
         {
@@ -2734,6 +2743,8 @@ CAreaSeries.prototype =
         }
     },
 
+
+
     getSeriesName: function()
     {
         if(this.tx)
@@ -15675,6 +15686,12 @@ CTitle.prototype =
             case nVertTTwordArtVertRtl:
             case nVertTTvert270:
             {
+                var vert_axis = this.chart.chart.plotArea.getVerticalAxis();
+                if( vert_axis  && vert_axis.title === this)
+                {
+                    var hor_axis = this.chart.chart.plotArea.getHorizontalAxis();
+                    return this.chart.extY - (hor_axis && hor_axis.title ? hor_axis.title.extY : 0 )
+                }
                 return this.chart.extY/2;
             }
             case nVertTThorz:

Common/Drawings/Format/ChartSpace.js

@@ -4917,17 +4917,19 @@ CChartSpace.prototype =
         }
         if(this.chart && this.chart.plotArea)
         {
-            if(this.chart.plotArea.catAx && this.chart.plotArea.catAx.title)
+            var hor_axis = this.chart.plotArea.getHorizontalAxis();
+            if(hor_axis && hor_axis.title)
             {
-                var title = this.chart.plotArea.catAx.title;
-                title.parent = this.chart.plotArea.catAx;
+                var title = hor_axis.title;
+                title.parent = hor_axis;
                 title.chart = this;
                 title.recalculate();
             }
-            if(this.chart.plotArea.valAx && this.chart.plotArea.valAx.title)
+            var vert_axis = this.chart.plotArea.getVerticalAxis();
+            if(vert_axis && vert_axis.title)
             {
-                var title = this.chart.plotArea.valAx.title;
-                title.parent = this.chart.plotArea.valAx;
+                var title = vert_axis.title;
+                title.parent = vert_axis;
                 title.chart = this;
                 title.recalculate();
             }