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

PowerPoint/Editor/Format/Chart.js

@@ -1389,6 +1389,8 @@ CChartAsGroup.prototype =
                 this.chartTitle.txBody.content.Styles = this.chartTitle.getStyles();
             //this.chartTitle.drawingObjects = this.drawingObjects;
             if(this.chartTitle.isEmpty())
+            {
+                if(this.chart.header && this.chart.header.bDefaultTitle)
                 {
                     var title_str = "Chart Title";
                     this.chartTitle.setTextBody(new CTextBody(this.chartTitle));
@@ -1396,6 +1398,7 @@ CChartAsGroup.prototype =
                     for(var i in title_str)
                         this.chartTitle.txBody.content.Paragraph_Add(CreateParagraphContent(title_str[i]), false);
                 }
+            }
             else
             {
                 var content = this.chartTitle.txBody.content;
@@ -1426,12 +1429,15 @@ CChartAsGroup.prototype =
             this.hAxisTitle.txBody.content.Styles = this.hAxisTitle.getStyles();
             //this.hAxisTitle.drawingObjects = this.drawingObjects;
             if(this.hAxisTitle.isEmpty())
+            {
+                if(this.chart.xAxis && this.chart.xAxis.bDefaultTitle)
                 {
                     var title_str = "X Axis";
                     this.hAxisTitle.setTextBody(new CTextBody(this.hAxisTitle));
                     for(var i in title_str)
                         this.hAxisTitle.txBody.content.Paragraph_Add(CreateParagraphContent(title_str[i]), false);
                 }
+            }
             else
             {
                 var content = this.hAxisTitle.txBody.content;
@@ -1464,6 +1470,8 @@ CChartAsGroup.prototype =
 
             //  this.vAxisTitle.drawingObjects = this.drawingObjects;
             if(this.vAxisTitle.isEmpty())
+            {
+                if(this.chart.yAxis && this.chart.yAxis.bDefaultTitle)
                 {
                     var title_str = "Y Axis";
                     this.vAxisTitle.setTextBody(new CTextBody(this.vAxisTitle));
@@ -1474,6 +1482,7 @@ CChartAsGroup.prototype =
                     for(var i in title_str)
                         this.vAxisTitle.txBody.content.Paragraph_Add(CreateParagraphContent(title_str[i]), false);
                 }
+            }
             else
             {
                 var body_pr = new CBodyPr();