Commit f4f8902b authored by GoshaZotov's avatar GoshaZotov

Merge branch 'Feature/surface_chart' of https://github.com/ONLYOFFICE/sdkjs...

Merge branch 'Feature/surface_chart' of https://github.com/ONLYOFFICE/sdkjs into Feature/surface_chart
parents 0781fe56 1729c55d
...@@ -3658,10 +3658,13 @@ CAreaSeries.prototype = ...@@ -3658,10 +3658,13 @@ CAreaSeries.prototype =
this.spPr && this.spPr.checkBlipFillRasterImage(images); this.spPr && this.spPr.checkBlipFillRasterImage(images);
this.dLbls && this.dLbls.getAllRasterImages(images); this.dLbls && this.dLbls.getAllRasterImages(images);
this.marker && this.marker.spPr && this.marker.spPr.checkBlipFillRasterImage(images); this.marker && this.marker.spPr && this.marker.spPr.checkBlipFillRasterImage(images);
for(var i = 0; i < this.dPt.length; ++i) if(this.dPt)
{ {
this.dPt[i].spPr && this.dPt[i].spPr.checkBlipFillRasterImage(images); for(var i = 0; i < this.dPt.length; ++i)
this.dPt[i].marker && this.dPt[i].marker.spPr && this.dPt[i].marker.spPr.checkBlipFillRasterImage(images); {
this.dPt[i].spPr && this.dPt[i].spPr.checkBlipFillRasterImage(images);
this.dPt[i].marker && this.dPt[i].marker.spPr && this.dPt[i].marker.spPr.checkBlipFillRasterImage(images);
}
} }
}, },
......
...@@ -10512,8 +10512,8 @@ BinaryChartReader.prototype.ReadCT_PlotArea = function (type, length, val, oIdTo ...@@ -10512,8 +10512,8 @@ BinaryChartReader.prototype.ReadCT_PlotArea = function (type, length, val, oIdTo
return oThis.ReadCT_Surface3DChart(t, l, oNewVal, aChartWithAxis); return oThis.ReadCT_Surface3DChart(t, l, oNewVal, aChartWithAxis);
}); });
//surface -> line //surface -> line
var line = this.ConvertSurfaceToLine(oNewVal, aChartWithAxis); //var line = this.ConvertSurfaceToLine(oNewVal, aChartWithAxis);
val.addChart(line); val.addChart(oNewVal);
} }
else if (c_oserct_plotareaSURFACECHART === type) { else if (c_oserct_plotareaSURFACECHART === type) {
var oNewVal = new AscFormat.CSurfaceChart(); var oNewVal = new AscFormat.CSurfaceChart();
......
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