chart2/qa/extras/chart2import.cxx | 20 ++++++++++++++++++++
chart2/qa/extras/data/docx/testTdf122226.docx |binary
oox/source/drawingml/chart/seriesconverter.cxx | 2 +-
3 files changed, 21 insertions(+), 1 deletion(-)
New commits:
commit de73efb96fbb1d268caea0f41acbe20a234ec59f
Author: Balazs Varga <balazs.varga...@gmail.com>
AuthorDate: Fri Feb 8 11:24:07 2019 +0100
Commit: László Németh <nem...@numbertext.org>
CommitDate: Tue Feb 12 10:15:27 2019 +0100
tdf#122226 OOXML Chart Import: data label new line separator
Set the data label separator to "new line" if there is not
present explicit point separator, just like in MS Office.
Change-Id: I9ee0fb9f98fc1bb322892616af50954f4f8db0f9
Reviewed-on: https://gerrit.libreoffice.org/67533
Tested-by: Jenkins
Reviewed-by: László Németh <nem...@numbertext.org>
diff --git a/chart2/qa/extras/chart2import.cxx
b/chart2/qa/extras/chart2import.cxx
index f4f87734f27c..0d8eda002a3b 100644
--- a/chart2/qa/extras/chart2import.cxx
+++ b/chart2/qa/extras/chart2import.cxx
@@ -105,6 +105,7 @@ public:
void testTdf109858(); // Pie chart label placement settings(XLSX)
void testTdf111173();
+ void testTdf122226();
void testInternalDataProvider();
@@ -180,6 +181,7 @@ public:
CPPUNIT_TEST(testTdf90510);
CPPUNIT_TEST(testTdf109858);
CPPUNIT_TEST(testTdf111173);
+ CPPUNIT_TEST(testTdf122226);
CPPUNIT_TEST(testInternalDataProvider);
@@ -1447,6 +1449,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
new file mode 100755
index 000000000000..7205525a7615
Binary files /dev/null and b/chart2/qa/extras/data/docx/testTdf122226.docx
differ
diff --git a/oox/source/drawingml/chart/seriesconverter.cxx
b/oox/source/drawingml/chart/seriesconverter.cxx
index 716a0b234bdd..8fd572d98faf 100644
--- a/oox/source/drawingml/chart/seriesconverter.cxx
+++ b/oox/source/drawingml/chart/seriesconverter.cxx
@@ -183,7 +183,7 @@ void lclConvertLabelFormatting( PropertySet& rPropSet,
ObjectFormatter& rFormatt
// data label separator (do not overwrite series separator, if no
explicit point separator is present)
if( bDataSeriesLabel || rDataLabel.moaSeparator.has() )
- rPropSet.setProperty( PROP_LabelSeparator,
rDataLabel.moaSeparator.get( "; " ) );
+ rPropSet.setProperty( PROP_LabelSeparator,
rDataLabel.moaSeparator.get( "\n" ) );
// data label placement (do not overwrite series placement, if no
explicit point placement is present)
if( bDataSeriesLabel || rDataLabel.monLabelPos.has() )
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
