summaryrefslogtreecommitdiff
path: root/chart2
diff options
context:
space:
mode:
authorTünde Tóth <tundeth@gmail.com>2020-05-26 13:34:32 +0200
committerMichael Meeks <michael.meeks@collabora.com>2020-06-02 17:31:23 +0100
commit8a491038c13e977c5ab28292f2df1abf2426ad09 (patch)
tree878fd027d6baa47c93f2885fb74cf2718afc73c4 /chart2
parent8257c984cc2f7c32ef096102fd7d588d6f1e7497 (diff)
tdf#132594 Chart XLSX import: fix legend entries in pie charts
Legend entry text of pie chart wasn't imported correctly in XLSX documents created with Excel 2007. Regression from commit: e0b0502516a10181bbd1737b93b38b2bba4c98e8 (tdf#128016 Chart OOXML Import: fix duplicated category labels) Change-Id: I4567437a41fe66e124dccbd148c0c49196d5c007 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94864 Tested-by: Jenkins 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/+/95294
Diffstat (limited to 'chart2')
-rw-r--r--chart2/qa/extras/chart2export.cxx11
-rw-r--r--chart2/qa/extras/data/xlsx/chart_pie2007.xlsxbin0 -> 11299 bytes
2 files changed, 11 insertions, 0 deletions
diff --git a/chart2/qa/extras/chart2export.cxx b/chart2/qa/extras/chart2export.cxx
index 6826c3f53569..cb9e4aa32df3 100644
--- a/chart2/qa/extras/chart2export.cxx
+++ b/chart2/qa/extras/chart2export.cxx
@@ -152,6 +152,7 @@ public:
void testTdf123206_customLabelText();
void testCustomLabelText();
void testTdf131979();
+ void testTdf132594();
CPPUNIT_TEST_SUITE(Chart2ExportTest);
CPPUNIT_TEST(testErrorBarXLSX);
@@ -267,6 +268,7 @@ public:
CPPUNIT_TEST(testTdf123206_customLabelText);
CPPUNIT_TEST(testCustomLabelText);
CPPUNIT_TEST(testTdf131979);
+ CPPUNIT_TEST(testTdf132594);
CPPUNIT_TEST_SUITE_END();
@@ -2467,6 +2469,15 @@ void Chart2ExportTest::testTdf131979()
}
}
+void Chart2ExportTest::testTdf132594()
+{
+ load("/chart2/qa/extras/data/xlsx/", "chart_pie2007.xlsx");
+ xmlDocPtr pXmlDoc = parseExport("xl/charts/chart","Calc Office Open XML");
+ CPPUNIT_ASSERT(pXmlDoc);
+
+ assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:pieChart/c:ser/c:cat", 1);
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(Chart2ExportTest);
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/chart2/qa/extras/data/xlsx/chart_pie2007.xlsx b/chart2/qa/extras/data/xlsx/chart_pie2007.xlsx
new file mode 100644
index 000000000000..b122680257c0
--- /dev/null
+++ b/chart2/qa/extras/data/xlsx/chart_pie2007.xlsx
Binary files differ