diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-04-11 11:43:18 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-04-11 15:53:49 +0200 |
| commit | e65918b837b6c84604413d0de3cfaedaf8a53913 (patch) | |
| tree | ddcbfd9016d930b6a6060cb47248a8f1df2798f1 | |
| parent | 4cd3c436923bfba281b1bf16d9785208a2119cea (diff) | |
tdf#116929 Transparent mask imported incorrectly
regression from
commit 8015e0a15d1b8c454c26c645c7e8ebee9c4e1ee1
Date: Fri Mar 16 13:43:08 2018 +0200
move some mask code from SvxMSDffManager::ImportGraphic inside
BitmapEx
Change-Id: Idee9728f1274f487f5c085f1756ccb5cf28430ec
Reviewed-on: https://gerrit.libreoffice.org/52716
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
| -rw-r--r-- | vcl/source/gdi/bitmapex.cxx | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/vcl/source/gdi/bitmapex.cxx b/vcl/source/gdi/bitmapex.cxx index 60ab459cdaaa..ed49233ddaf8 100644 --- a/vcl/source/gdi/bitmapex.cxx +++ b/vcl/source/gdi/bitmapex.cxx @@ -1454,6 +1454,7 @@ void BitmapEx::CombineMaskOr(Color maskColor, sal_uInt8 nTol) if ( IsTransparent() ) aNewMask.CombineSimple( maMask, BmpCombine::Or ); maMask = aNewMask; + meTransparent = TransparentType::Bitmap; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |