From 702eb3d389f7525674f0743a46c987bc981394f3 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Wed, 25 May 2016 17:56:19 +0200 Subject: convert RSC_IMAGE to scoped enum and drop unused RSC_IMAGE_IMAGEBITMAP Change-Id: I6c38e5e8e17d288ab525bbef368ebbc7e860e154 Reviewed-on: https://gerrit.libreoffice.org/25458 Tested-by: Jenkins Reviewed-by: Noel Grandin --- vcl/source/image/Image.cxx | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) (limited to 'vcl/source/image/Image.cxx') diff --git a/vcl/source/image/Image.cxx b/vcl/source/image/Image.cxx index 607fed2b6f64..417c3fe3433d 100644 --- a/vcl/source/image/Image.cxx +++ b/vcl/source/image/Image.cxx @@ -56,27 +56,16 @@ Image::Image( const ResId& rResId ) : { pResMgr->Increment( sizeof( RSHEADER_TYPE ) ); - BitmapEx aBmpEx; - sal_uLong nObjMask = pResMgr->ReadLong(); + BitmapEx aBmpEx; + RscImageFlags nObjMask = (RscImageFlags)pResMgr->ReadLong(); - if( nObjMask & RSC_IMAGE_IMAGEBITMAP ) + if( nObjMask & RscImageFlags::ImageBitmap ) { aBmpEx = BitmapEx( ResId( static_cast(pResMgr->GetClass()), *pResMgr ) ); pResMgr->Increment( ResMgr::GetObjSize( static_cast(pResMgr->GetClass()) ) ); } - if( nObjMask & RSC_IMAGE_MASKBITMAP ) - { - if( !aBmpEx.IsEmpty() && aBmpEx.GetTransparentType() == TRANSPARENT_NONE ) - { - const Bitmap aMaskBitmap( ResId( static_cast(pResMgr->GetClass()), *pResMgr ) ); - aBmpEx = BitmapEx( aBmpEx.GetBitmap(), aMaskBitmap ); - } - - pResMgr->Increment( ResMgr::GetObjSize( static_cast(pResMgr->GetClass()) ) ); - } - - if( nObjMask & RSC_IMAGE_MASKCOLOR ) + if( nObjMask & RscImageFlags::MaskColor ) { if( !aBmpEx.IsEmpty() && aBmpEx.GetTransparentType() == TRANSPARENT_NONE ) { -- cgit