summaryrefslogtreecommitdiff
path: root/oox/source
diff options
context:
space:
mode:
authorJustin Luth <justin_luth@sil.org>2021-11-16 13:46:07 +0200
committerJustin Luth <jluth@mail.com>2021-11-20 15:13:02 +0100
commit823a351adb0384598304d597ae7f637079ca6175 (patch)
treec9ac608ae84020e4be11cdbb7a298736227461e3 /oox/source
parent2d445f90dbecf8d2240474dcb06084868ceb921a (diff)
tdf#118776 drawingml: treat XML_nofill as (mostly) transparent
100% transparent typically ends up as COL_AUTO which certainly doesn't do what is intended. So set as 99% transparent to get effectively the same invisible effect. Adapted patch and re-used unit test from an earlier commit authored by Xisco. This depends on tdf#137438 not spamming the text properties with outline props. Only one existing unit test that matched this condition: -export-tests-ooxml1.cxx customxml.pptx -empty textbox - text entered here SHOULD be invisible. Change-Id: I077b748e500713188421f0eeefdfd85c46555e84 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125301 Tested-by: Jenkins Tested-by: Xisco Fauli <xiscofauli@libreoffice.org> Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> Reviewed-by: Justin Luth <jluth@mail.com>
Diffstat (limited to 'oox/source')
-rw-r--r--oox/source/drawingml/textcharacterproperties.cxx5
1 files changed, 5 insertions, 0 deletions
diff --git a/oox/source/drawingml/textcharacterproperties.cxx b/oox/source/drawingml/textcharacterproperties.cxx
index 9200e9666cbf..a34cb14af639 100644
--- a/oox/source/drawingml/textcharacterproperties.cxx
+++ b/oox/source/drawingml/textcharacterproperties.cxx
@@ -111,6 +111,11 @@ void TextCharacterProperties::pushToPropMap( PropertyMap& rPropMap, const XmlFil
if ( maFillProperties.moFillType.has() )
{
Color aColor = maFillProperties.getBestSolidColor();
+
+ // noFill doesn't exist for characters. Map noFill to 99% transparency
+ if (maFillProperties.moFillType.get() == XML_noFill)
+ aColor.addTransformation(XML_alpha, 1000);
+
// tdf#137438 Emulate text outline color/transparency.
// If the outline color dominates, then use it as the text color.
if (moTextOutlineProperties.has()