diff options
| author | Balazs Varga <balazs.varga991@gmail.com> | 2020-04-16 22:08:15 +0200 |
|---|---|---|
| committer | László Németh <nemeth@numbertext.org> | 2020-04-24 15:28:17 +0200 |
| commit | 75156c6fd73dc202df541306e1636727d51d6fc3 (patch) | |
| tree | 5b179fde360bc3c2d7d55ed2f67d99289496acfc /chart2 | |
| parent | loplugin:unusedenumconstants DragDropMode (diff) | |
| download | core-75156c6fd73dc202df541306e1636727d51d6fc3.tar.gz core-75156c6fd73dc202df541306e1636727d51d6fc3.zip | |
tdf#132076 Chart OOXML: fix lost date format of X axis
labels. Set the number format of category or date axes
too and use date axis type for date axes at import.
Export the real axis type of the X axis.
Change-Id: I45f5c69f0aadc4ec1db0b8873b5e374e2728d39c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92396
Tested-by: László Németh <nemeth@numbertext.org>
Reviewed-by: László Németh <nemeth@numbertext.org>
Diffstat (limited to 'chart2')
| -rw-r--r-- | chart2/qa/extras/chart2export.cxx | 20 | ||||
| -rw-r--r-- | chart2/qa/extras/data/ods/tdf132076.ods | bin | 0 -> 16138 bytes | |||
| -rw-r--r-- | chart2/qa/extras/data/xlsx/tdf132076.xlsx | bin | 0 -> 14632 bytes |
3 files changed, 20 insertions, 0 deletions
diff --git a/chart2/qa/extras/chart2export.cxx b/chart2/qa/extras/chart2export.cxx index 378e2361d034..b44d712dbd50 100644 --- a/chart2/qa/extras/chart2export.cxx +++ b/chart2/qa/extras/chart2export.cxx @@ -165,6 +165,7 @@ public: void testTdf75330(); void testTdf127792(); void testTdf131979(); + void testTdf132076(); CPPUNIT_TEST_SUITE(Chart2ExportTest); CPPUNIT_TEST(testErrorBarXLSX); @@ -293,6 +294,7 @@ public: CPPUNIT_TEST(testTdf75330); CPPUNIT_TEST(testTdf127792); CPPUNIT_TEST(testTdf131979); + CPPUNIT_TEST(testTdf132076); CPPUNIT_TEST_SUITE_END(); @@ -2711,6 +2713,24 @@ void Chart2ExportTest::testTdf131979() } } +void Chart2ExportTest::testTdf132076() +{ + { + load("/chart2/qa/extras/data/ods/", "tdf132076.ods"); + xmlDocPtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML"); + CPPUNIT_ASSERT(pXmlDoc); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:catAx/c:numFmt", "formatCode", "dd"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:catAx/c:numFmt", "sourceLinked", "0"); + } + { + load("/chart2/qa/extras/data/xlsx/", "tdf132076.xlsx"); + xmlDocPtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML"); + CPPUNIT_ASSERT(pXmlDoc); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:dateAx/c:numFmt", "formatCode", "dd"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:dateAx/c:numFmt", "sourceLinked", "0"); + } +} + CPPUNIT_TEST_SUITE_REGISTRATION(Chart2ExportTest); CPPUNIT_PLUGIN_IMPLEMENT(); diff --git a/chart2/qa/extras/data/ods/tdf132076.ods b/chart2/qa/extras/data/ods/tdf132076.ods Binary files differnew file mode 100644 index 000000000000..348dd0d71f25 --- /dev/null +++ b/chart2/qa/extras/data/ods/tdf132076.ods diff --git a/chart2/qa/extras/data/xlsx/tdf132076.xlsx b/chart2/qa/extras/data/xlsx/tdf132076.xlsx Binary files differnew file mode 100644 index 000000000000..799ef9c8555a --- /dev/null +++ b/chart2/qa/extras/data/xlsx/tdf132076.xlsx |