Skip to content

Commit

Permalink
Fix/bug 69515 (#4770)
Browse files Browse the repository at this point in the history
* [se] Fix bug 69515
  • Loading branch information
GoshaZotov authored Aug 2, 2024
1 parent 611e58b commit 94c507d
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 5 deletions.
7 changes: 6 additions & 1 deletion common/Charts/ChartsDrawer.js
Original file line number Diff line number Diff line change
Expand Up @@ -16043,7 +16043,12 @@ axisChart.prototype = {
let tickmarksProps = this._getTickmarksPropsSer();
let widthLine = tickmarksProps.widthLine;

let seriesCount = this.axis.labels.count;
let seriesCount = this.axis.labels && this.axis.labels.count;
if (seriesCount == null) {
let _chart = this.axis.parent && this.axis.parent.chart;
let countSeries = this.cChartDrawer.calculateCountSeries(_chart);
seriesCount = countSeries.series;
}

if (widthLine !== 0) {
let positionX = this.cChartDrawer.processor3D.calculateXPositionSerAxis();
Expand Down
9 changes: 5 additions & 4 deletions common/Drawings/Format/ChartSpace.js
Original file line number Diff line number Diff line change
Expand Up @@ -7836,7 +7836,9 @@ function(window, undefined) {
} else if (style.line1 === EFFECT_INTENSE) {
default_line.merge(parents.theme.themeElements.fmtScheme.lnStyleLst[2]);
}
if (oChartSpace.style === 34)

let pts = oSeries.getNumPts && oSeries.getNumPts();
if (oChartSpace.style === 34 && pts)
base_line_fills = getArrayFillsFromBase(style.line2, getMaxIdx(pts));


Expand All @@ -7845,7 +7847,7 @@ function(window, undefined) {
compiled_line.Fill = new AscFormat.CUniFill();
if (oChartSpace.style !== 34)
compiled_line.Fill.merge(style.line2[0]);
else
else if (base_line_fills)
compiled_line.Fill.merge(base_line_fills[oSeries.idx]);
if (oSeries.spPr && oSeries.spPr.ln) {
compiled_line.merge(oSeries.spPr.ln);
Expand All @@ -7854,8 +7856,7 @@ function(window, undefined) {
oSeries.compiledSeriesPen.calculate(parents.theme, parents.slide, parents.layout, parents.master, RGBA, oChartSpace.clrMapOvr);


if(oSeries.getNumPts) {
let pts = oSeries.getNumPts();
if(pts) {
oChartSpace.ptsCount += pts.length;
for (let nPt = 0; nPt < pts.length; ++nPt) {
let oPt = pts[nPt];
Expand Down

0 comments on commit 94c507d

Please sign in to comment.