diff options
| author | Matus Uzak <matus.uzak@gmail.com> | 2016-03-07 12:04:01 +0100 |
|---|---|---|
| committer | Katarina Behrens <Katarina.Behrens@cib.de> | 2016-03-10 10:20:46 +0000 |
| commit | 6802f760a69f3b1f203d70399f0d73764f9159d5 (patch) | |
| tree | 17252a9645bedcf4bdbdecd4cc8ef43ae589ce2a /oox/source/drawingml/chart/objectformatter.cxx | |
| parent | a076feda8e6541ce611866e3f20f65648ec2b50b (diff) | |
tdf#89927: PPTX import: Incorrect inheritance of text run fill properties
Make use of FillProperties in TextCharacterProperties. DrawingML:
Fill related elements in Text Run Properties are in sync with Table
Cell Properties and all of Line Properties.
Change-Id: I7c513ecfc5f94cf49e98a657384b5c0f5dddc1c7
Reviewed-on: https://gerrit.libreoffice.org/22979
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>
Diffstat (limited to 'oox/source/drawingml/chart/objectformatter.cxx')
| -rw-r--r-- | oox/source/drawingml/chart/objectformatter.cxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/oox/source/drawingml/chart/objectformatter.cxx b/oox/source/drawingml/chart/objectformatter.cxx index 9da925d4caf7..b2ac6e506008 100644 --- a/oox/source/drawingml/chart/objectformatter.cxx +++ b/oox/source/drawingml/chart/objectformatter.cxx @@ -881,8 +881,10 @@ TextFormatter::TextFormatter( ObjectFormatterData& rData, const AutoTextEntry* p if( const TextCharacterProperties* pTextProps = pTheme->getFontStyle( pAutoTextEntry->mnThemedFont ) ) *mxAutoText = *pTextProps; sal_Int32 nTextColor = getPhColor( -1 ); - if( nTextColor >= 0 ) - mxAutoText->maCharColor.setSrgbClr( nTextColor ); + if( nTextColor >= 0 ) { + mxAutoText->maFillProperties.maFillColor.setSrgbClr( nTextColor ); + mxAutoText->maFillProperties.moFillType.set(XML_solidFill); + } mxAutoText->moHeight = pAutoTextEntry->mnDefFontSize; mxAutoText->moBold = pAutoTextEntry->mbBold; |