diff options
author | Jozsef Szakacs <zmx3@citromail.hu> | 2018-11-28 09:13:03 +0100 |
---|---|---|
committer | Aron Budea <aron.budea@collabora.com> | 2019-03-11 12:11:06 +0100 |
commit | 25e391fb6273c444bac8314213d49089403a7f04 (patch) | |
tree | b3397301b2cbce93d117cdb865a949d58d1d16d7 /chart2 | |
parent | 0982652eb252eb37beba7760b4a00b1f53ffa7c2 (diff) |
tdf#121744 XLSX Export Combinated Chart (Column and Line)
Each of the Column and Line Chart creates it's own x and y Axes.
So now the LineChart Exporter Method uses the same Axes as the BarChart.
Thanks for the help:
- Balazs Varga
- Adam Kovacs
Reviewed-on: https://gerrit.libreoffice.org/64146
Tested-by: Jenkins
Reviewed-by: László Németh <nemeth@numbertext.org>
Reviewed-on: https://gerrit.libreoffice.org/65449
(cherry picked from commit d58d92d72b00f45c56a3b0fe55ca9fd837d244a9)
Change-Id: Ie763cf831c2ce63ef204d1fdcbff634e7ca8fad5
Diffstat (limited to 'chart2')
-rwxr-xr-x | chart2/qa/extras/chart2export.cxx | 15 | ||||
-rw-r--r-- | chart2/qa/extras/data/docx/tdf121744.docx | bin | 0 -> 25221 bytes |
2 files changed, 15 insertions, 0 deletions
diff --git a/chart2/qa/extras/chart2export.cxx b/chart2/qa/extras/chart2export.cxx index 60166b8deb4a..d08dd31a8e19 100755 --- a/chart2/qa/extras/chart2export.cxx +++ b/chart2/qa/extras/chart2export.cxx @@ -121,6 +121,7 @@ public: void testCustomDataLabelMultipleSeries(); void testTdf119029(); void testTdf122031(); + void testTdf121744(); CPPUNIT_TEST_SUITE(Chart2ExportTest); CPPUNIT_TEST(testErrorBarXLSX); @@ -204,6 +205,7 @@ public: CPPUNIT_TEST(testCustomDataLabelMultipleSeries); CPPUNIT_TEST(testTdf119029); CPPUNIT_TEST(testTdf122031); + CPPUNIT_TEST(testTdf121744); CPPUNIT_TEST_SUITE_END(); protected: @@ -1939,6 +1941,19 @@ void Chart2ExportTest::testTdf122031() assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:pieChart/c:ser/c:dLbls/c:dLbl[3]/c:numFmt", "formatCode", "0.000%"); } +void Chart2ExportTest::testTdf121744() +{ + load("/chart2/qa/extras/data/docx/", "tdf121744.docx"); + xmlDocPtr pXmlDoc = parseExport("word/charts/chart","Office Open XML Text"); + CPPUNIT_ASSERT(pXmlDoc); + + OUString XValueId = getXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:axId[1]", "val"); + OUString YValueId = getXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:axId[2]", "val"); + + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:lineChart/c:axId[1]", "val", XValueId ); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:lineChart/c:axId[2]", "val", YValueId ); +} + CPPUNIT_TEST_SUITE_REGISTRATION(Chart2ExportTest); CPPUNIT_PLUGIN_IMPLEMENT(); diff --git a/chart2/qa/extras/data/docx/tdf121744.docx b/chart2/qa/extras/data/docx/tdf121744.docx Binary files differnew file mode 100644 index 000000000000..b5ff10098c6a --- /dev/null +++ b/chart2/qa/extras/data/docx/tdf121744.docx |