diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-10-06 13:36:27 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-10-06 13:45:59 +0100 |
| commit | d999e48fda17c3525a0c3798d36e1a2102b6f297 (patch) | |
| tree | f5789484733405935948add6127237f359ca5b99 | |
| parent | d47486ccd691f8681d324b3f86a345304300f3b5 (diff) | |
drop unused RscImageListFlags::MaskColor
Change-Id: Idb34feecb710c1415cf8863717809927665cd31b
| -rw-r--r-- | include/tools/rc.h | 3 | ||||
| -rw-r--r-- | vcl/source/image/ImageList.cxx | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/include/tools/rc.h b/include/tools/rc.h index 396c8286987e..f37c5fee58e6 100644 --- a/include/tools/rc.h +++ b/include/tools/rc.h @@ -147,12 +147,11 @@ namespace o3tl { // For "ImageList": enum class RscImageListFlags { - MaskColor = 0x04, IdList = 0x08, IdCount = 0x10 }; namespace o3tl { - template<> struct typed_flags<RscImageListFlags> : is_typed_flags<RscImageListFlags, 0x1c> {}; + template<> struct typed_flags<RscImageListFlags> : is_typed_flags<RscImageListFlags, 0x18> {}; } // FIXME obsolete, should be removed by MM diff --git a/vcl/source/image/ImageList.cxx b/vcl/source/image/ImageList.cxx index 629e123519f8..b4c6c1e62e03 100644 --- a/vcl/source/image/ImageList.cxx +++ b/vcl/source/image/ImageList.cxx @@ -58,8 +58,6 @@ ImageList::ImageList( const ResId& rResId ) : RscImageListFlags nObjMask = (RscImageListFlags)pResMgr->ReadLong(); pResMgr->ReadString(); //skip string - pResMgr->Increment( ResMgr::GetObjSize( static_cast<RSHEADER_TYPE*>(pResMgr->GetClass()) ) ); - if( nObjMask & RscImageListFlags::IdList ) { for( sal_Int32 i = 0, nCount = pResMgr->ReadLong(); i < nCount; ++i ) |