git-svn-id:...

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

Common/Charts/DrawingObjects.js

@@ -5222,3 +5222,19 @@ function readFromBinaryParagraphContent(r)
 
     return Element;
 }
+
+function getTextString(docContent)
+{
+    var ret = "";
+    for(var i = 0; i < docContent.Content.length; ++i)
+    {
+        for(var j = 0; j < docContent.Content[i].Content.length; ++j)
+        {
+            if(docContent.Content[i].Content[j].Type === para_Text)
+                ret += docContent.Content[i].Content[j].Value;
+            if(docContent.Content[i].Content[j].Type === para_Space)
+                ret += " ";
+        }
+    }
+    return ret;
+}

Excel/model/DrawingObjects/Format/Chart.js

@@ -1728,7 +1728,7 @@ CChartAsGroup.prototype =
             this.hAxisTitle.readFromBinary(r);
         }
         this.chart.Read_FromBinary2(r, false);
-        if(typeof  this.chart.header.title === "string")
+        /*if(typeof  this.chart.header.title === "string" && this.chart.header.title != "")
         {
             var chart_title = new CChartTitle(this, CHART_TITLE_TYPE_TITLE);
             var tx_body = new CTextBody(chart_title);
@@ -1744,7 +1744,7 @@ CChartAsGroup.prototype =
         {
             this.addTitle(null);
         }
-        if(typeof  this.chart.xAxis.title === "string")
+        if(typeof  this.chart.xAxis.title === "string" && this.chart.xAxis.title != "")
         {
             var chart_title = new CChartTitle(this, CHART_TITLE_TYPE_H_AXIS);
             var tx_body = new CTextBody(chart_title);
@@ -1761,7 +1761,7 @@ CChartAsGroup.prototype =
             this.addXAxis(null);
         }
 
-        if(typeof  this.chart.yAxis.title === "string")
+        if(typeof  this.chart.yAxis.title === "string" && this.chart.yAxis.title != "")
         {
             var chart_title = new CChartTitle(this, CHART_TITLE_TYPE_H_AXIS);
             var tx_body = new CTextBody(chart_title);
@@ -1776,7 +1776,7 @@ CChartAsGroup.prototype =
         else
         {
             this.addYAxis(null);
-        }
+        }   */
         this.spPr.Read_FromBinary2(r);
         var chartLeft =this.drawingObjects.convertMetric((parseInt($("#ws-canvas").css('width')) / 2) - c_oAscChartDefines.defaultChartWidth / 2, 0, 3);
         var chartTop = this.drawingObjects.convertMetric((parseInt($("#ws-canvas").css('height')) / 2) - c_oAscChartDefines.defaultChartHeight / 2, 0, 3);

PowerPoint/Editor/Format/ChartTitle.js

@@ -109,7 +109,31 @@ CChartTitle.prototype =
 
     Get_Styles: function()
     {
-        return new CStyles();
+        var styles = new CStyles();
+        var default_legend_style = new CStyle("defaultLegendStyle", styles.Default, null, styletype_Paragraph);
+
+        default_legend_style.TextPr.themeFont = "Calibri";
+        default_legend_style.TextPr.Bold = true;
+        if(this.getTitleType() === CHART_TITLE_TYPE_TITLE)
+            default_legend_style.TextPr.FontSize = 18;
+        else
+            default_legend_style.TextPr.FontSize = 10;
+
+        default_legend_style.ParaPr.Spacing.After = 0;
+        default_legend_style.ParaPr.Spacing.Before = 0;
+        default_legend_style.ParaPr.Jc = align_Center;
+
+
+
+        //TODO:ParaPr: default_legend_style.ParaPr.Ind
+        var tx_pr;
+        if(isRealObject(this.txPr))
+        {
+            //TODO
+        }
+        styles.Style[styles.Id] = default_legend_style;
+        ++styles.Id;
+        return styles;
     },
 
     select: function()

PowerPoint/Editor/GraphicObjects.js

@@ -1606,6 +1606,7 @@ CGraphicObjects.prototype = {
         var chart_width = 0.264583*c_oAscChartDefines.defaultChartWidth;
         var chart_height = 0.264583*c_oAscChartDefines.defaultChartHeight;
         ret.chart.initDefault();
+        ret.setChart(ret.chart);
         ret.spPr.xfrm.offX = (presentation.Width - chart_width)/2;
         ret.spPr.xfrm.offY = (presentation.Height - chart_height)/2;
         ret.spPr.xfrm.extX = chart_width;//this.slide.Width*2/3;//ditor.WordControl.m_oDrawingDocument.GetMMPerDot(c_oAscChartDefines.defaultChartWidth);