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/textcharacterproperties.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/textcharacterproperties.cxx')
| -rw-r--r-- | oox/source/drawingml/textcharacterproperties.cxx | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/oox/source/drawingml/textcharacterproperties.cxx b/oox/source/drawingml/textcharacterproperties.cxx index 3d71c2db5824..48803de31157 100644 --- a/oox/source/drawingml/textcharacterproperties.cxx +++ b/oox/source/drawingml/textcharacterproperties.cxx @@ -48,7 +48,6 @@ void TextCharacterProperties::assignUsed( const TextCharacterProperties& rSource maComplexFont.assignIfUsed( rSourceProps.maComplexFont ); maComplexThemeFont.assignIfUsed( rSourceProps.maComplexThemeFont ); maSymbolFont.assignIfUsed( rSourceProps.maSymbolFont ); - maCharColor.assignIfUsed( rSourceProps.maCharColor ); maHighlightColor.assignIfUsed( rSourceProps.maHighlightColor ); maUnderlineColor.assignIfUsed( rSourceProps.maUnderlineColor ); moHeight.assignIfUsed( rSourceProps.moHeight ); @@ -63,7 +62,7 @@ void TextCharacterProperties::assignUsed( const TextCharacterProperties& rSource moUnderlineFillFollowText.assignIfUsed( rSourceProps.moUnderlineFillFollowText ); maTextEffectsProperties = rSourceProps.maTextEffectsProperties; - maGradientProps.assignUsed( rSourceProps.maGradientProps ); + maFillProperties.assignUsed( rSourceProps.maFillProperties ); } void TextCharacterProperties::pushToPropMap( PropertyMap& rPropMap, const XmlFilterBase& rFilter ) const @@ -103,12 +102,8 @@ void TextCharacterProperties::pushToPropMap( PropertyMap& rPropMap, const XmlFil rPropMap.setProperty( PROP_CharFontFamilyComplex, nFontFamily); } - // symbolfont, will now be ... textrun.cxx ... ausgewertet !!!i#113673 - - if( maCharColor.isUsed() ) - rPropMap.setProperty( PROP_CharColor, maCharColor.getColor( rFilter.getGraphicHelper() )); - if( maGradientProps.maGradientStops.size() > 0 ) - rPropMap.setProperty( PROP_CharColor, maGradientProps.maGradientStops.begin()->second.getColor( rFilter.getGraphicHelper() )); + if ( maFillProperties.moFillType.has() ) + rPropMap.setProperty( PROP_CharColor, maFillProperties.getBestSolidColor().getColor( rFilter.getGraphicHelper() )); if( moLang.has() && !moLang.get().isEmpty() ) { |