[Libreoffice-commits] core.git: vcl/source

[Noel Grandin]

 vcl/source/gdi/bitmapex.cxx |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit e65918b837b6c84604413d0de3cfaedaf8a53913
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date:   Wed Apr 11 11:43:18 2018 +0200

    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 at libreoffice.org>
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

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: */