diff options
author | Rajashri <rajashri.udhoji@synerzip.com> | 2013-12-06 16:20:54 +0530 |
---|---|---|
committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2014-01-16 14:46:37 +0100 |
commit | c7cfe0876d7ca3d861cc6d8c1f84970f9f71def9 (patch) | |
tree | 1ed91a101fff11832875e5e5923c6038ddfc86ac /chart2/qa | |
parent | bcf116b7734d5111833189a4ce1cc1d3867fd492 (diff) |
fdo#72217 : Fix for corruption area chart with data labels after Round Trip.
For labels under one series, there were child tags created for every
data label individually.
for example, if under one series there are five labels, then under
<dLbls> there were 5 <dLbl> tags created separately.
This issue is resolved now.
Conflicts:
chart2/qa/extras/chart2export.cxx
Change-Id: I7ae214f413bc27728df8a3d4cb8f4d703cba2f77
Diffstat (limited to 'chart2/qa')
-rw-r--r-- | chart2/qa/extras/chart2export.cxx | 12 | ||||
-rw-r--r-- | chart2/qa/extras/data/docx/testAreaChartLoad.docx | bin | 0 -> 23962 bytes |
2 files changed, 12 insertions, 0 deletions
diff --git a/chart2/qa/extras/chart2export.cxx b/chart2/qa/extras/chart2export.cxx index 6cef73b26831..7b1629af69d2 100644 --- a/chart2/qa/extras/chart2export.cxx +++ b/chart2/qa/extras/chart2export.cxx @@ -39,6 +39,7 @@ public: void testChartDataTable(); void testChartExternalData(); void testEmbeddingsGrabBag(); + void testAreaChartLoad(); CPPUNIT_TEST_SUITE(Chart2ExportTest); CPPUNIT_TEST(test); @@ -50,6 +51,7 @@ public: CPPUNIT_TEST(testChartDataTable); CPPUNIT_TEST(testChartExternalData); CPPUNIT_TEST(testEmbeddingsGrabBag); + CPPUNIT_TEST(testAreaChartLoad); CPPUNIT_TEST_SUITE_END(); protected: @@ -440,6 +442,7 @@ void Chart2ExportTest::testCrosses() assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:catAx/c:crosses", "val", "autoZero"); } + void Chart2ExportTest::testChartDataTable() { load("/chart2/qa/extras/data/docx/", "testChartDataTable.docx"); @@ -500,6 +503,15 @@ void Chart2ExportTest::testEmbeddingsGrabBag() CPPUNIT_ASSERT(bEmbeddings); // Grab Bag has all the expected elements } +void Chart2ExportTest::testAreaChartLoad() +{ + load ("/chart2/qa/extras/data/docx/", "testAreaChartLoad.docx"); + xmlDocPtr pXmlDoc = parseExport("word/charts/chart","Office Open XML Text"); + CPPUNIT_ASSERT(pXmlDoc); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:areaChart/c:ser/c:dLbls/c:showVal", "val", "1"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:areaChart/c:ser/c:dLbls/c:dLbl", 0); +} + CPPUNIT_TEST_SUITE_REGISTRATION(Chart2ExportTest); CPPUNIT_PLUGIN_IMPLEMENT(); diff --git a/chart2/qa/extras/data/docx/testAreaChartLoad.docx b/chart2/qa/extras/data/docx/testAreaChartLoad.docx Binary files differnew file mode 100644 index 000000000000..9383f75cde34 --- /dev/null +++ b/chart2/qa/extras/data/docx/testAreaChartLoad.docx |