колцевая диаграмма

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

Common/Drawings/Format/ChartFormat.js

@@ -6937,7 +6937,6 @@ CDoughnutChart.prototype =
     },
 
 
-    getAxisByTypes: CPlotArea.prototype.getAxisByTypes,
 
     setFromOtherChart: function(c)
     {
@@ -11018,7 +11017,7 @@ CPieChart.prototype =
             this.setDLbls(c.dLbls);
 
         if(isRealNumber(c.firstSliceAng))
-            this.setFirstSliceAng(c.firstSliceAng)
+            this.setFirstSliceAng(c.firstSliceAng);
 
 
         if(Array.isArray(c.series))

Excel/model/DrawingObjects/Format/ChartSpacePrototype.js

@@ -2010,7 +2010,7 @@ CChartSpace.prototype.recalculateAxis = function()
                 x_ax.posY = x_ax.labels.y;
             }
         }
-        else if(chart_type !== historyitem_type_BarChart && chart_type !== historyitem_type_PieChart
+        else if(chart_type !== historyitem_type_BarChart && (chart_type !== historyitem_type_PieChart && chart_type !== historyitem_type_DoughnutChart)
             || (chart_type === historyitem_type_BarChart && chart_object.barDir === BAR_DIR_COL))
         {
             var gap_hor_axis = 4;
@@ -2574,7 +2574,7 @@ CChartSpace.prototype.recalculateLegend = function()
         var max_width = 0, cur_width, max_font_size = 0, cur_font_size, ser, b_line_series;
         var max_word_width = 0;
         this.chart.legend.chart = this;
-        if( !this.chart.plotArea.chart.varyColors || this.chart.plotArea.chart.getObjectType() !== historyitem_type_PieChart && series.length !== 1)
+        if( !this.chart.plotArea.chart.varyColors || (this.chart.plotArea.chart.getObjectType() !== historyitem_type_PieChart || this.chart.plotArea.chart.getObjectType() !== historyitem_type_DoughnutChart) && series.length !== 1)
         {
             for(i = 0; i < series.length; ++i)
             {