[Libreoffice-commits] core.git: svx/source
Noel Grandin (via logerrit)
logerrit at kemper.freedesktop.org
Fri Feb 14 12:28:44 UTC 2020
svx/source/dialog/_bmpmask.cxx | 4 ++++
1 file changed, 4 insertions(+)
New commits:
commit 407c45d54c189d5e9488e868e503f02955825b82
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: Fri Feb 14 13:28:09 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>
diff --git a/svx/source/dialog/_bmpmask.cxx b/svx/source/dialog/_bmpmask.cxx
index 770adefd82ec..90fc38673185 100644
--- a/svx/source/dialog/_bmpmask.cxx
+++ b/svx/source/dialog/_bmpmask.cxx
@@ -994,6 +994,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;
}
}
}
More information about the Libreoffice-commits
mailing list