diff options
| author | Balazs Varga <balazs.varga991@gmail.com> | 2019-02-18 12:50:03 +0100 |
|---|---|---|
| committer | László Németh <nemeth@numbertext.org> | 2019-02-20 10:47:16 +0100 |
| commit | 42fd10b0ab6c6f65ba6394f9ae216c0f13973221 (patch) | |
| tree | a97e74389fb631b732d664da88b79a9844c187dc /oox | |
| parent | dc14490b816aa71b1b949c0df7d678bacccce3c4 (diff) | |
Related: 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.
Change-Id: I7f562d814b74eba15b2fba2954efd42747dd7960
Reviewed-on: https://gerrit.libreoffice.org/67974
Tested-by: Jenkins
Reviewed-by: László Németh <nemeth@numbertext.org>
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/source/drawingml/chart/seriesconverter.cxx | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/oox/source/drawingml/chart/seriesconverter.cxx b/oox/source/drawingml/chart/seriesconverter.cxx index 8fd572d98faf..01e1d72562c5 100644 --- a/oox/source/drawingml/chart/seriesconverter.cxx +++ b/oox/source/drawingml/chart/seriesconverter.cxx @@ -182,8 +182,12 @@ void lclConvertLabelFormatting( PropertySet& rPropSet, ObjectFormatter& rFormatt convertTextProperty(rPropSet, rFormatter, rDataLabel.mxTextProp); // data label separator (do not overwrite series separator, if no explicit point separator is present) - if( bDataSeriesLabel || rDataLabel.moaSeparator.has() ) + // Set the data label separator to "new line" if the value is shown as percentage with a category name, + // just like in MS-Office. In any other case the default separator will be a semicolon. + if( bShowPercent && !bShowValue && ( bDataSeriesLabel || rDataLabel.moaSeparator.has() ) ) rPropSet.setProperty( PROP_LabelSeparator, rDataLabel.moaSeparator.get( "\n" ) ); + else if( bDataSeriesLabel || rDataLabel.moaSeparator.has() ) + rPropSet.setProperty( PROP_LabelSeparator, rDataLabel.moaSeparator.get( "; " ) ); // data label placement (do not overwrite series placement, if no explicit point placement is present) if( bDataSeriesLabel || rDataLabel.monLabelPos.has() ) |