diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-01-04 18:47:55 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-01-04 20:34:55 +0000 |
| commit | 59ad262ab97c497c3e8a24d2e4a65b38f1d1dbec (patch) | |
| tree | 246bfb7a2d60e020949604ba0b5c68a0f4042677 /vcl/source/image | |
| parent | f1a8e00764b32c3b799ecd40dcb4dd632493bc45 (diff) | |
last bitmaps that pMaskColor arg was used on converted to true transparency
Change-Id: I99bb32355bc53e2c870f84e60fc1e35b9dfe8270
Diffstat (limited to 'vcl/source/image')
| -rw-r--r-- | vcl/source/image/ImageList.cxx | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/vcl/source/image/ImageList.cxx b/vcl/source/image/ImageList.cxx index 748e19da8fb7..e9b8c33d96c4 100644 --- a/vcl/source/image/ImageList.cxx +++ b/vcl/source/image/ImageList.cxx @@ -120,19 +120,12 @@ void ImageList::InsertFromHorizontalStrip( const BitmapEx &rBitmapEx, void ImageList::InsertFromHorizontalBitmap( const ResId& rResId, sal_uInt16 nCount, - const Color *pMaskColor, const Color *pSearchColors, const Color *pReplaceColors, sal_uLong nColorCount) { BitmapEx aBmpEx( rResId ); - if (!aBmpEx.IsTransparent()) - { - if( pMaskColor ) - aBmpEx = BitmapEx( aBmpEx.GetBitmap(), *pMaskColor ); - else - aBmpEx = BitmapEx( aBmpEx.GetBitmap() ); - } + if ( nColorCount && pSearchColors && pReplaceColors ) aBmpEx.Replace( pSearchColors, pReplaceColors, nColorCount ); |