svtools: load BitmapEx resources instead of Image ones

Change-Id: Ifc852b1cb886b30abdf1061b73c2b600334264c6

include/svtools/svtools.hrc

@@ -243,9 +243,11 @@
 #define DLG_ADDRESSBOOKSOURCE           (RID_SVTOOLS_START+114)
 
 // bitmaps
-
-#define BMP_PLUGIN                      (RID_SVTOOLS_BITMAP_START +   3)
-// free
+#define RID_BMP_TREENODE_COLLAPSED      (RID_SVTOOLS_BITMAP_START +   0)
+#define RID_BMP_TREENODE_EXPANDED       (RID_SVTOOLS_BITMAP_START +   1)
+#define RID_BMP_FOLDER                  (RID_SVTOOLS_BITMAP_START +   2)
+#define RID_BMP_FOLDER_OPEN             (RID_SVTOOLS_BITMAP_START +   3)
+#define BMP_PLUGIN                      (RID_SVTOOLS_BITMAP_START +   4)
 #define BMP_CURRENT                     (RID_SVTOOLS_BITMAP_START +   5)
 #define BMP_MODIFIED                    (RID_SVTOOLS_BITMAP_START +   6)
 #define BMP_NEW                         (RID_SVTOOLS_BITMAP_START +   7)
@@ -354,13 +356,6 @@
 #define BMP_OO_WRITER_TEMPLATE_LC       (RID_SVTOOLS_BITMAP_START + 110)
 #define BMP_EXTENSION_LC                (RID_SVTOOLS_BITMAP_START + 111)
 
-// images
-#define RID_IMG_TREENODE_COLLAPSED      (RID_SVTOOLS_START +  0)
-#define RID_IMG_TREENODE_EXPANDED       (RID_SVTOOLS_START +  1)
-
-#define IMG_SVT_FOLDER                  (RID_SVTOOLS_START + 42)
-#define IMG_SVT_FOLDER_OPEN             (RID_SVTOOLS_START + 43)
-
 #define STR_PARAGRAPH_START                 (STR_SVT_PRNDLG_START + 50)
 #define STR_PARAGRAPH                       (STR_PARAGRAPH_START + 0)
 

svtools/source/contnr/fileview.cxx

@@ -1461,7 +1461,7 @@ SvtFileView_Impl::SvtFileView_Impl( SvtFileView* pAntiImpl, Reference < XCommand
     ,mnSuspendSelectCallback    ( 0 )
     ,mbIsFirstResort            ( true )
     ,aIntlWrapper               ( Application::GetSettings().GetLanguageTag() )
-    ,maFolderImage              ( SvtResId( IMG_SVT_FOLDER ) )
+    ,maFolderImage              (BitmapEx(SvtResId(RID_BMP_FOLDER)))
     ,mxCmdEnv ( xEnv )
 
 {

svtools/source/contnr/fileview.src

@@ -68,16 +68,14 @@ String STR_SVT_GB
     Text [ en-US ] = "GB" ;
 };
 
-// Images ---------------------------------------------------------------------
-
-Image IMG_SVT_FOLDER
+Bitmap RID_BMP_FOLDER
 {
-    ImageBitmap = Bitmap { File = "folder.png" ; };
+    File = "folder.png";
 };
 
-Image IMG_SVT_FOLDER_OPEN
+Bitmap RID_BMP_FOLDER_OPEN
 {
-    ImageBitmap = Bitmap { File = "folderop.png" ; };
+    File = "folderop.png";
 };
 
 // Menus -----------------------------------------------------------------

svtools/source/contnr/foldertree.cxx

@@ -14,8 +14,8 @@
 
 FolderTree::FolderTree( vcl::Window* pParent, WinBits nBits )
     : SvTreeListBox( pParent, nBits | WB_SORT | WB_TABSTOP )
-    , m_aFolderImage( SvtResId( IMG_SVT_FOLDER ) )
-    , m_aFolderExpandedImage( SvtResId( IMG_SVT_FOLDER_OPEN ) )
+    , m_aFolderImage(BitmapEx(SvtResId(RID_BMP_FOLDER)))
+    , m_aFolderExpandedImage(BitmapEx(SvtResId(RID_BMP_FOLDER_OPEN)))
 {
     Reference< XComponentContext > xContext = ::comphelper::getProcessComponentContext();
     Reference< XInteractionHandler > xInteractionHandler(

svtools/source/contnr/svcontnr.src

@@ -19,14 +19,14 @@
 
 #include <svtools/svtools.hrc>
 
-Image RID_IMG_TREENODE_COLLAPSED
+Bitmap RID_BMP_TREENODE_COLLAPSED
 {
-    ImageBitmap = Bitmap { File = "plus.png"; } ;
+    File = "plus.png";
 };
 
-Image RID_IMG_TREENODE_EXPANDED
+Bitmap RID_BMP_TREENODE_EXPANDED
 {
-    ImageBitmap = Bitmap { File = "minus.png"; } ;
+    File = "minus.png";
 };
 
 // descriptions of accessible objects

svtools/source/contnr/svimpbox.cxx

@@ -3343,8 +3343,8 @@ void SvImpLBox::implInitDefaultNodeImages()
         // assume that all or nothing is initialized
         return;
 
-    s_pDefCollapsed  = new Image( SvtResId( RID_IMG_TREENODE_COLLAPSED ) );
-    s_pDefExpanded   = new Image( SvtResId( RID_IMG_TREENODE_EXPANDED ) );
+    s_pDefCollapsed = new Image(BitmapEx(SvtResId(RID_BMP_TREENODE_COLLAPSED)));
+    s_pDefExpanded = new Image(BitmapEx(SvtResId(RID_BMP_TREENODE_EXPANDED)));
 }
 
 

svtools/source/misc/imagemgr.cxx

@@ -541,7 +541,7 @@ static Image GetImageFromList_Impl( sal_uInt16 nImageId, bool bBig )
             return Image(BitmapEx(SvtResId(bBig ? BMP_TABLE_LC : BMP_TABLE_SC)));
         case IMG_FOLDER:
             // 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));
+            return Image(BitmapEx(SvtResId(bBig ? BMP_FOLDER_LC : RID_BMP_FOLDER)));
         case IMG_DXF:
             return Image(BitmapEx(SvtResId(bBig ? BMP_DXF_LC : BMP_DXF_SC)));
         case IMG_MET: