diff options
| author | Tünde Tóth <tundeth@gmail.com> | 2020-02-11 15:16:34 +0100 |
|---|---|---|
| committer | László Németh <nemeth@numbertext.org> | 2020-02-20 15:02:54 +0100 |
| commit | bae73c0726e7fdf7f427a8254c9d6d4b4c510daf (patch) | |
| tree | 86e03c86063457a5cad0f1b7e3e32fdce2bd7d76 /chart2/qa/extras | |
| parent | 796aeeb0f4c26824f3477b45e0d3bae9cf2c4648 (diff) | |
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 <nemeth@numbertext.org>
Reviewed-by: László Németh <nemeth@numbertext.org>
Diffstat (limited to 'chart2/qa/extras')
| -rw-r--r-- | chart2/qa/extras/chart2export.cxx | 14 | ||||
| -rw-r--r-- | chart2/qa/extras/data/xlsx/auto_marker_excel10.xlsx | bin | 0 -> 16250 bytes |
2 files changed, 14 insertions, 0 deletions
diff --git a/chart2/qa/extras/chart2export.cxx b/chart2/qa/extras/chart2export.cxx index 88c7d154d170..469e25618b5f 100644 --- a/chart2/qa/extras/chart2export.cxx +++ b/chart2/qa/extras/chart2export.cxx @@ -156,6 +156,7 @@ public: void testTdf123206_customLabelText(); void testDeletedLegendEntries(); void testTdf130225(); + void testTdf126076(); CPPUNIT_TEST_SUITE(Chart2ExportTest); CPPUNIT_TEST(testErrorBarXLSX); @@ -275,6 +276,7 @@ public: CPPUNIT_TEST(testTdf123206_customLabelText); CPPUNIT_TEST(testDeletedLegendEntries); CPPUNIT_TEST(testTdf130225); + CPPUNIT_TEST(testTdf126076); CPPUNIT_TEST_SUITE_END(); @@ -2516,6 +2518,18 @@ void Chart2ExportTest::testTdf130225() CPPUNIT_ASSERT_EQUAL(sal_Int32(1), deletedLegendEntriesSeq[0]); } +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 Binary files differnew file mode 100644 index 000000000000..c15756257251 --- /dev/null +++ b/chart2/qa/extras/data/xlsx/auto_marker_excel10.xlsx |