oox/source/drawingml/chart/seriesconverter.cxx | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-)
New commits: commit ef921ee138d563706bd2f3edeb13f737fabe03ec Author: Markus Mohrhard <[email protected]> AuthorDate: Fri Nov 30 00:45:57 2018 +0100 Commit: Markus Mohrhard <[email protected]> CommitDate: Fri Nov 30 08:30:52 2018 +0100 tdf#121282, tdf#121279, set text properties also on complex data labels Change-Id: I2304b6050b786b6e4a9a8a968d7a4846d9da8be8 Reviewed-on: https://gerrit.libreoffice.org/64306 Tested-by: Jenkins Reviewed-by: Markus Mohrhard <[email protected]> (cherry picked from commit 6a04b9298ae993881d20fc4b5aa91516d4df6695) Reviewed-on: https://gerrit.libreoffice.org/64308 diff --git a/oox/source/drawingml/chart/seriesconverter.cxx b/oox/source/drawingml/chart/seriesconverter.cxx index 241b8a4e506a..716a0b234bdd 100644 --- a/oox/source/drawingml/chart/seriesconverter.cxx +++ b/oox/source/drawingml/chart/seriesconverter.cxx @@ -124,6 +124,14 @@ Reference< XLabeledDataSequence > lclCreateLabeledDataSequence( return xLabeledSeq; } +void convertTextProperty(PropertySet& rPropSet, ObjectFormatter& rFormatter, + DataLabelModelBase::TextBodyRef xTextProps) +{ + rFormatter.convertTextFormatting( rPropSet, xTextProps, OBJECTTYPE_DATALABEL ); + ObjectFormatter::convertTextRotation( rPropSet, xTextProps, false ); + ObjectFormatter::convertTextWrap( rPropSet, xTextProps ); +} + void lclConvertLabelFormatting( PropertySet& rPropSet, ObjectFormatter& rFormatter, const DataLabelModelBase& rDataLabel, const TypeGroupConverter& rTypeGroup, bool bDataSeriesLabel, bool bMSO2007Doc, const PropertySet* pSeriesPropSet ) @@ -171,10 +179,7 @@ void lclConvertLabelFormatting( PropertySet& rPropSet, ObjectFormatter& rFormatt rFormatter.convertNumberFormat( rPropSet, rDataLabel.maNumberFormat, false, bShowPercent ); // data label text formatting (frame formatting not supported by Chart2) - rFormatter.convertTextFormatting( rPropSet, rDataLabel.mxTextProp, OBJECTTYPE_DATALABEL ); - ObjectFormatter::convertTextRotation( rPropSet, rDataLabel.mxTextProp, false ); - ObjectFormatter::convertTextWrap( rPropSet, rDataLabel.mxTextProp ); - + 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() ) @@ -338,6 +343,7 @@ void DataLabelConverter::convertFromModel( const Reference< XDataSeries >& rxDat } aPropSet.setProperty( PROP_CustomLabelFields, makeAny( aSequence ) ); + convertTextProperty(aPropSet, getFormatter(), mrModel.mxText->mxTextBody); } } catch( Exception& ) _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
