diff options
| author | Balazs Varga <balazs.varga991@gmail.com> | 2020-01-26 20:59:21 +0100 |
|---|---|---|
| committer | László Németh <nemeth@numbertext.org> | 2020-01-28 10:00:40 +0100 |
| commit | 296f3f8e4a5337b82fc72845662b5d5749acdf99 (patch) | |
| tree | d8019328259bcada628a32cf3786e690fe222870 /oox | |
| parent | c8a27f91dad1d84da76f0862954956570b56a602 (diff) | |
tdf#108107 OOXML chart: fix format of custom data point labels
Do not overwrite the property of moved data point labels
with default values, but use the data series properties for
these labels.
Change-Id: Id27fa1c2d8286584b2b87b7eb7a64fd9b416dc34
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87463
Tested-by: Jenkins
Reviewed-by: László Németh <nemeth@numbertext.org>
Tested-by: László Németh <nemeth@numbertext.org>
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/source/drawingml/chart/seriesconverter.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/oox/source/drawingml/chart/seriesconverter.cxx b/oox/source/drawingml/chart/seriesconverter.cxx index dccd19713833..62f78a28e383 100644 --- a/oox/source/drawingml/chart/seriesconverter.cxx +++ b/oox/source/drawingml/chart/seriesconverter.cxx @@ -177,7 +177,8 @@ void lclConvertLabelFormatting( PropertySet& rPropSet, ObjectFormatter& rFormatt rFormatter.convertNumberFormat( rPropSet, rDataLabel.maNumberFormat, false, bShowPercent ); // data label text formatting (frame formatting not supported by Chart2) - convertTextProperty(rPropSet, rFormatter, rDataLabel.mxTextProp); + if( bDataSeriesLabel || (rDataLabel.mxTextProp.is() && !rDataLabel.mxTextProp->getParagraphs().empty()) ) + convertTextProperty(rPropSet, rFormatter, rDataLabel.mxTextProp); // data label separator (do not overwrite series separator, if no explicit point separator is present) // Set the data label separator to "new line" if the value is shown as percentage with a category name, |