chart2/qa/extras/chart2export.cxx | 11 +++++++++++ chart2/qa/extras/data/xlsx/tdf134118.xlsx |binary oox/source/drawingml/chart/chartspaceconverter.cxx | 11 ++++++++++- 3 files changed, 21 insertions(+), 1 deletion(-)
New commits: commit 96048c4cf2db802350b102ea79c6f0baa6d7ba0d Author: Balazs Varga <[email protected]> AuthorDate: Wed Aug 12 08:34:42 2020 +0200 Commit: Gabor Kelemen <[email protected]> CommitDate: Wed Jan 6 14:30:40 2021 +0100 tdf#134118 Chart OOXML import: fix gaps in month based data Leave gaps instead of zeroes, like MSO does, if data ranges contain empty cells at month based time resolution. Change-Id: Ie934b56d9d5cb556bcca41e0e4ddce3ea65f7228 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100573 Tested-by: László Németh <[email protected]> Reviewed-by: László Németh <[email protected]> (cherry picked from commit 886c2e35fadc7813498da041fc4ea8a8ba2fb358) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108864 Tested-by: Gabor Kelemen <[email protected]> Reviewed-by: Gabor Kelemen <[email protected]> diff --git a/chart2/qa/extras/chart2export.cxx b/chart2/qa/extras/chart2export.cxx index 8310d3abb9aa..52001159e7e8 100644 --- a/chart2/qa/extras/chart2export.cxx +++ b/chart2/qa/extras/chart2export.cxx @@ -158,6 +158,7 @@ public: void testTdf121189(); void testTdf122031(); void testTdf115012(); + void testTdf134118(); void testTdf123206_customLabelText(); void testCustomLabelText(); void testDeletedLegendEntries(); @@ -295,6 +296,7 @@ public: CPPUNIT_TEST(testTdf121189); CPPUNIT_TEST(testTdf122031); CPPUNIT_TEST(testTdf115012); + CPPUNIT_TEST(testTdf134118); CPPUNIT_TEST(testTdf123206_customLabelText); CPPUNIT_TEST(testCustomLabelText); CPPUNIT_TEST(testDeletedLegendEntries); @@ -2581,6 +2583,15 @@ void Chart2ExportTest::testTdf115012() assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:dispBlanksAs", "val", "zero"); } +void Chart2ExportTest::testTdf134118() +{ + load("/chart2/qa/extras/data/xlsx/", "tdf134118.xlsx"); + xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML"); + CPPUNIT_ASSERT(pXmlDoc); + // workaround: use leave-gap instead of zero to show the original line chart + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:dispBlanksAs", "val", "gap"); +} + void Chart2ExportTest::testTdf123206_customLabelText() { load("/chart2/qa/extras/data/docx/", "tdf123206.docx"); diff --git a/chart2/qa/extras/data/xlsx/tdf134118.xlsx b/chart2/qa/extras/data/xlsx/tdf134118.xlsx new file mode 100644 index 000000000000..ca86fb8cf118 Binary files /dev/null and b/chart2/qa/extras/data/xlsx/tdf134118.xlsx differ diff --git a/oox/source/drawingml/chart/chartspaceconverter.cxx b/oox/source/drawingml/chart/chartspaceconverter.cxx index 342b6190a67d..1f90c2e092eb 100644 --- a/oox/source/drawingml/chart/chartspaceconverter.cxx +++ b/oox/source/drawingml/chart/chartspaceconverter.cxx @@ -206,7 +206,16 @@ void ChartSpaceConverter::convertFromModel( const Reference< XShapes >& rxExtern { using namespace ::com::sun::star::chart::MissingValueTreatment; sal_Int32 nMissingValues = LEAVE_GAP; - switch( mrModel.mnDispBlanksAs ) + + // tdf#134118 leave gap if the time unit is month + bool bIsMonthBasedTimeUnit = false; + if( mrModel.mxPlotArea.is() && mrModel.mxPlotArea->maAxes.size() > 0 && + mrModel.mxPlotArea->maAxes[0]->monBaseTimeUnit.has() ) + { + bIsMonthBasedTimeUnit = mrModel.mxPlotArea->maAxes[0]->monBaseTimeUnit.get() == XML_months; + } + + if (!bIsMonthBasedTimeUnit) switch( mrModel.mnDispBlanksAs ) { case XML_gap: nMissingValues = LEAVE_GAP; break; case XML_zero: nMissingValues = USE_ZERO; break; _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
