Fix Bug 21753 - При смене типа диаграммы на определенной таблице, диаграмма не рисуется

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

Common/Charts/DrawingObjects.js

@@ -378,7 +378,7 @@ asc_CChart.prototype = {
 		return headers;
 	},
 	
-	rebuildSeries: function() {
+	rebuildSeries: function(isIgnoreColors) {
 		var _t = this;
 		var bbox = _t.range.intervalObject.getBBox0();
 		var nameIndex = 1;
@@ -386,7 +386,7 @@ asc_CChart.prototype = {
 		
 		// Save old series colors
 		var oldSeriaData = [];
-		for ( var i = 0; i < _t.series.length; i++ ) {
+		for ( var i = 0; !isIgnoreColors && (i < _t.series.length); i++ ) {
 			if ( _t.series[i].OutlineColor && !_t.series[i].OutlineColor.isCustom )
 				oldSeriaData[i] = _t.series[i].OutlineColor;
 		}
@@ -1529,7 +1529,10 @@ asc_CChartSeria.prototype = {
 	asc_setMarkerSymbol: function(symbol) { this.Marker.Symbol = symbol; },
 
 	asc_getOutlineColor: function() { return this.OutlineColor; },
-	asc_setOutlineColor: function(color) { this.OutlineColor = color; },
+	asc_setOutlineColor: function(color) {
+		if ( color instanceof CUniColor )
+			this.OutlineColor = color.createDuplicate();
+	},
 	
 	asc_getFormatCode: function() { return this.FormatCode; },
 	asc_setFormatCode: function(format) { this.FormatCode = format; }

Excel/model/DrawingObjects/Format/Chart.js

@@ -490,7 +490,9 @@ CChartAsGroup.prototype =
 			this.chart.subType = chart.subType;
 		}
 		
+		var bChangeColors = false;
 		if ( (this.chart.styleId != chart.styleId) || (isCollaborative === true) ) {
+			bChangeColors = true;
 			History.Add(g_oUndoRedoGraphicObjects, historyitem_Chart_Style, sheetId, null, new UndoRedoDataGraphicObjects(this.chart.Get_Id(), new UndoRedoDataGOSingleProp(this.chart.styleId, chart.styleId)));
 			this.chart.styleId = chart.styleId;
 		}
@@ -661,7 +663,7 @@ CChartAsGroup.prototype =
 		}
 		
 		if ( !(isCollaborative === true) ) {
-			this.chart.rebuildSeries();
+			this.chart.rebuildSeries(bChangeColors);
 			History.Add(g_oUndoRedoGraphicObjects, historyitem_AutoShapes_RecalculateTransformRedo, sheetId, null, new UndoRedoDataGraphicObjects(this.Get_Id(), new UndoRedoDataGOSingleProp(null, null)));
 		}
     },