[Libreoffice-commits] core.git: include/tools vcl/source

[Caolán McNamara]

 include/tools/rc.h             |    3 +--
 vcl/source/image/ImageList.cxx |    2 --
 2 files changed, 1 insertion(+), 4 deletions(-)

New commits:
commit d999e48fda17c3525a0c3798d36e1a2102b6f297
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Oct 6 13:36:27 2016 +0100

    drop unused RscImageListFlags::MaskColor
    
    Change-Id: Idb34feecb710c1415cf8863717809927665cd31b

diff --git a/include/tools/rc.h b/include/tools/rc.h
index 396c828..f37c5fe 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 629e123..b4c6c1e 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 )