summaryrefslogtreecommitdiff
path: root/oox/source
diff options
context:
space:
mode:
authorXisco Fauli <xiscofauli@libreoffice.org>2022-04-20 17:58:15 +0200
committerAndras Timar <andras.timar@collabora.com>2022-04-25 11:13:51 +0200
commit4e833598f83aedec6aec46be8acf178e6b051638 (patch)
treefd5bdcbd183f4199d67e581aa990622b5549077e /oox/source
parent65d679e6f78a819e3f4a60143782308b0a8b19f4 (diff)
tdf#148685: Unset CharUnderlineColor and CharUnderlineHasColor properties
Change-Id: Iebf482434cd393f55ae3e4690580b573624d78b1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133219 Tested-by: Xisco Fauli <xiscofauli@libreoffice.org> Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> (cherry picked from commit 1c924efe1f80207a5e104d755615b1eb9a91d418) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133282 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
Diffstat (limited to 'oox/source')
-rw-r--r--oox/source/drawingml/textcharacterproperties.cxx6
1 files changed, 6 insertions, 0 deletions
diff --git a/oox/source/drawingml/textcharacterproperties.cxx b/oox/source/drawingml/textcharacterproperties.cxx
index 7ffeaeba8da2..be2409f5795c 100644
--- a/oox/source/drawingml/textcharacterproperties.cxx
+++ b/oox/source/drawingml/textcharacterproperties.cxx
@@ -195,6 +195,12 @@ void TextCharacterProperties::pushToPropMap( PropertyMap& rPropMap, const XmlFil
rPropMap.setProperty( PROP_CharUnderlineHasColor, true);
rPropMap.setProperty( PROP_CharUnderlineColor, maUnderlineColor.getColor( rFilter.getGraphicHelper() ));
}
+ else
+ {
+ rPropMap.setProperty( PROP_CharUnderlineHasColor, false);
+ rPropMap.setProperty( PROP_CharUnderlineColor, sal_Int32(-1));
+ }
+
// TODO If bUnderlineFillFollowText uFillTx (CT_TextUnderlineFillFollowText) is set, fill color of the underline should be the same color as the text
if (maHighlightColor.isUsed() && maHighlightColor.getTransparency() != 100)