Commit 24840b86 authored by Sergey Luzyanin's avatar Sergey Luzyanin

fixed crash at rebuild scatter series

parent 1eb1b009
...@@ -1800,13 +1800,14 @@ CChartSpace.prototype.rebuildSeriesFromAsc = function(asc_chart) ...@@ -1800,13 +1800,14 @@ CChartSpace.prototype.rebuildSeriesFromAsc = function(asc_chart)
first_series.spPr.setFill(null); first_series.spPr.setFill(null);
first_series.spPr.setLn(null); first_series.spPr.setLn(null);
} }
if(asc_series.length < chart_type.series.length){
for(var i = chart_type.series.length - 1; i >= asc_series.length; --i){
chart_type.removeSeries(i);
}
}
if(chart_type.getObjectType() !== AscDFH.historyitem_type_ScatterChart) if(chart_type.getObjectType() !== AscDFH.historyitem_type_ScatterChart)
{ {
if(asc_series.length < chart_type.series.length){
for(var i = chart_type.series.length - 1; i >= asc_series.length; --i){
chart_type.removeSeries(i);
}
}
for(var i = 0; i < asc_series.length; ++i) for(var i = 0; i < asc_series.length; ++i)
{ {
var series = null, bNeedAdd = false; var series = null, bNeedAdd = false;
...@@ -1850,6 +1851,9 @@ CChartSpace.prototype.rebuildSeriesFromAsc = function(asc_chart) ...@@ -1850,6 +1851,9 @@ CChartSpace.prototype.rebuildSeriesFromAsc = function(asc_chart)
} }
else else
{ {
for(var i = chart_type.series.length - 1; i > -1; --i){
chart_type.removeSeries(i);
}
var oXVal; var oXVal;
var start_index = 0; var start_index = 0;
var minus = 0; var minus = 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment