diff options
author | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2023-06-11 00:50:08 +0900 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.com> | 2023-06-16 08:18:05 +0200 |
commit | 100a896db9f9ec29ec7e132a732afde68c4ba88f (patch) | |
tree | e8b82e5fefaf96a2f28bbe50639a9f062331d24b /oox | |
parent | 7e6cfbb69356957d40775f030633edcf80ae7f1f (diff) |
ooxml: import and export char underline theme colors
This adds support to import and export char underline theme color
properties.
Change-Id: Ia8948ee5aacd20e0c2b7cbb1b2fdf97fc65c04e0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152834
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
(cherry picked from commit 953ef30494661788b2e980ece84b62c653d77321)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152993
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 | 2 | ||||
-rw-r--r-- | oox/source/token/properties.txt | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/oox/source/drawingml/textcharacterproperties.cxx b/oox/source/drawingml/textcharacterproperties.cxx index 0e1e2830a67f..1217c19441ae 100644 --- a/oox/source/drawingml/textcharacterproperties.cxx +++ b/oox/source/drawingml/textcharacterproperties.cxx @@ -206,6 +206,8 @@ void TextCharacterProperties::pushToPropMap( PropertyMap& rPropMap, const XmlFil { rPropMap.setProperty( PROP_CharUnderlineHasColor, true); rPropMap.setProperty( PROP_CharUnderlineColor, maUnderlineColor.getColor( rFilter.getGraphicHelper() )); + model::ComplexColor aComplexColor = maUnderlineColor.getComplexColor(); + rPropMap.setProperty( PROP_CharUnderlineComplexColor, model::color::createXComplexColor(aComplexColor)); } else { diff --git a/oox/source/token/properties.txt b/oox/source/token/properties.txt index 40988ffb0222..025b0628b9d8 100644 --- a/oox/source/token/properties.txt +++ b/oox/source/token/properties.txt @@ -91,6 +91,7 @@ CharStyleName CharTransparence CharUnderline CharUnderlineColor +CharUnderlineComplexColor CharUnderlineHasColor CharWeight CharWeightAsian |