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/inc | |
| 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/inc')
| -rw-r--r-- | oox/inc/drawingml/textcharacterproperties.hxx | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/oox/inc/drawingml/textcharacterproperties.hxx b/oox/inc/drawingml/textcharacterproperties.hxx index 6d7229a6a461..055e58f758f7 100644 --- a/oox/inc/drawingml/textcharacterproperties.hxx +++ b/oox/inc/drawingml/textcharacterproperties.hxx @@ -42,7 +42,6 @@ struct TextCharacterProperties TextFont maComplexFont; TextFont maComplexThemeFont; TextFont maSymbolFont; - Color maCharColor; Color maUnderlineColor; Color maHighlightColor; OptValue< OUString > moLang; @@ -56,7 +55,7 @@ struct TextCharacterProperties OptValue< bool > moItalic; OptValue< bool > moUnderlineLineFollowText; OptValue< bool > moUnderlineFillFollowText; - GradientFillProperties maGradientProps; /// Properties for gradient text colors + FillProperties maFillProperties; std::vector<css::beans::PropertyValue> maTextEffectsProperties; |