diff options
| author | Balazs Varga <balazs.varga991@gmail.com> | 2019-06-28 12:30:19 +0200 |
|---|---|---|
| committer | László Németh <nemeth@numbertext.org> | 2019-06-28 13:51:43 +0200 |
| commit | 0970a47ae926bb47458b846e9dc8ff6f3607250c (patch) | |
| tree | 1a1c9222d8e288494183cadf8fe8ff81d68116bf /chart2 | |
| parent | 1ec6de1cff6a5f2c15aa85c12c6e327282ca8703 (diff) | |
tdf#126115 Chart OOXML Export: fix individual marker
Export linechart custom (individual) datapoint marker
settings into a <dPt> tag, as the OOXML Standard requires.
Change-Id: I939196c9ea6e091ac9dadb4d62dd85d5408d599c
Reviewed-on: https://gerrit.libreoffice.org/74837
Tested-by: Jenkins
Reviewed-by: László Németh <nemeth@numbertext.org>
Diffstat (limited to 'chart2')
| -rw-r--r-- | chart2/qa/extras/chart2export.cxx | 18 | ||||
| -rw-r--r-- | chart2/qa/extras/data/xlsx/tdf126115.xlsx | bin | 0 -> 20173 bytes |
2 files changed, 18 insertions, 0 deletions
diff --git a/chart2/qa/extras/chart2export.cxx b/chart2/qa/extras/chart2export.cxx index 7a0abcf0bc02..f00959bdbfeb 100644 --- a/chart2/qa/extras/chart2export.cxx +++ b/chart2/qa/extras/chart2export.cxx @@ -73,6 +73,7 @@ public: void testFdo78290LineChartMarkerX(); void testFdo78290ScatterChartMarkerX(); void testFdo78290CombinationChartMarkerX(); + void testTdf126115IndividualMarker(); void testAxisNumberFormatODS(); void testAxisNumberFormatXLS(); void testDataLabelBordersDOCX(); @@ -170,6 +171,7 @@ public: CPPUNIT_TEST(testFdo78290LineChartMarkerX); CPPUNIT_TEST(testFdo78290ScatterChartMarkerX); CPPUNIT_TEST(testFdo78290CombinationChartMarkerX); + CPPUNIT_TEST(testTdf126115IndividualMarker); CPPUNIT_TEST(testAxisNumberFormatODS); CPPUNIT_TEST(testAxisNumberFormatXLS); CPPUNIT_TEST(testDataLabelBordersDOCX); @@ -801,6 +803,22 @@ void Chart2ExportTest::testFdo78290CombinationChartMarkerX() assertXPath(pXmlDoc, "/c:chartSpace[1]/c:chart[1]/c:plotArea[1]/c:lineChart[1]/c:ser[1]/c:marker[1]/c:size[1]","val","7"); } +void Chart2ExportTest::testTdf126115IndividualMarker() +{ + // Check individual marker properties. + load("/chart2/qa/extras/data/xlsx/", "tdf126115.xlsx"); + xmlDocPtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML"); + CPPUNIT_ASSERT(pXmlDoc); + // 1. series + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:scatterChart/c:ser[1]/c:dPt/c:marker/c:symbol", "val", "square"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:scatterChart/c:ser[1]/c:dPt/c:marker/c:size", "val", "8"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:scatterChart/c:ser[1]/c:dPt/c:marker/c:spPr/a:solidFill/a:srgbClr", "val", "ff0000"); + // 2. series + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:scatterChart/c:ser[2]/c:dPt/c:marker/c:symbol", "val", "x"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:scatterChart/c:ser[2]/c:dPt/c:marker/c:size", "val", "15"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:scatterChart/c:ser[2]/c:dPt/c:marker/c:spPr/a:solidFill/a:srgbClr", "val", "7030a0"); +} + void Chart2ExportTest::testAxisNumberFormatODS() { struct diff --git a/chart2/qa/extras/data/xlsx/tdf126115.xlsx b/chart2/qa/extras/data/xlsx/tdf126115.xlsx Binary files differnew file mode 100644 index 000000000000..f845c06e3142 --- /dev/null +++ b/chart2/qa/extras/data/xlsx/tdf126115.xlsx |