diff options
| author | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2023-06-11 00:57:36 +0900 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2023-06-20 08:48:55 +0200 |
| commit | abff4459415dac99c66ad4d6b13ece6755ac37ab (patch) | |
| tree | dee17f63b3fbc7b6e1d55544f055be5e71d9932f /oox | |
| parent | f451e05d997870bf5eb250bc9d4dc8c39ce1aa85 (diff) | |
ooxml: import and export background and fill theme colors props.
This adds support to import and export background and fill theme
color properties.
Change-Id: I0f40615fe2d06cdcb4f2f9752602fe2ec699c7b3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152835
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
(cherry picked from commit 9e121f3a6b95dab7525aa1583f810b2b504ce1b3)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153255
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Diffstat (limited to 'oox')
| -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 |