diff options
| author | Jozsef Szakacs <zmx3@citromail.hu> | 2018-11-28 09:13:03 +0100 |
|---|---|---|
| committer | László Németh <nemeth@numbertext.org> | 2018-12-20 11:23:38 +0100 |
| commit | d58d92d72b00f45c56a3b0fe55ca9fd837d244a9 (patch) | |
| tree | 293fcac531d4b681d9964a36ba29c25e0b26896c /chart2 | |
| parent | ab24108a996879e76a08a17afdce59814a5531eb (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
Change-Id: Ie763cf831c2ce63ef204d1fdcbff634e7ca8fad5
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
Diffstat (limited to 'chart2')
| -rw-r--r-- | 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 d39a6829bd9f..45d9ff73f08f 100644 --- a/chart2/qa/extras/chart2export.cxx +++ b/chart2/qa/extras/chart2export.cxx @@ -123,6 +123,7 @@ public: void testxAxisLabelsRotation(); void testTdf116163(); void testTdf119029(); + void testTdf121744(); CPPUNIT_TEST_SUITE(Chart2ExportTest); CPPUNIT_TEST(testErrorBarXLSX); @@ -208,6 +209,7 @@ public: CPPUNIT_TEST(testxAxisLabelsRotation); CPPUNIT_TEST(testTdf116163); CPPUNIT_TEST(testTdf119029); + CPPUNIT_TEST(testTdf121744); CPPUNIT_TEST_SUITE_END(); protected: @@ -1949,6 +1951,19 @@ void Chart2ExportTest::testTdf119029() "-5400000"); } +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 |