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

Excel/model/DrawingObjects/Format/Chart.js

@@ -353,7 +353,7 @@ CChartAsGroup.prototype =
             this.spPr.xfrm.setExtents(metrics.extX, metrics.extY);
         }
 
-        if(isRealObject(this.chartTitle))
+        if(isRealObject(this.chartTitle) && isRealObject(this.chartTitle.txBody)&& isRealObject(this.chartTitle.txBody.content))
         {
             this.chartTitle.setType(CHART_TITLE_TYPE_TITLE);
             this.chartTitle.drawingObjects = this.drawingObjects;
@@ -379,7 +379,7 @@ CChartAsGroup.prototype =
             this.chart.header.title = this.chartTitle.txBody.content.getTextString();
         }
 
-        if(isRealObject(this.hAxisTitle))
+        if(isRealObject(this.hAxisTitle)&& isRealObject(this.hAxisTitle.txBody)&& isRealObject(this.hAxisTitle.txBody.content))
         {
             this.hAxisTitle.setType(CHART_TITLE_TYPE_H_AXIS);
             this.hAxisTitle.drawingObjects = this.drawingObjects;
@@ -406,7 +406,7 @@ CChartAsGroup.prototype =
             this.chart.xAxis.title = this.hAxisTitle.txBody.content.getTextString();
         }
 
-        if(isRealObject(this.vAxisTitle))
+        if(isRealObject(this.vAxisTitle) && isRealObject(this.vAxisTitle.txBody)&& isRealObject(this.vAxisTitle.txBody.content))
         {
             this.chart.xAxis.title = "";
             this.vAxisTitle.setType(CHART_TITLE_TYPE_V_AXIS);
@@ -1973,6 +1973,6 @@ CChartAsGroup.prototype =
     getBase64Image: function()
     {
         return ShapeToImageConverter(this, this.pageIndex).ImageUrl;
-    },
+    }
 };
 

Excel/model/DrawingObjects/Format/ChartTitle.js

@@ -558,6 +558,8 @@ CChartTitle.prototype =
 
         default_legend_style.ParaPr.Spacing.After = 0;
         default_legend_style.ParaPr.Spacing.Before = 0;
+        default_legend_style.ParaPr.Spacing.LineRule = linerule_AtLeast;
+        default_legend_style.ParaPr.Spacing.Line = 1;
         default_legend_style.ParaPr.Jc = align_Center;
 
 

Excel/model/DrawingObjects/Format/TextBody.js

@@ -1038,7 +1038,7 @@ CTextBody.prototype =
             var par = dc.Content[i];
             for(var i = 0; i < par.Content.length; ++i)
             {
-                if(par.Content[i].Copy)
+                if(!(par.Content[i] instanceof ParaEnd || par.Content[i] instanceof ParaEmpty) && par.Content[i].Copy)
                     this.content.Paragraph_Add(par.Content[i].Copy());
             }
         }