diff options
| author | Muthu Subramanian <sumuthu@collabora.com> | 2014-03-28 17:24:45 +0530 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2014-04-28 11:07:21 +0200 |
| commit | ce609f477e488e9c701b2bfa893bcf01722d2a01 (patch) | |
| tree | b6b9f2234a39d7f5198f2fa89a2530da0fcb6497 | |
| parent | 66c01c7ba3882555642ce0c353ea3abf15bda2b5 (diff) | |
n#870234: Import gradfill for text colors.
Uses the first color from the gradfill list.
(Which is better than plain black!)
(cherry picked from commit cfc76de83e3c0a56abd30a8f3bd7c69d3500d223)
Signed-off-by: Andras Timar <andras.timar@collabora.com>
Conflicts:
oox/source/drawingml/textcharacterproperties.cxx
oox/source/drawingml/textcharacterpropertiescontext.cxx
Change-Id: I4c1c0c4b031f3681c95b75b3c0683eb4de95bffb
| -rw-r--r-- | include/oox/drawingml/textcharacterproperties.hxx | 2 | ||||
| -rw-r--r-- | oox/source/drawingml/textcharacterproperties.cxx | 3 | ||||
| -rw-r--r-- | oox/source/drawingml/textcharacterpropertiescontext.cxx | 4 |
3 files changed, 9 insertions, 0 deletions
diff --git a/include/oox/drawingml/textcharacterproperties.hxx b/include/oox/drawingml/textcharacterproperties.hxx index c07901554fac..d2335e16c9cf 100644 --- a/include/oox/drawingml/textcharacterproperties.hxx +++ b/include/oox/drawingml/textcharacterproperties.hxx @@ -24,6 +24,7 @@ #include <oox/helper/propertymap.hxx> #include <oox/drawingml/color.hxx> #include <oox/drawingml/textfont.hxx> +#include <oox/drawingml/fillproperties.hxx> namespace oox { class PropertySet; } @@ -53,6 +54,7 @@ struct TextCharacterProperties OptValue< bool > moItalic; OptValue< bool > moUnderlineLineFollowText; OptValue< bool > moUnderlineFillFollowText; + GradientFillProperties maGradientProps; /// Properties for gradient text colors /** Overwrites all members that are explicitly set in rSourceProps. */ void assignUsed( const TextCharacterProperties& rSourceProps ); diff --git a/oox/source/drawingml/textcharacterproperties.cxx b/oox/source/drawingml/textcharacterproperties.cxx index febb28ce86c9..a7be42be60ed 100644 --- a/oox/source/drawingml/textcharacterproperties.cxx +++ b/oox/source/drawingml/textcharacterproperties.cxx @@ -60,6 +60,7 @@ void TextCharacterProperties::assignUsed( const TextCharacterProperties& rSource moItalic.assignIfUsed( rSourceProps.moItalic ); moUnderlineLineFollowText.assignIfUsed( rSourceProps.moUnderlineLineFollowText ); moUnderlineFillFollowText.assignIfUsed( rSourceProps.moUnderlineFillFollowText ); + maGradientProps.assignUsed( rSourceProps.maGradientProps ); } void TextCharacterProperties::pushToPropMap( PropertyMap& rPropMap, const XmlFilterBase& rFilter, bool bUseOptional ) const @@ -93,6 +94,8 @@ void TextCharacterProperties::pushToPropMap( PropertyMap& rPropMap, const XmlFil if( maCharColor.isUsed() ) rPropMap[ PROP_CharColor ] <<= maCharColor.getColor( rFilter.getGraphicHelper() ); + if( maGradientProps.maGradientStops.size() > 0 ) + rPropMap[ PROP_CharColor ] <<= maGradientProps.maGradientStops.begin()->second.getColor( rFilter.getGraphicHelper() ); if( moLang.has() && !moLang.get().isEmpty() ) { diff --git a/oox/source/drawingml/textcharacterpropertiescontext.cxx b/oox/source/drawingml/textcharacterpropertiescontext.cxx index e166e6dcf1f0..6887cda3cdf6 100644 --- a/oox/source/drawingml/textcharacterpropertiescontext.cxx +++ b/oox/source/drawingml/textcharacterpropertiescontext.cxx @@ -132,6 +132,10 @@ ContextHandlerRef TextCharacterPropertiesContext::onCreateContext( sal_Int32 aEl case A_TOKEN( hlinkClick ): // CT_Hyperlink case A_TOKEN( hlinkMouseOver ): // CT_Hyperlink return new HyperLinkContext( *this, rAttribs, mrTextCharacterProperties.maHyperlinkPropertyMap ); + + case A_TOKEN( gradFill ): + return new GradientFillContext( *this, rAttribs, mrTextCharacterProperties.maGradientProps ); + } return this; |