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/table | |
| 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/table')
| -rw-r--r-- | oox/source/drawingml/table/tablecell.cxx | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/oox/source/drawingml/table/tablecell.cxx b/oox/source/drawingml/table/tablecell.cxx index 45efa77e7b9e..47f41033b8e0 100644 --- a/oox/source/drawingml/table/tablecell.cxx +++ b/oox/source/drawingml/table/tablecell.cxx @@ -148,8 +148,11 @@ void applyTableStylePart( const ::oox::core::XmlFilterBase& rFilterBase, aTextCharProps.maAsianFont = rTableStylePart.getAsianFont(); aTextCharProps.maComplexFont = rTableStylePart.getComplexFont(); aTextCharProps.maSymbolFont = rTableStylePart.getSymbolFont(); - if (rTableStylePart.getTextColor().isUsed()) - aTextCharProps.maCharColor = rTableStylePart.getTextColor(); + if ( rTableStylePart.getTextColor().isUsed() ) + { + aTextCharProps.maFillProperties.maFillColor = rTableStylePart.getTextColor(); + aTextCharProps.maFillProperties.moFillType.set(XML_solidFill); + } if( rTableStylePart.getTextBoldStyle().is_initialized() ) aTextCharProps.moBold = *rTableStylePart.getTextBoldStyle(); if( rTableStylePart.getTextItalicStyle().is_initialized() ) |