summaryrefslogtreecommitdiff
path: root/oox
diff options
context:
space:
mode:
authorlbenes <lukebenes@hotmail.com>2016-10-06 15:57:22 -0400
committerMiklos Vajna <vmiklos@collabora.co.uk>2016-10-07 07:07:19 +0000
commitade43e6a86e4f864e771f4b3008a428bc10fa55f (patch)
treec67c4b078578e2501cfbfd51657b064ba1b77479 /oox
parentbf25013d4332dd7ed18f591e1d8c0e9591b0a8a7 (diff)
tdf#102997 Fix Error in OOXML Transparency Conversion Math
This fixes the import logic for tdf#100830 to handle transparencies other than 50%. Change-Id: If4e2e369a9674488878bb0a4378d48292ea4e0cb Reviewed-on: https://gerrit.libreoffice.org/29581 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'oox')
-rw-r--r--oox/source/drawingml/fillproperties.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/oox/source/drawingml/fillproperties.cxx b/oox/source/drawingml/fillproperties.cxx
index 2acf94f5cc9c..ed8dbfcc5741 100644
--- a/oox/source/drawingml/fillproperties.cxx
+++ b/oox/source/drawingml/fillproperties.cxx
@@ -655,7 +655,7 @@ void FillProperties::pushToPropMap( ShapePropertyMap& rPropMap,
}
if (maBlipProps.moAlphaModFix.has())
- rPropMap.setProperty(ShapeProperty::FillTransparency, static_cast<sal_Int16>(maBlipProps.moAlphaModFix.get() / PER_PERCENT));
+ rPropMap.setProperty(ShapeProperty::FillTransparency, static_cast<sal_Int16>(100 - (maBlipProps.moAlphaModFix.get() / PER_PERCENT)));
}
break;