summaryrefslogtreecommitdiff
path: root/oox/source
diff options
context:
space:
mode:
authorJustin Luth <justin_luth@sil.org>2021-11-22 19:33:48 +0200
committerJustin Luth <jluth@mail.com>2021-11-23 06:57:23 +0100
commit283586c89a0542efb2d57a36ee3aad7cc5153ed5 (patch)
tree360cbb39556e1453fe5c1b735b25bca11a81113b /oox/source
parente2e7e217e99c3fcb86faeb378849f350a08e21d3 (diff)
tdf#138223 oox: don't set highlight color if it is transparent
Probably when this was first implemented in 6.4, it should have set a transparency threshold of when to accept the color as the background (perhaps at 50%). But since this has already been running for a while, I only cancel it if it is fully transparent. No existing unit tests matched this scenario. I'm not making a unit test because the color really ought to be set - it should just be transparent. LO doesn't seem to have a character highlight transparency capability, so this needs to be emulated. Change-Id: I7b295894e529f8345cadc9b30bc43598a9a02e2b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125670 Tested-by: Jenkins Reviewed-by: Justin Luth <jluth@mail.com>
Diffstat (limited to 'oox/source')
-rw-r--r--oox/source/drawingml/textcharacterproperties.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/oox/source/drawingml/textcharacterproperties.cxx b/oox/source/drawingml/textcharacterproperties.cxx
index a34cb14af639..93d642324782 100644
--- a/oox/source/drawingml/textcharacterproperties.cxx
+++ b/oox/source/drawingml/textcharacterproperties.cxx
@@ -195,7 +195,7 @@ void TextCharacterProperties::pushToPropMap( PropertyMap& rPropMap, const XmlFil
}
// TODO If bUnderlineFillFollowText uFillTx (CT_TextUnderlineFillFollowText) is set, fill color of the underline should be the same color as the text
- if( maHighlightColor.isUsed() )
+ if (maHighlightColor.isUsed() && maHighlightColor.getTransparency() != 100)
rPropMap.setProperty( PROP_CharBackColor, maHighlightColor.getColor( rFilter.getGraphicHelper() ));
else
rPropMap.setProperty( PROP_CharBackColor, sal_Int32(-1));