diff options
| author | Tamás Zolnai <tamas.zolnai@collabora.com> | 2019-08-22 15:57:41 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2019-08-29 09:40:33 +0200 |
| commit | 4719c2360a5fa347707d47db7e3e85a5f1dd267a (patch) | |
| tree | b66c84a3dc5c03b85f509a8bd91cfffe56b66e5e /oox | |
| parent | tdf#125340 transport preferred dialog parent down the migration dialog (diff) | |
| download | core-4719c2360a5fa347707d47db7e3e85a5f1dd267a.tar.gz core-4719c2360a5fa347707d47db7e3e85a5f1dd267a.zip | |
tdf#127085: FILESAVE: Transparency is lost after RT
Reviewed-on: https://gerrit.libreoffice.org/77963
Tested-by: Jenkins
Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com>
(cherry picked from commit 505cbb9c3d2771a12c989515663cc1eb73dd0c2f)
Change-Id: I22ba83b5cc00f84112a3755898ee2be58337afd6
Reviewed-on: https://gerrit.libreoffice.org/77978
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/source/export/drawingml.cxx | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx index 79046932000b..95d160ab5e4a 100644 --- a/oox/source/export/drawingml.cxx +++ b/oox/source/export/drawingml.cxx @@ -1272,14 +1272,18 @@ void DrawingML::WriteImageBrightnessContrastTransparence(uno::Reference<beans::X { sal_Int16 nBright = 0; sal_Int32 nContrast = 0; - sal_Int16 nTransparence = 0; + sal_Int32 nTransparence = 0; if (GetProperty(rXPropSet, "AdjustLuminance")) nBright = mAny.get<sal_Int16>(); if (GetProperty(rXPropSet, "AdjustContrast")) nContrast = mAny.get<sal_Int32>(); - if (GetProperty(rXPropSet, "Transparency")) - nTransparence = mAny.get<sal_Int16>(); + // Used for shapes with picture fill + if (GetProperty(rXPropSet, "FillTransparence")) + nTransparence = mAny.get<sal_Int32>(); + // Used for pictures + if (nTransparence == 0 && GetProperty(rXPropSet, "Transparency")) + nTransparence = static_cast<sal_Int32>(mAny.get<sal_Int16>()); if (nBright || nContrast) |