From 75156c6fd73dc202df541306e1636727d51d6fc3 Mon Sep 17 00:00:00 2001 From: Balazs Varga Date: Thu, 16 Apr 2020 22:08:15 +0200 Subject: tdf#132076 Chart OOXML: fix lost date format of X axis MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: László Németh --- chart2/qa/extras/chart2export.cxx | 20 ++++++++++++++++++++ chart2/qa/extras/data/ods/tdf132076.ods | Bin 0 -> 16138 bytes chart2/qa/extras/data/xlsx/tdf132076.xlsx | Bin 0 -> 14632 bytes 3 files changed, 20 insertions(+) create mode 100644 chart2/qa/extras/data/ods/tdf132076.ods create mode 100644 chart2/qa/extras/data/xlsx/tdf132076.xlsx (limited to 'chart2') 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 new file mode 100644 index 000000000000..348dd0d71f25 Binary files /dev/null and b/chart2/qa/extras/data/ods/tdf132076.ods differ diff --git a/chart2/qa/extras/data/xlsx/tdf132076.xlsx b/chart2/qa/extras/data/xlsx/tdf132076.xlsx new file mode 100644 index 000000000000..799ef9c8555a Binary files /dev/null and b/chart2/qa/extras/data/xlsx/tdf132076.xlsx differ -- cgit