chart2/qa/extras/chart2export.cxx | 14 ++++++++++++++ chart2/qa/extras/data/xlsx/auto_marker_excel10.xlsx |binary oox/source/export/chartexport.cxx | 2 +- 3 files changed, 15 insertions(+), 1 deletion(-)
New commits: commit 48e33a8d34fdb82b01e80fe8889e49ee74aa83e7 Author: Tünde Tóth <[email protected]> AuthorDate: Tue Feb 11 15:16:34 2020 +0100 Commit: Gabor Kelemen <[email protected]> CommitDate: Thu Jun 11 18:21:42 2020 +0200 tdf#126076 XLSX export: fix automatic line chart markers The default automatic line chart markers in XLSX spreadsheets created with Microsoft Excel 2010 became squares after export. Change-Id: I58a3e10212608a356eef8fbd1e100eda4dbebaca Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88461 Tested-by: László Németh <[email protected]> Reviewed-by: László Németh <[email protected]> (cherry picked from commit bae73c0726e7fdf7f427a8254c9d6d4b4c510daf) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96134 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 6826c3f53569..6c693be3cce5 100644 --- a/chart2/qa/extras/chart2export.cxx +++ b/chart2/qa/extras/chart2export.cxx @@ -152,6 +152,7 @@ public: void testTdf123206_customLabelText(); void testCustomLabelText(); void testTdf131979(); + void testTdf126076(); CPPUNIT_TEST_SUITE(Chart2ExportTest); CPPUNIT_TEST(testErrorBarXLSX); @@ -267,6 +268,7 @@ public: CPPUNIT_TEST(testTdf123206_customLabelText); CPPUNIT_TEST(testCustomLabelText); CPPUNIT_TEST(testTdf131979); + CPPUNIT_TEST(testTdf126076); CPPUNIT_TEST_SUITE_END(); @@ -2467,6 +2469,18 @@ void Chart2ExportTest::testTdf131979() } } +void Chart2ExportTest::testTdf126076() +{ + load("/chart2/qa/extras/data/xlsx/", "auto_marker_excel10.xlsx"); + xmlDocPtr pXmlDoc = parseExport("xl/charts/chart","Calc Office Open XML"); + CPPUNIT_ASSERT(pXmlDoc); + + // This was 12: all series exported with square markers + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:lineChart/c:ser/c:marker/c:symbol[@val='square']", 0); + // instead of skipping markers + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:lineChart/c:ser/c:marker", 0); +} + CPPUNIT_TEST_SUITE_REGISTRATION(Chart2ExportTest); CPPUNIT_PLUGIN_IMPLEMENT(); diff --git a/chart2/qa/extras/data/xlsx/auto_marker_excel10.xlsx b/chart2/qa/extras/data/xlsx/auto_marker_excel10.xlsx new file mode 100644 index 000000000000..c15756257251 Binary files /dev/null and b/chart2/qa/extras/data/xlsx/auto_marker_excel10.xlsx differ diff --git a/oox/source/export/chartexport.cxx b/oox/source/export/chartexport.cxx index 623a03b8ac97..ab2628ec11dd 100644 --- a/oox/source/export/chartexport.cxx +++ b/oox/source/export/chartexport.cxx @@ -3711,7 +3711,7 @@ void ChartExport::exportMarker(const Reference< XPropertySet >& xPropSet) if( GetProperty( xPropSet, "Symbol" ) ) mAny >>= aSymbol; - if(aSymbol.Style != chart2::SymbolStyle_STANDARD && aSymbol.Style != chart2::SymbolStyle_AUTO && aSymbol.Style != chart2::SymbolStyle_NONE) + if(aSymbol.Style != chart2::SymbolStyle_STANDARD && aSymbol.Style != chart2::SymbolStyle_NONE) return; FSHelperPtr pFS = GetFS(); _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
