diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-02-14 12:12:07 +0200 |
|---|---|---|
| committer | Xisco Faulí <xiscofauli@libreoffice.org> | 2020-02-15 13:18:27 +0100 |
| commit | ed9bee5429294833476685b66f3e662ae27809b0 (patch) | |
| tree | 390b5918cd22b09cf26ff692dd252d33d6094d33 /svx | |
| parent | 069895a8961b474961b287e3139e4c4c042ad845 (diff) | |
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@collabora.co.uk>
(cherry picked from commit 407c45d54c189d5e9488e868e503f02955825b82)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88696
Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/dialog/_bmpmask.cxx | 4 |
1 files changed, 4 insertions, 0 deletions
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; } } } |