diff options
Diffstat (limited to 'oox/source')
| -rw-r--r-- | oox/source/drawingml/textcharacterproperties.cxx | 6 | ||||
| -rw-r--r-- | oox/source/token/properties.txt | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/oox/source/drawingml/textcharacterproperties.cxx b/oox/source/drawingml/textcharacterproperties.cxx index 1217c19441ae..c3dde4889a64 100644 --- a/oox/source/drawingml/textcharacterproperties.cxx +++ b/oox/source/drawingml/textcharacterproperties.cxx @@ -216,7 +216,11 @@ void TextCharacterProperties::pushToPropMap( PropertyMap& rPropMap, const XmlFil } if (maHighlightColor.isUsed() && maHighlightColor.getTransparency() != 100) - rPropMap.setProperty( PROP_CharBackColor, maHighlightColor.getColor( rFilter.getGraphicHelper() )); + { + rPropMap.setProperty(PROP_CharBackColor, maHighlightColor.getColor( rFilter.getGraphicHelper() )); + model::ComplexColor aComplexColor = maHighlightColor.getComplexColor(); + rPropMap.setProperty(PROP_CharBackgroundComplexColor, model::color::createXComplexColor(aComplexColor)); + } else rPropMap.setProperty( PROP_CharBackColor, sal_Int32(-1)); } diff --git a/oox/source/token/properties.txt b/oox/source/token/properties.txt index 025b0628b9d8..a6de5458b663 100644 --- a/oox/source/token/properties.txt +++ b/oox/source/token/properties.txt @@ -24,6 +24,7 @@ BackGraphicLocation BackGraphic Background BackgroundColor +BackgroundComplexColor BasicLibraries BlackDay BlockIncrement @@ -52,6 +53,7 @@ CenterHorizontally CenterVertically Change CharBackColor +CharBackgroundComplexColor CharCaseMap CharColor CharContoured |