Commit 4d5ee241 authored by Igor.Zotov's avatar Igor.Zotov Committed by Alexander.Trofimov

http://bugzserver/show_bug.cgi?id=25779 - Отсутствует диаграмма либо серии...

http://bugzserver/show_bug.cgi?id=25779 - Отсутствует диаграмма либо серии данных сливаются при открытии книги созданной в версии 2.5

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@57563 954022d7-b5bf-4e40-9824-e11837661b57
parent 8d4e551c
...@@ -2177,7 +2177,7 @@ CChartsDrawer.prototype = ...@@ -2177,7 +2177,7 @@ CChartsDrawer.prototype =
{ {
seriaVal = series[i].val ? series[i].val : series[i].yVal; seriaVal = series[i].val ? series[i].val : series[i].yVal;
numCache = seriaVal && seriaVal.numRef ? seriaVal.numRef.numCache : seriaVal.numLit; numCache = seriaVal && seriaVal.numRef ? seriaVal.numRef.numCache : seriaVal.numLit;
if(numCache != null) if(numCache != null && numCache.pts && numCache.pts.length)
{ {
if(!this.calcProp.ptCount) if(!this.calcProp.ptCount)
this.calcProp.ptCount = numCache.ptCount; this.calcProp.ptCount = numCache.ptCount;
...@@ -3294,9 +3294,9 @@ drawAreaChart.prototype = ...@@ -3294,9 +3294,9 @@ drawAreaChart.prototype =
if(!dataSeries) if(!dataSeries)
continue; continue;
if(dataSeries[0].pen) if(dataSeries[0] && dataSeries[0].pen)
pen = dataSeries[0].pen; pen = dataSeries[0].pen;
if(dataSeries[0].brush) if(dataSeries[0] && dataSeries[0].brush)
brush = dataSeries[0].brush; brush = dataSeries[0].brush;
this.cChartDrawer.drawPath(this.paths.series[i], pen, brush); this.cChartDrawer.drawPath(this.paths.series[i], pen, brush);
......
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