diff options
| author | lbenes <lukebenes@hotmail.com> | 2016-10-06 15:57:22 -0400 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-10-14 16:18:30 +0000 |
| commit | 24998064599e3371208ad8ae4b149d754828d35b (patch) | |
| tree | 5678f1e163e60cc272c39efe209e25fd595e3b82 /oox | |
| parent | 21122a831aee1d548c9c539b27f15588675ceee5 (diff) | |
tdf#102997 Fix Error in OOXML Transparency Conversion Math
This fixes the import logic for tdf#100830 to handle transparencies other than 50%.
(cherry picked from commit ade43e6a86e4f864e771f4b3008a428bc10fa55f)
Conflicts:
oox/source/drawingml/fillproperties.cxx
Change-Id: If4e2e369a9674488878bb0a4378d48292ea4e0cb
Reviewed-on: https://gerrit.libreoffice.org/29830
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Jenkins <ci@libreoffice.org>
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/source/drawingml/fillproperties.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/oox/source/drawingml/fillproperties.cxx b/oox/source/drawingml/fillproperties.cxx index c283212c9a1f..81a37479e5f1 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(SHAPEPROP_FillTransparency, static_cast<sal_Int16>(maBlipProps.moAlphaModFix.get() / PER_PERCENT)); + rPropMap.setProperty(SHAPEPROP_FillTransparency, static_cast<sal_Int16>(100 - (maBlipProps.moAlphaModFix.get() / PER_PERCENT))); } break; |