Bug 25793 - Серии диаграмм окрашиваются в один цвет при изменении диапазона данных в XLSX файле

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

Common/Drawings/CommonController.js

@@ -1844,6 +1844,7 @@ DrawingObjectsController.prototype =
         var chart_space = chartSpace;
         var style_index = chartSettings.getStyle();
         var sRange = chartSettings.getRange();
+        var b_clear_formatting = false;
         if(this.drawingObjects && this.drawingObjects.getWorksheet && typeof sRange === "string" && sRange.length > 0)
         {
             var ws_view = this.drawingObjects.getWorksheet();
@@ -1879,6 +1880,8 @@ DrawingObjectsController.prototype =
 								c1: chart_space.bbox.serBBox.c1, c2: chart_space.bbox.serBBox.c2};
                     }
 					var chartSeries = getChartSeries(ws_view.model, chartSettings, catHeadersBBox, serHeadersBBox);
+                    chart_space.clearFormatting();
+                    b_clear_formatting = true;
                     chart_space.rebuildSeriesFromAsc(chartSeries);
                 }
             }
@@ -1886,7 +1889,10 @@ DrawingObjectsController.prototype =
 
         if(isRealNumber(style_index) && style_index > 0 && style_index < 49 && chart_space.style !== style_index)
         {
-            chart_space.clearFormatting();
+            if(!b_clear_formatting)
+            {
+                chart_space.clearFormatting();
+            }
             chart_space.setStyle(style_index);
         }
         //Title Settings

Common/SerializeChart.js

@@ -6165,6 +6165,10 @@ BinaryChartReader.prototype.ReadCT_SerAx = function (type, length, val) {
         res = this.bcr.Read1(length, function (t, l) {
             return oThis.ReadCT_Title(t, l, oNewVal);
         });
+        if(!isRealBool(oNewVal.overlay))
+        {
+            oNewVal.setOverlay(true);
+        }
         val.setTitle(oNewVal);
     }
     else if (c_oserct_seraxNUMFMT === type) {
@@ -6628,6 +6632,10 @@ BinaryChartReader.prototype.ReadCT_DateAx = function (type, length, val) {
         res = this.bcr.Read1(length, function (t, l) {
             return oThis.ReadCT_Title(t, l, oNewVal);
         });
+        if(!isRealBool(oNewVal.overlay))
+        {
+            oNewVal.setOverlay(true);
+        }
         val.setTitle(oNewVal);
     }
     else if (c_oserct_dateaxNUMFMT === type) {
@@ -6858,6 +6866,10 @@ BinaryChartReader.prototype.ReadCT_CatAx = function (type, length, val) {
         res = this.bcr.Read1(length, function (t, l) {
             return oThis.ReadCT_Title(t, l, oNewVal);
         });
+        if(!isRealBool(oNewVal.overlay))
+        {
+            oNewVal.setOverlay(true);
+        }
         val.setTitle(oNewVal);
     }
     else if (c_oserct_cataxNUMFMT === type) {
@@ -7140,6 +7152,10 @@ BinaryChartReader.prototype.ReadCT_ValAx = function (type, length, val) {
         res = this.bcr.Read1(length, function (t, l) {
             return oThis.ReadCT_Title(t, l, oNewVal);
         });
+        if(!isRealBool(oNewVal.overlay))
+        {
+            oNewVal.setOverlay(true);
+        }
         val.setTitle(oNewVal);
     }
     else if (c_oserct_valaxNUMFMT === type) {
@@ -10685,6 +10701,10 @@ BinaryChartReader.prototype.ReadCT_Chart = function (type, length, val) {
         res = this.bcr.Read1(length, function (t, l) {
             return oThis.ReadCT_Title(t, l, oNewVal);
         });
+        if(!isRealBool(oNewVal.overlay))
+        {
+            oNewVal.setOverlay(true);
+        }
         val.setTitle(oNewVal);
     }
     else if (c_oserct_chartAUTOTITLEDELETED === type) {