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

Caolán McNamara caolanm at redhat.com
Fri Mar 1 08:42:05 PST 2013


 vcl/source/gdi/image.cxx |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit a228c580c3107e6dae447fbae3bca544144a5c0b
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Mar 1 16:41:01 2013 +0000

    Resolves: fdo#61459 icons loaded from .res broken
    
    regression since 76b3e61bb4ac66decd7800ef309f3241e77d538f
    
    Change-Id: Idfc7789b402aba0d6ab41875a9efc3b990173af0

diff --git a/vcl/source/gdi/image.cxx b/vcl/source/gdi/image.cxx
index f0f205b..9c6bbef 100644
--- a/vcl/source/gdi/image.cxx
+++ b/vcl/source/gdi/image.cxx
@@ -347,6 +347,7 @@ ImageList::ImageList( const ResId& rResId ) :
         pResMgr->Increment( sizeof( RSHEADER_TYPE ) );
 
         sal_uLong                               nObjMask = pResMgr->ReadLong();
+        pResMgr->ReadString(); //skip string
         ::boost::scoped_ptr< Color >        spMaskColor;
 
         if( nObjMask & RSC_IMAGE_MASKCOLOR )


More information about the Libreoffice-commits mailing list