diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2016-05-21 15:37:47 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2016-05-22 17:53:52 +0000 |
| commit | ef0e063938d1821f362a975ae83c2ab212267b98 (patch) | |
| tree | 7538dfc1f8c54ab4a90edea815ce6564c8754682 /vcl | |
| parent | a887bed580a3e6388f8da0c5a19fd87888e11e95 (diff) | |
Convert RSC_IMAGELIST to scoped enum
Change-Id: Iaf5f0723ab3e23e9afa1836a1b4cd8af2d86f010
Reviewed-on: https://gerrit.libreoffice.org/25257
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/image/ImageList.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/vcl/source/image/ImageList.cxx b/vcl/source/image/ImageList.cxx index 7c602223e4c2..1ba8768f22a2 100644 --- a/vcl/source/image/ImageList.cxx +++ b/vcl/source/image/ImageList.cxx @@ -55,16 +55,16 @@ ImageList::ImageList( const ResId& rResId ) : { pResMgr->Increment( sizeof( RSHEADER_TYPE ) ); - sal_uLong nObjMask = pResMgr->ReadLong(); + RscImageListFlags nObjMask = (RscImageListFlags)pResMgr->ReadLong(); pResMgr->ReadString(); //skip string std::unique_ptr< Color > xMaskColor; - if( nObjMask & RSC_IMAGE_MASKCOLOR ) + if( nObjMask & RscImageListFlags::MaskColor ) xMaskColor.reset( new Color( ResId( static_cast<RSHEADER_TYPE*>(pResMgr->GetClass()), *pResMgr ) ) ); pResMgr->Increment( ResMgr::GetObjSize( static_cast<RSHEADER_TYPE*>(pResMgr->GetClass()) ) ); - if( nObjMask & RSC_IMAGELIST_IDLIST ) + if( nObjMask & RscImageListFlags::IdList ) { for( sal_Int32 i = 0, nCount = pResMgr->ReadLong(); i < nCount; ++i ) pResMgr->ReadLong(); @@ -81,7 +81,7 @@ ImageList::ImageList( const ResId& rResId ) : mpImplData->AddImage( aName, nId, aEmpty ); } - if( nObjMask & RSC_IMAGELIST_IDCOUNT ) + if( nObjMask & RscImageListFlags::IdCount ) pResMgr->ReadShort(); } } |