[Libreoffice-commits] core.git: Branch 'libreoffice-6-4-1' - svx/source

[Noel Grandin (via logerrit)]

 svx/source/dialog/_bmpmask.cxx |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit ab6430960c92efa09b549cd70ee9e4eed47a01fe
Author:     Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Fri Feb 14 12:12:07 2020 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Mon Feb 17 15:37:07 2020 +0100

    tdf#130373 substitute color only works if left set to transparent.
    
    regression from
            commit e27be9dfbcf8636a7440f828435b1860dfa38977
            Date:   Wed Jul 3 15:07:44 2019 +0200
        move some Bitmap replace logic inside vcl
    
    Change-Id: I0d985314367e26134c940e54f485db373d4c3642
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88675
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
    (cherry picked from commit 407c45d54c189d5e9488e868e503f02955825b82)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88696
    Reviewed-by: Xisco Faulí <xiscofauli at libreoffice.org>
    (cherry picked from commit ed9bee5429294833476685b66f3e662ae27809b0)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88700
    Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
    Tested-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/svx/source/dialog/_bmpmask.cxx b/svx/source/dialog/_bmpmask.cxx
index b978311b0b7f..9dd2fb32d308 100644
--- a/svx/source/dialog/_bmpmask.cxx
+++ b/svx/source/dialog/_bmpmask.cxx
@@ -1006,6 +1006,10 @@ Graphic SvxBmpMask::Mask( const Graphic& rGraphic )
                         if ( aBitmapEx.GetSizePixel().Width() && aBitmapEx.GetSizePixel().Height() )
                         {
                             ImpMask( aBitmapEx );
+                            if ( aGraphic.IsTransparent() )
+                                aGraphic = Graphic( BitmapEx( aBitmapEx.GetBitmap(), aBitmapEx.GetMask() ) );
+                            else
+                                aGraphic = aBitmapEx;
                         }
                     }
                 }