diff options
| author | Balazs Varga <balazs.varga991@gmail.com> | 2019-02-13 08:40:55 +0100 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2019-02-16 10:48:42 +0100 |
| commit | f394d911c00d96537841873d1ba20be9df58f5fd (patch) | |
| tree | 35ea34a38f7e3822905e779cb35163bb06d89fda /chart2 | |
| parent | a65e4b9050bea3e15d6fd0bba0be3022404583e7 (diff) | |
tdf#123400 OOXML Chart: Export Data Label Separator
Export the data label separator XML tag and
the separated character to OOXML.
Change-Id: I9b3bcb588e42a42494107ebde70f4a72492cfac4
Reviewed-on: https://gerrit.libreoffice.org/67753
Tested-by: Jenkins
Reviewed-by: László Németh <nemeth@numbertext.org>
(cherry picked from commit e32e5e61b509dcae0462419acfc556d445895840)
Reviewed-on: https://gerrit.libreoffice.org/67772
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Diffstat (limited to 'chart2')
| -rw-r--r-- | chart2/qa/extras/chart2export.cxx | 20 | ||||
| -rwxr-xr-x | chart2/qa/extras/data/docx/testLabelSeparator.docx | bin | 0 -> 25333 bytes |
2 files changed, 20 insertions, 0 deletions
diff --git a/chart2/qa/extras/chart2export.cxx b/chart2/qa/extras/chart2export.cxx index 45d9ff73f08f..88d58bd7c683 100644 --- a/chart2/qa/extras/chart2export.cxx +++ b/chart2/qa/extras/chart2export.cxx @@ -117,6 +117,7 @@ public: void testCustomDataLabel(); void testCustomDataLabelMultipleSeries(); void testNumberFormatExportPPTX(); + void testLabelSeparatorExportDOCX(); void testChartTitlePropertiesColorFillPPTX(); void testChartTitlePropertiesGradientFillPPTX(); void testChartTitlePropertiesBitmapFillPPTX(); @@ -203,6 +204,7 @@ public: CPPUNIT_TEST(testCustomDataLabel); CPPUNIT_TEST(testCustomDataLabelMultipleSeries); CPPUNIT_TEST(testNumberFormatExportPPTX); + CPPUNIT_TEST(testLabelSeparatorExportDOCX); CPPUNIT_TEST(testChartTitlePropertiesColorFillPPTX); CPPUNIT_TEST(testChartTitlePropertiesGradientFillPPTX); CPPUNIT_TEST(testChartTitlePropertiesBitmapFillPPTX); @@ -1892,6 +1894,24 @@ void Chart2ExportTest::testNumberFormatExportPPTX() assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:dLbls/c:numFmt", "sourceLinked", "0"); } +void Chart2ExportTest::testLabelSeparatorExportDOCX() +{ + load("/chart2/qa/extras/data/docx/", "testLabelSeparator.docx"); + + Reference<chart2::XChartDocument> xChartDoc(getChartDocFromWriter(0), uno::UNO_QUERY); + CPPUNIT_ASSERT(xChartDoc.is()); + + xmlDocPtr pXmlDoc = parseExport("word/charts/chart","Office Open XML Text"); + CPPUNIT_ASSERT(pXmlDoc); + + // The text separator should be a new line + assertXPathContent(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser[1]/c:dLbls/c:separator", "\n"); + // The text separator should be a comma + assertXPathContent(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser[2]/c:dLbls/c:separator", ", "); + // The text separator should be a semicolon + assertXPathContent(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser[3]/c:dLbls/c:separator", "; "); +} + void Chart2ExportTest::testChartTitlePropertiesColorFillPPTX() { load("/chart2/qa/extras/data/pptx/", "testChartTitlePropertiesColorFill.pptx"); diff --git a/chart2/qa/extras/data/docx/testLabelSeparator.docx b/chart2/qa/extras/data/docx/testLabelSeparator.docx Binary files differnew file mode 100755 index 000000000000..452fdccc9403 --- /dev/null +++ b/chart2/qa/extras/data/docx/testLabelSeparator.docx |