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

[Caolán McNamara]

 svtools/source/misc/imagemgr.cxx |    7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

New commits:
commit ff004d7d91ed7d4d871682c19f6db33f29dddc35
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sat Dec 31 14:28:27 2016 +0000

    coverity#1398229 Logically dead code
    
    Change-Id: I8d192d27497ddb4d736b6b3fe38dfa9463bba43a

diff --git a/svtools/source/misc/imagemgr.cxx b/svtools/source/misc/imagemgr.cxx
index 1a8a91c..f7eeb06 100644
--- a/svtools/source/misc/imagemgr.cxx
+++ b/svtools/source/misc/imagemgr.cxx
@@ -485,10 +485,6 @@ static sal_uInt16 GetFolderDescriptionId_Impl( const OUString& rURL )
 
 static Image GetImageFromList_Impl( sal_uInt16 nImageId, bool bBig )
 {
-    if ( !bBig && IMG_FOLDER == nImageId )
-        // return our new small folder image (256 colors)
-        return Image( SvtResId( IMG_SVT_FOLDER ) );
-
     switch (nImageId)
     {
         case IMG_IMPRESS:
@@ -544,7 +540,8 @@ static Image GetImageFromList_Impl( sal_uInt16 nImageId, bool bBig )
         case IMG_TABLE:
             return Image(BitmapEx(SvtResId(bBig ? BMP_TABLE_LC : BMP_TABLE_SC)));
         case IMG_FOLDER:
-            return Image(BitmapEx(SvtResId(bBig ? BMP_FOLDER_LC : BMP_FOLDER_SC)));
+            // if not bBig, then return our new small folder image (256 colors)
+            return bBig ? Image(BitmapEx(SvtResId(BMP_FOLDER_LC))) : Image(SvtResId(IMG_SVT_FOLDER));
         case IMG_DXF:
             return Image(BitmapEx(SvtResId(bBig ? BMP_DXF_LC : BMP_DXF_SC)));
         case IMG_MET: