Commit d255fe55 authored by Sergey Luzyanin's avatar Sergey Luzyanin

fix Bug 33439

parent a59b4cd6
......@@ -3389,7 +3389,13 @@ function DrawingObjects() {
var options = new AscCommon.asc_ChartSettings();
var catHeadersBBox, serHeadersBBox;
var final_bbox = oBBoxTo.clone();
if(chart.bbox.seriesBBox.bVert)
var bOneCell = false;
if(!chart.bbox.catBBox && !chart.bbox.serBBox){
if(chart.bbox.seriesBBox.r1 === chart.bbox.seriesBBox.r2 && chart.bbox.seriesBBox.c1 === chart.bbox.seriesBBox.c2){
bOneCell = true;
}
}
if((!bOneCell && chart.bbox.seriesBBox.bVert) || (bOneCell && (final_bbox.r1 === final_bbox.r2)))
{
options.putInColumns(false);
if(chart.bbox.catBBox && chart.bbox.catBBox.r1 === chart.bbox.catBBox.r2 && oBBoxTo.r1 > chart.bbox.catBBox.r1)
......
......@@ -1845,8 +1845,27 @@ CChartSpace.prototype.rebuildSeriesFromAsc = function(asc_chart)
series.setIdx(i);
series.setOrder(i);
series.setVal(new AscFormat.CYVal());
AscFormat.ApplySpPr(oFirstSpPrPreset, series, i, base_fills, bAccent1Background);
FillValNum(series.val, asc_series[i].Val, true, false);
if(chart_type.getObjectType() === AscDFH.historyitem_type_PieChart || chart_type.getObjectType() === AscDFH.historyitem_type_DoughnutChart){
if(oFirstSpPrPreset){
var pts = AscFormat.getPtsFromSeries(series);
for(var j = 0; j < pts.length; ++j){
var oDPt = new AscFormat.CDPt();
oDPt.setBubble3D(false);
oDPt.setIdx(j);
ApplySpPr(oFirstSpPrPreset, oDPt, j, base_fills, bAccent1Background);
series.series[i].addDPt(oDPt);
}
}
}
else{
AscFormat.ApplySpPr(oFirstSpPrPreset, series, i, base_fills, bAccent1Background);
}
if(asc_series[i].Cat && asc_series[i].Cat.NumCache && typeof asc_series[i].Cat.Formula === "string" && asc_series[i].Cat.Formula.length > 0)
{
series.setCat(new AscFormat.CCat());
......
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