diff options
| author | Balazs Varga <balazs.varga991@gmail.com> | 2019-06-17 14:58:54 +0200 |
|---|---|---|
| committer | László Németh <nemeth@numbertext.org> | 2019-06-18 12:55:54 +0200 |
| commit | 1b26a6e7a4e3865d1555fa0612845c765b114b49 (patch) | |
| tree | 07802ae4fddc478d21e7d8d9be309192284b1ac2 /chart2 | |
| parent | cc0dc723c7d8354b5203310ef1381bbf54258eba (diff) | |
tdf#111824 Chart OOXML Export: fix Z axis labels
Export 3D barchart Z ("deep") axis properties into
<serAx> xml tag, as the OOXML Standard requires.
Change-Id: I8ee2282a28e9b4bdea6e96c96256f832b1a1aada
Reviewed-on: https://gerrit.libreoffice.org/74170
Tested-by: Jenkins
Reviewed-by: László Németh <nemeth@numbertext.org>
Tested-by: László Németh <nemeth@numbertext.org>
Diffstat (limited to 'chart2')
| -rw-r--r-- | chart2/qa/extras/chart2export.cxx | 14 | ||||
| -rw-r--r-- | chart2/qa/extras/data/xlsx/tdf111824.xlsx | bin | 0 -> 15235 bytes |
2 files changed, 14 insertions, 0 deletions
diff --git a/chart2/qa/extras/chart2export.cxx b/chart2/qa/extras/chart2export.cxx index b238f35f715a..7a0abcf0bc02 100644 --- a/chart2/qa/extras/chart2export.cxx +++ b/chart2/qa/extras/chart2export.cxx @@ -128,6 +128,7 @@ public: void testChartTitlePropertiesBitmapFillPPTX(); void testxAxisLabelsRotation(); void testTdf116163(); + void testTdf111824(); void testTdf119029(); void testTdf108022(); void testTdf121744(); @@ -224,6 +225,7 @@ public: CPPUNIT_TEST(testChartTitlePropertiesBitmapFillPPTX); CPPUNIT_TEST(testxAxisLabelsRotation); CPPUNIT_TEST(testTdf116163); + CPPUNIT_TEST(testTdf111824); CPPUNIT_TEST(testTdf119029); CPPUNIT_TEST(testTdf108022); CPPUNIT_TEST(testTdf121744); @@ -2081,6 +2083,18 @@ void Chart2ExportTest::testTdf116163() assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:catAx/c:txPr/a:bodyPr", "rot", "-5400000"); } +void Chart2ExportTest::testTdf111824() +{ + load("/chart2/qa/extras/data/xlsx/", "tdf111824.xlsx"); + xmlDocPtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML"); + CPPUNIT_ASSERT(pXmlDoc); + + // Collect 3D barchart Z axID + OUString zAxisIdOf3DBarchart = getXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:bar3DChart/c:axId[3]", "val"); + // 3D barchart Z axis properties should be in a serAx OOXML tag instead of catAx + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:serAx/c:axId", "val", zAxisIdOf3DBarchart); +} + void Chart2ExportTest::testTdf119029() { load("/chart2/qa/extras/data/odp/", "tdf119029.odp"); diff --git a/chart2/qa/extras/data/xlsx/tdf111824.xlsx b/chart2/qa/extras/data/xlsx/tdf111824.xlsx Binary files differnew file mode 100644 index 000000000000..ae86756c47ee --- /dev/null +++ b/chart2/qa/extras/data/xlsx/tdf111824.xlsx |