diff options
| author | Noel Grandin <noel@peralex.com> | 2021-02-27 15:50:37 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-04-26 12:51:58 +0200 |
| commit | ddd2639a482befb4a3bf1f75a88e66c21a691b67 (patch) | |
| tree | 2d2a2a0695dce2b8b065f107368ef0412807fa73 /framework | |
| parent | 9c4e0c35d70659097b235028047efcb80dcfb10d (diff) | |
drop mask from BitmapEx
So that we have fewer cases to deal with when we transition to
32-bit bitmaps.
(*) rename maMask to maAlphaMask, since now it is only being used
for alpha duties.
(*) drop mbAlpha and mbTransparent to simplify state management,
the only thing we need to check for alpha is if maAlphaMask is
non-empty.
Change-Id: I06252e38e950e846a94b4c2ba8ea763be17801fe
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111679
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/source/fwe/classes/addonsoptions.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/framework/source/fwe/classes/addonsoptions.cxx b/framework/source/fwe/classes/addonsoptions.cxx index 93076e20d707..fad4fc858fdd 100644 --- a/framework/source/fwe/classes/addonsoptions.cxx +++ b/framework/source/fwe/classes/addonsoptions.cxx @@ -1586,7 +1586,7 @@ BitmapEx AddonsOptions_Impl::ReadImageFromURL(const OUString& aImageURL) if ( !aBmpSize.IsEmpty() ) { // Support non-transparent bitmaps to be downward compatible with OOo 1.1.x addons - if( !aBitmapEx.IsTransparent() ) + if( !aBitmapEx.IsAlpha() ) aBitmapEx = BitmapEx( aBitmapEx.GetBitmap(), COL_LIGHTMAGENTA ); aImage = aBitmapEx; @@ -1675,7 +1675,7 @@ bool AddonsOptions_Impl::CreateImageFromSequence( BitmapEx& rImage, Sequence< sa ReadDIBBitmapEx(rImage, aMemStream); - if( !rImage.IsTransparent() ) + if( !rImage.IsAlpha() ) { // Support non-transparent bitmaps to be downward compatible with OOo 1.1.x addons rImage = BitmapEx( rImage.GetBitmap(), COL_LIGHTMAGENTA ); |