diff options
| author | Balazs Varga <balazs.varga991@gmail.com> | 2020-09-11 14:14:13 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2020-11-19 20:56:09 +0100 |
| commit | a360a150c8cdcbea4f6e8c40646795eb6a5f1dcc (patch) | |
| tree | a007e408bb7b0f3e56c4cc3d7a19a5e138eb0ad7 /chart2 | |
| parent | 61abda685e2bc1ec4b108614799b8bc1c01183ec (diff) | |
tdf#136267 OOXML Chart Import: create main category axis labels once
because InternalDataProvider can not handle different category names
on the primary and secondary category axis.
Revert e0b0502516a10181bbd1737b93b38b2bba4c98e8 commit, except
the relevant unit test.
Regression from commit: e0b0502516a10181bbd1737b93b38b2bba4c98e8
(tdf#128016 Chart OOXML Import: fix duplicated category labels)
Also fix tdf#129994 (FILEOPEN - hang at import time), which is a
a regression from commit fa0a981af41a2606541eec1cb20a379a739691e0
(tdf#114166 DOCX chart import: fix missing complex categories)
Change-Id: I5d049e760eb1a647ea774be264349a2f16f15f5b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102463
Tested-by: László Németh <nemeth@numbertext.org>
Reviewed-by: László Németh <nemeth@numbertext.org>
Signed-off-by: Xisco Fauli <xiscofauli@libreoffice.org>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103617
Tested-by: Jenkins
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106084
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Diffstat (limited to 'chart2')
| -rw-r--r-- | chart2/qa/extras/chart2export.cxx | 11 | ||||
| -rw-r--r-- | chart2/qa/extras/data/xlsx/tdf136267.xlsx | bin | 0 -> 31986 bytes | |||
| -rw-r--r-- | chart2/source/tools/ExplicitCategoriesProvider.cxx | 1 |
3 files changed, 12 insertions, 0 deletions
diff --git a/chart2/qa/extras/chart2export.cxx b/chart2/qa/extras/chart2export.cxx index 449ad70c0cb1..d0ed48c29902 100644 --- a/chart2/qa/extras/chart2export.cxx +++ b/chart2/qa/extras/chart2export.cxx @@ -153,6 +153,7 @@ public: void testCustomLabelText(); void testTdf131979(); void testTdf132594(); + void testTdf136267(); CPPUNIT_TEST_SUITE(Chart2ExportTest); CPPUNIT_TEST(testErrorBarXLSX); @@ -269,6 +270,7 @@ public: CPPUNIT_TEST(testCustomLabelText); CPPUNIT_TEST(testTdf131979); CPPUNIT_TEST(testTdf132594); + CPPUNIT_TEST(testTdf136267); CPPUNIT_TEST_SUITE_END(); @@ -2484,6 +2486,15 @@ void Chart2ExportTest::testTdf132594() assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:pieChart/c:ser/c:cat", 1); } +void Chart2ExportTest::testTdf136267() +{ + load("/chart2/qa/extras/data/xlsx/", "tdf136267.xlsx"); + xmlDocPtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML"); + CPPUNIT_ASSERT(pXmlDoc); + + assertXPathContent(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:cat/c:strRef/c:strCache/c:pt/c:v", "John"); +} + CPPUNIT_TEST_SUITE_REGISTRATION(Chart2ExportTest); CPPUNIT_PLUGIN_IMPLEMENT(); diff --git a/chart2/qa/extras/data/xlsx/tdf136267.xlsx b/chart2/qa/extras/data/xlsx/tdf136267.xlsx Binary files differnew file mode 100644 index 000000000000..741a33c429b9 --- /dev/null +++ b/chart2/qa/extras/data/xlsx/tdf136267.xlsx diff --git a/chart2/source/tools/ExplicitCategoriesProvider.cxx b/chart2/source/tools/ExplicitCategoriesProvider.cxx index b6652e25f11d..b9bc76d5b00d 100644 --- a/chart2/source/tools/ExplicitCategoriesProvider.cxx +++ b/chart2/source/tools/ExplicitCategoriesProvider.cxx @@ -53,6 +53,7 @@ ExplicitCategoriesProvider::ExplicitCategoriesProvider( const Reference< chart2: { if( xCooSysModel.is() ) { + // TODO: handle different category names on the primary and secondary category axis. uno::Reference< XAxis > xAxis( xCooSysModel->getAxisByDimension(0,0) ); if( xAxis.is() ) { |