diff options
| author | Balazs Varga <balazs.varga991@gmail.com> | 2021-06-08 09:24:48 +0200 |
|---|---|---|
| committer | Balazs Varga <varga.balazs3@nisz.hu> | 2021-06-10 14:01:52 +0200 |
| commit | 3b4c11350a631e27345e87ecfe258d12983cbfbc (patch) | |
| tree | 44d0e58e5dfe1ae5ca76d10fa27382f861288491 /chart2 | |
| parent | 8d2d627a13de56bb95802d8ca1086933314fee46 (diff) | |
tdf#142713 OOXML: export secondary axis of all chart types
where the secondary axis is supported by the chart model
and OOXML.
Change-Id: Ifbcc905139487965510063aa87991ce6f8df73ee
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116809
Tested-by: Jenkins
Reviewed-by: Balazs Varga <varga.balazs3@nisz.hu>
Diffstat (limited to 'chart2')
| -rw-r--r-- | chart2/qa/extras/chart2export.cxx | 20 | ||||
| -rw-r--r-- | chart2/qa/extras/data/xlsx/testSecondaryAxis.xlsx | bin | 0 -> 14757 bytes |
2 files changed, 20 insertions, 0 deletions
diff --git a/chart2/qa/extras/chart2export.cxx b/chart2/qa/extras/chart2export.cxx index dd8b40182d05..89dcdeb529fd 100644 --- a/chart2/qa/extras/chart2export.cxx +++ b/chart2/qa/extras/chart2export.cxx @@ -128,6 +128,7 @@ public: void testTdf96161(); void testMultipleAxisXLSX(); void testSecondaryAxisXLSX(); + void testBarChartSecondaryAxisXLSX(); CPPUNIT_TEST_SUITE(Chart2ExportTest); CPPUNIT_TEST(testErrorBarXLSX); @@ -221,6 +222,7 @@ public: CPPUNIT_TEST(testTdf96161); CPPUNIT_TEST(testMultipleAxisXLSX); CPPUNIT_TEST(testSecondaryAxisXLSX); + CPPUNIT_TEST(testBarChartSecondaryAxisXLSX); CPPUNIT_TEST_SUITE_END(); }; @@ -1925,6 +1927,24 @@ void Chart2ExportTest::testSecondaryAxisXLSX() assertXPathContent(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:lineChart[2]/c:ser[1]/c:tx/c:strRef/c:strCache/c:pt/c:v", "a"); } +void Chart2ExportTest::testBarChartSecondaryAxisXLSX() +{ + load(u"/chart2/qa/extras/data/xlsx/", "testSecondaryAxis.xlsx"); + xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML"); + CPPUNIT_ASSERT(pXmlDoc); + // Collect barchart axID on primary Axis + OUString XValueIdOf1Barchart = getXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart[1]/c:axId[1]", "val"); + OUString YValueIdOf1Barchart = getXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart[1]/c:axId[2]", "val"); + // Collect barchart axID on secondary Axis + OUString XValueIdOf2Barchart = getXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart[2]/c:axId[1]", "val"); + OUString YValueIdOf2Barchart = getXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart[2]/c:axId[2]", "val"); + // Check which c:catAx and c:valAx contain the AxisId of barcharts + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:catAx[1]/c:axId", "val", XValueIdOf1Barchart); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:valAx[1]/c:axId", "val", YValueIdOf1Barchart); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:catAx[2]/c:axId", "val", XValueIdOf2Barchart); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:valAx[2]/c:axId", "val", YValueIdOf2Barchart); +} + CPPUNIT_TEST_SUITE_REGISTRATION(Chart2ExportTest); CPPUNIT_PLUGIN_IMPLEMENT(); diff --git a/chart2/qa/extras/data/xlsx/testSecondaryAxis.xlsx b/chart2/qa/extras/data/xlsx/testSecondaryAxis.xlsx Binary files differnew file mode 100644 index 000000000000..6faa39b29480 --- /dev/null +++ b/chart2/qa/extras/data/xlsx/testSecondaryAxis.xlsx |