diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-09-15 12:12:12 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-09-15 12:38:44 +0200 |
| commit | ba37fb02c298aa79fd0418b82d7b44930d047b8c (patch) | |
| tree | 6e4a76df3542d5033c95bf3b65dbc56e82d41c1f /chart2/qa | |
| parent | 721f1eca1856ab42d1752bca22c87d87713cf1e7 (diff) | |
Ensure we export correct label placement value for clustered bar charts
This is similar to 7b8073906adca8dae24c04a23708a3f3d582218f (Ensure we
export correct labal placement value for percent/stacked charts.,
2014-08-07), in case a clustered bar chart has a top placement ("t" in
OOXML), then MSO complains as well.
Change-Id: Iffd991127784e0e732f6ae55de956a328a3a53e5
Diffstat (limited to 'chart2/qa')
| -rw-r--r-- | chart2/qa/extras/chart2export.cxx | 16 | ||||
| -rw-r--r-- | chart2/qa/extras/data/docx/clustered-bar-chart-labels.docx | bin | 0 -> 22977 bytes |
2 files changed, 16 insertions, 0 deletions
diff --git a/chart2/qa/extras/chart2export.cxx b/chart2/qa/extras/chart2export.cxx index 280d2fc88e5b..38bd92fb3df8 100644 --- a/chart2/qa/extras/chart2export.cxx +++ b/chart2/qa/extras/chart2export.cxx @@ -72,6 +72,7 @@ public: void testDataLabelBordersDOCX(); void testDataLabel3DChartDOCX(); void testDataLabelBarChartDOCX(); + void testDataLabelClusteredBarChartDOCX(); void testDataLabelRadarChartDOCX(); void testDataLabelDoughnutChartDOCX(); void testDataLabelAreaChartDOCX(); @@ -113,6 +114,7 @@ public: CPPUNIT_TEST(testDataLabelBordersDOCX); CPPUNIT_TEST(testDataLabel3DChartDOCX); CPPUNIT_TEST(testDataLabelBarChartDOCX); + CPPUNIT_TEST(testDataLabelClusteredBarChartDOCX); CPPUNIT_TEST(testDataLabelRadarChartDOCX); CPPUNIT_TEST(testDataLabelDoughnutChartDOCX); CPPUNIT_TEST(testDataLabelAreaChartDOCX); @@ -845,6 +847,20 @@ void Chart2ExportTest::testDataLabelBarChartDOCX() assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser[3]/c:dLbls/c:dLblPos", "val", "inBase"); } +void Chart2ExportTest::testDataLabelClusteredBarChartDOCX() +{ + load("/chart2/qa/extras/data/docx/", "clustered-bar-chart-labels.docx"); + + Reference<chart2::XChartDocument> xChartDoc(getChartDocFromWriter(0), uno::UNO_QUERY); + CPPUNIT_ASSERT(xChartDoc.is()); + + xmlDocPtr pXmlDoc = parseExport("word/charts/chart","Office Open XML Text"); + CPPUNIT_ASSERT(pXmlDoc); + + // This was "t", should be one of the allowed values. + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser[1]/c:dLbls/c:dLbl[2]/c:dLblPos", "val", "ctr"); +} + void Chart2ExportTest::testDataLabelRadarChartDOCX() { load("/chart2/qa/extras/data/docx/", "radar-chart-labels.docx"); diff --git a/chart2/qa/extras/data/docx/clustered-bar-chart-labels.docx b/chart2/qa/extras/data/docx/clustered-bar-chart-labels.docx Binary files differnew file mode 100644 index 000000000000..3b9941cc1ef2 --- /dev/null +++ b/chart2/qa/extras/data/docx/clustered-bar-chart-labels.docx |