From be82f6313f298c13a2f040b218c6f2a33705ff8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Szymon=20K=C5=82os?= Date: Thu, 8 Apr 2021 15:08:38 +0200 Subject: [PATCH] tdf#140489 fix chart display in xlsx MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Commit 1147383: tdf#114181 XLSX combined chart: fix swapped primary and secondary axes etc. introduced regression by applying axis swaping not only for combined charts. Change-Id: I764399579ff922ddd495540fdd2a39675f2a8da5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113836 Tested-by: Jenkins Reviewed-by: Szymon Kłos --- chart2/qa/extras/chart2import.cxx | 35 ++++++++++++++++++ chart2/qa/extras/data/xlsx/tdf140489.xlsx | Bin 0 -> 32626 bytes .../drawingml/chart/plotareaconverter.cxx | 8 +++- 3 files changed, 41 insertions(+), 2 deletions(-) create mode 100644 chart2/qa/extras/data/xlsx/tdf140489.xlsx diff --git a/chart2/qa/extras/chart2import.cxx b/chart2/qa/extras/chart2import.cxx index 93596eebc2a0..3a8b77f48cdd 100644 --- a/chart2/qa/extras/chart2import.cxx +++ b/chart2/qa/extras/chart2import.cxx @@ -119,6 +119,7 @@ public: void testAxisTitleRotationXLSX(); void testAxisTitlePositionDOCX(); void testCombinedChartAttachedAxisXLSX(); + void testTdf140489MultiSeriesChartAxisXLSX(); void testTdf90510(); // Pie chart label placement settings(XLS) void testTdf109858(); // Pie chart label placement settings(XLSX) @@ -243,6 +244,7 @@ public: CPPUNIT_TEST(testAxisTitleRotationXLSX); CPPUNIT_TEST(testAxisTitlePositionDOCX); CPPUNIT_TEST(testCombinedChartAttachedAxisXLSX); + CPPUNIT_TEST(testTdf140489MultiSeriesChartAxisXLSX); CPPUNIT_TEST(testTdf90510); CPPUNIT_TEST(testTdf109858); CPPUNIT_TEST(testTdf130105); @@ -1759,6 +1761,39 @@ void Chart2ImportTest::testCombinedChartAttachedAxisXLSX() CPPUNIT_ASSERT_EQUAL(sal_Int32(0), nAxisIndex); } +void Chart2ImportTest::testTdf140489MultiSeriesChartAxisXLSX() +{ + load(u"/chart2/qa/extras/data/xlsx/", "tdf140489.xlsx"); + Reference< chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent); + // First series + Reference xSeries = getDataSeriesFromDoc(xChartDoc, 0); + CPPUNIT_ASSERT(xSeries.is()); + + Reference xPropSet(xSeries, uno::UNO_QUERY_THROW); + sal_Int32 nAxisIndex = -1; + uno::Any aAny = xPropSet->getPropertyValue("AttachedAxisIndex"); + CPPUNIT_ASSERT(aAny >>= nAxisIndex); + CPPUNIT_ASSERT_EQUAL(sal_Int32(0), nAxisIndex); + + // Second series + xSeries = getDataSeriesFromDoc(xChartDoc, 0, 1); + CPPUNIT_ASSERT(xSeries.is()); + + xPropSet.set(xSeries, uno::UNO_QUERY_THROW); + aAny = xPropSet->getPropertyValue("AttachedAxisIndex"); + CPPUNIT_ASSERT(aAny >>= nAxisIndex); + CPPUNIT_ASSERT_EQUAL(sal_Int32(0), nAxisIndex); + + // Third series + xSeries = getDataSeriesFromDoc(xChartDoc, 0, 2); + CPPUNIT_ASSERT(xSeries.is()); + + xPropSet.set(xSeries, uno::UNO_QUERY_THROW); + aAny = xPropSet->getPropertyValue("AttachedAxisIndex"); + CPPUNIT_ASSERT(aAny >>= nAxisIndex); + CPPUNIT_ASSERT_EQUAL(sal_Int32(1), nAxisIndex); +} + void Chart2ImportTest::testInternalDataProvider() { uno::Reference< chart2::XChartDocument > xChartDoc(getChartDocFromImpress(u"/chart2/qa/extras/data/odp/", "chart.odp"), uno::UNO_QUERY_THROW); const uno::Reference< chart2::data::XDataProvider >& rxDataProvider = xChartDoc->getDataProvider(); diff --git a/chart2/qa/extras/data/xlsx/tdf140489.xlsx b/chart2/qa/extras/data/xlsx/tdf140489.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..bd24f40be7b52dd58f01773914f2aadf4aa64c5f GIT binary patch literal 32626 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%0D9{jP#gBnRGf>5ELY{-B z^%G78%4|)-hUD|w8MEx7;&%rO_~WVUL=U?)^5af;+qaO+Pmwk{j^QW1gw13iP$PyW zu+Cl=@~GcV|M(EA1ZL>TqE$%etpsj=^uYUkQl&y9fvKpPuDFHn|Be>Qo^bzH zjoZSBjL#FA60>?U@xhcj%JfmNeNIEOw#z3`!)w$Mr|+|jOoC%ey4|GPKlpoE6*`AH zIoX4IuW{H6rXG8%4M=l$qRIPlEoH3}ssHEVfSMFJHlVwkU~fPLP*MNtHHHoj|K~Cw zU-_?Bmdc+>l$|JF{mxwu%jz16`%y<2BTYnMPslY_Pq{&*ei2hBMUA41x_w=u-^*iT ze6_>4yS%*>8$H&uEx_`bo&*}b{~#8u-YT*pM|b*5A&poJ1I`9~NK1B*D5zypzdP~W z8Qx_Pi>pa8PTw?nx<&F!#Ag5moAv^g&PCa^i6%mDl2#lgZ4=~KGD1)ItGs4 zkb(=$vzjlvi$YYgyBu=Q@UgN+Gl4AH;6IbUX;gI}Ru>&?%jYNjY@yLw!&_LiUN(=2 z9+qrXH*n}3(1NGRi;jc$h?)j`hWH^$rIXQII&w#IAoh-L~db{ULZyZ&XjtG5)-!m|&0H`A6;X$>sz0>jtMY z6>KLtnEo3l=$y%PCl1bClB(t+jn;v;o#y#GCz|wzjbMeJVZJWZu>^@DTCjt6@6R-n z-rK=F`tUM+US~WY!f1)Ium2Jb&VNjMql~U7@Dya@k z)Hhcx+>)-u@0~dk$>H~gWDc|Owl}zS@r}~m!yE^zLz6W?iRY#7iTpsk?9v)Up>fKg zlYdv0Cxp!1NN;cNWX1|)=+L(9@dRf?kpE&jj&ZQrIm+yI0+!gOrC2I-+L$sAYjN{c z(XGg<=Ym4Z06xd*h}I6-nC*Q*Z(_sDtoOHawoN2a=(owA(#PStEci7KpXm?M-xXtY zv5?L&pEhxs^YfG|$Vd0JRhzpm$Dr*|-x@#tS`?27vHCO!mcnBW!0rlU9ZoamW5 zf2KD{8tBXd=s^ERgz^6sT-e06zv*K}68D34Eg|}5fbP6vDzf~&?Wi!J=hcYjmF z2Sf4s9r4|&HQrl&uh>YX2OdM?i3GMQDNCowde3PLQ;nE%OGFZ1F(+k}b3h1e6+imO z0V~xTrLE5aadJ_}q2Cj~WN=FTocL_&SFF4c;_T+3UykIR&!Zc-+zEG-xPI=+M&0r9 zqURrwJ9-WO@BV^AFo0Ci{<9eLZ)f}0yZ;~!ttj(%fWHgO{uST{DCYQ!-0W+^zsqd? z)sO_FWcxphZobBOt*Q7M$qUryR|<=-jbBT}{Wji0`qTIy!f~$=UJIuEMj!;$GY2*Q z-?hyDH5PxZX#Qtd^&0TC2-$ByJdo4=SAYIDNwU{~ua&!g19F14-5|g}6}mdKgHm$v0le+ztK<~ z{_NAM$nAAx_h%&c8uWEw_8T<(U!Z>r(_UNuJr4S93kIg)2nO~aqN3LTf8P@S6(Gj> zF983wL4Ixh_wB@At>fJOV*T&U#cT7wUjhDVj_>i;ALqYQBZ@N6Fn@dv1N5f^l9xjC I{NvOA19R15v;Y7A literal 0 HcmV?d00001 diff --git a/oox/source/drawingml/chart/plotareaconverter.cxx b/oox/source/drawingml/chart/plotareaconverter.cxx index 80ea37c57d30..9a0f9d337c8a 100644 --- a/oox/source/drawingml/chart/plotareaconverter.cxx +++ b/oox/source/drawingml/chart/plotareaconverter.cxx @@ -420,9 +420,13 @@ void PlotAreaConverter::convertFromModel( View3DModel& rView3DModel ) // varying point colors only for single series in single chart type bool bSupportsVaryColorsByPoint = mrModel.maTypeGroups.size() == 1; + bool bIsCombinedChart = mrModel.maTypeGroups.size() == 2 && + mrModel.maTypeGroups[0]->mnTypeId != mrModel.maTypeGroups[1]->mnTypeId; + // convert all axes sets, and check which axis is attached to the first maTypeGroups - sal_Int32 nStartAxesSetIdx = (rValAxisIds.size() > 1 && aAxesSets.size() > 0 && aAxesSets[0]->maAxes.count( API_Y_AXIS ) - && aAxesSets[0]->maAxes[ API_Y_AXIS ]->mnAxisId != rValAxisIds[0] ) ? 1 : 0; + sal_Int32 nStartAxesSetIdx = bIsCombinedChart ? ((rValAxisIds.size() > 1 && aAxesSets.size() > 0 && aAxesSets[0]->maAxes.count( API_Y_AXIS ) + && aAxesSets[0]->maAxes[ API_Y_AXIS ]->mnAxisId != rValAxisIds[0] ) ? 1 : 0) + : 0; sal_Int32 nAxesSetIdx = nStartAxesSetIdx; bool bUseFixedInnerSize = false;