diff options
author | Balazs Varga <balazs.varga991@gmail.com> | 2019-02-08 11:24:07 +0100 |
---|---|---|
committer | Bartosz Kosiorek <gang65@poczta.onet.pl> | 2019-03-05 08:56:08 +0100 |
commit | 592c6893156615695b7f95f53d71624a87650bf6 (patch) | |
tree | 5a5cafe37b7e94440bddf6a6116c6614bf33043f /chart2 | |
parent | 66b9f180c865d0ed57a297fe439a068f513b0fc6 (diff) |
tdf#122226 OOXML Chart Import: data label separator
Set the data label separator to "new line" if there is not
present explicit point separator and the "percentage format
wins over number value format". In MS-Office (2007/2010/2013/2016)
the defult separator is the "new line" in that case, any other
case the separator is a semicolon.
(cherry picked from commit de73efb96fbb1d268caea0f41acbe20a234ec59f)
(cherry picked from commit 42fd10b0ab6c6f65ba6394f9ae216c0f13973221)
Change-Id: I9ee0fb9f98fc1bb322892616af50954f4f8db0f9
Reviewed-on: https://gerrit.libreoffice.org/67758
Tested-by: Jenkins
Reviewed-by: Bartosz Kosiorek <gang65@poczta.onet.pl>
Diffstat (limited to 'chart2')
-rw-r--r-- | chart2/qa/extras/chart2import.cxx | 20 | ||||
-rwxr-xr-x | chart2/qa/extras/data/docx/testTdf122226.docx | bin | 0 -> 19648 bytes |
2 files changed, 20 insertions, 0 deletions
diff --git a/chart2/qa/extras/chart2import.cxx b/chart2/qa/extras/chart2import.cxx index aa46fbae8503..b429a3e7f20f 100644 --- a/chart2/qa/extras/chart2import.cxx +++ b/chart2/qa/extras/chart2import.cxx @@ -106,6 +106,7 @@ public: void testTdf109858(); // Pie chart label placement settings(XLSX) void testTdf111173(); + void testTdf122226(); void testInternalDataProvider(); @@ -177,6 +178,7 @@ public: CPPUNIT_TEST(testTdf90510); CPPUNIT_TEST(testTdf109858); CPPUNIT_TEST(testTdf111173); + CPPUNIT_TEST(testTdf122226); CPPUNIT_TEST(testInternalDataProvider); @@ -1440,6 +1442,24 @@ void Chart2ImportTest::testTdf111173() uno::Reference< chart::XChartDocument > xChart1Doc( getChartCompFromSheet( 0, mxComponent ), UNO_QUERY_THROW ); } +void Chart2ImportTest::testTdf122226() +{ + load( "/chart2/qa/extras/data/docx/", "testTdf122226.docx" ); + uno::Reference< chart2::XChartDocument > xChartDoc ( getChartDocFromWriter(0), uno::UNO_QUERY); + CPPUNIT_ASSERT( xChartDoc.is() ); + + css::uno::Reference<chart2::XDiagram> xDiagram(xChartDoc->getFirstDiagram(), UNO_QUERY_THROW); + Reference<chart2::XDataSeries> xDataSeries = getDataSeriesFromDoc(xChartDoc, 0); + uno::Reference<beans::XPropertySet> xPropertySet(xDataSeries->getDataPointByIndex(0), uno::UNO_QUERY_THROW); + CPPUNIT_ASSERT(xPropertySet.is()); + + uno::Any aAny = xPropertySet->getPropertyValue( "LabelSeparator" ); + CPPUNIT_ASSERT( aAny.hasValue() ); + OUString nLabelSeparator; + CPPUNIT_ASSERT( aAny >>= nLabelSeparator ); + CPPUNIT_ASSERT_EQUAL_MESSAGE( "Data labels should be separated into new lines", OUString("\n"), nLabelSeparator ); +} + void Chart2ImportTest::testTdf115107() { load("/chart2/qa/extras/data/pptx/", "tdf115107.pptx"); diff --git a/chart2/qa/extras/data/docx/testTdf122226.docx b/chart2/qa/extras/data/docx/testTdf122226.docx Binary files differnew file mode 100755 index 000000000000..7205525a7615 --- /dev/null +++ b/chart2/qa/extras/data/docx/testTdf122226.docx |