d*: load BitmapEx resources instead of Image ones

Change-Id: Ibf741af5e5043fae6139a19cec3d244dee06f225

13 files changed, 72 insertions, 79 deletions

diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.cxx b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
index 512005e8f9a4..91a2508e485e 100644
--- a/dbaccess/source/ui/app/AppDetailPageHelper.cxx
+++ b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
@@ -713,9 +713,9 @@ void OAppDetailPageHelper::fillNames( const Reference< XNameAccess >& _xContaine
             {
                 pEntry = pList->InsertEntry( *pIter, _pParent );
 
-                Image aImage{ ModuleRes( _nImageId ) };
-                pList->SetExpandedEntryBmp(  pEntry, aImage );
-                pList->SetCollapsedEntryBmp( pEntry, aImage );
+                Image aImage{BitmapEx(ModuleRes(_nImageId))};
+                pList->SetExpandedEntryBmp(pEntry, aImage);
+                pList->SetCollapsedEntryBmp(pEntry, aImage);
             }
         }
     }
@@ -842,7 +842,7 @@ SvTreeListEntry* OAppDetailPageHelper::elementAdded(ElementType _eType,const OUS
         {
             pRet = pTreeView->InsertEntry( _rName, pEntry );
 
-            Image aImage{ ModuleRes( nImageId ) };
+            Image aImage{BitmapEx(ModuleRes(nImageId))};
             pTreeView->SetExpandedEntryBmp(  pRet, aImage );
             pTreeView->SetCollapsedEntryBmp( pRet, aImage );
         }
diff --git a/dbaccess/source/ui/app/AppIconControl.cxx b/dbaccess/source/ui/app/AppIconControl.cxx
index 14d623485f52..4ac9205b108f 100644
--- a/dbaccess/source/ui/app/AppIconControl.cxx
+++ b/dbaccess/source/ui/app/AppIconControl.cxx
@@ -42,16 +42,16 @@ OApplicationIconControl::OApplicationIconControl(vcl::Window* _pParent)
         ElementType eType;
         sal_uInt16      nImageResId;
     }   aCategories[] = {
-        { RID_STR_TABLES_CONTAINER,     E_TABLE,    IMG_TABLEFOLDER_TREE_L  },
-        { RID_STR_QUERIES_CONTAINER,    E_QUERY,    IMG_QUERYFOLDER_TREE_L  },
-        { RID_STR_FORMS_CONTAINER,      E_FORM,     IMG_FORMFOLDER_TREE_L   },
-        { RID_STR_REPORTS_CONTAINER,    E_REPORT,   IMG_REPORTFOLDER_TREE_L }
+        { RID_STR_TABLES_CONTAINER,     E_TABLE,    BMP_TABLEFOLDER_TREE_L  },
+        { RID_STR_QUERIES_CONTAINER,    E_QUERY,    BMP_QUERYFOLDER_TREE_L  },
+        { RID_STR_FORMS_CONTAINER,      E_FORM,     BMP_FORMFOLDER_TREE_L   },
+        { RID_STR_REPORTS_CONTAINER,    E_REPORT,   BMP_REPORTFOLDER_TREE_L }
     };
     for (const CategoryDescriptor& aCategorie : aCategories)
     {
         SvxIconChoiceCtrlEntry* pEntry = InsertEntry(
             OUString( ModuleRes( aCategorie.nLabelResId ) ) ,
-            Image(  ModuleRes( aCategorie.nImageResId ) ) );
+            Image(BitmapEx(ModuleRes(aCategorie.nImageResId))));
         if ( pEntry )
             pEntry->SetUserData( new ElementType( aCategorie.eType ) );
     }
diff --git a/dbaccess/source/ui/dlg/CollectionView.cxx b/dbaccess/source/ui/dlg/CollectionView.cxx
index 65cf5de52a44..8899c2646bc1 100644
--- a/dbaccess/source/ui/dlg/CollectionView.cxx
+++ b/dbaccess/source/ui/dlg/CollectionView.cxx
@@ -80,8 +80,8 @@ OCollectionView::OCollectionView( vcl::Window * pParent
     m_pName->GrabFocus();
 
     m_pNewFolder->SetStyle( m_pNewFolder->GetStyle() | WB_NOPOINTERFOCUS );
-    m_pUp->SetModeImage(Image(ModuleRes(IMG_NAVIGATION_BTN_UP_SC)));
-    m_pNewFolder->SetModeImage(Image(ModuleRes(IMG_NAVIGATION_CREATEFOLDER_SC)));
+    m_pUp->SetModeImage(Image(BitmapEx(ModuleRes(BMP_NAVIGATION_BTN_UP_SC))));
+    m_pNewFolder->SetModeImage(Image(BitmapEx(ModuleRes(BMP_NAVIGATION_CREATEFOLDER_SC))));
 
     m_pView->SetDoubleClickHdl( LINK( this, OCollectionView, Dbl_Click_FileView ) );
     m_pView->EnableAutoResize();
diff --git a/dbaccess/source/ui/dlg/indexdialog.cxx b/dbaccess/source/ui/dlg/indexdialog.cxx
index af7eee135271..715c0f33ba6d 100644
--- a/dbaccess/source/ui/dlg/indexdialog.cxx
+++ b/dbaccess/source/ui/dlg/indexdialog.cxx
@@ -281,7 +281,7 @@ namespace dbaui
 
     void DbaIndexDialog::fillIndexList()
     {
-        Image aPKeyIcon(ModuleRes( IMG_PKEYICON ));
+        Image aPKeyIcon(BitmapEx(ModuleRes(BMP_PKEYICON)));
         // fill the list with the index names
         m_pIndexList->Clear();
         Indexes::const_iterator aIndexLoop = m_pIndexes->begin();
diff --git a/dbaccess/source/ui/dlg/indexdialog.src b/dbaccess/source/ui/dlg/indexdialog.src
index 141d5d194d6a..eaaae1bd2f1d 100644
--- a/dbaccess/source/ui/dlg/indexdialog.src
+++ b/dbaccess/source/ui/dlg/indexdialog.src
@@ -52,9 +52,9 @@ String STR_LOGICAL_INDEX_NAME
     Text [ en-US ] = "index";
 };
 
-Image IMG_PKEYICON
+Bitmap BMP_PKEYICON
 {
-    ImageBitmap = Bitmap { File = "pkey.png"; };
+    File = "pkey.png";
 };
 
 String STR_NEED_INDEX_FIELDS
diff --git a/dbaccess/source/ui/dlg/sqlmessage.cxx b/dbaccess/source/ui/dlg/sqlmessage.cxx
index 995299ee9b9c..1933c916e500 100644
--- a/dbaccess/source/ui/dlg/sqlmessage.cxx
+++ b/dbaccess/source/ui/dlg/sqlmessage.cxx
@@ -71,7 +71,7 @@ namespace
         Image const & getImage() const
         {
             if ( !m_defaultImage )
-                m_defaultImage = Image( ModuleRes( m_defaultImageID ) );
+                m_defaultImage = Image(BitmapEx(ModuleRes(m_defaultImageID)));
             return m_defaultImage;
         }
     };
diff --git a/dbaccess/source/ui/dlg/sqlmessage.src b/dbaccess/source/ui/dlg/sqlmessage.src
index ca684e08be7d..c773173f2f97 100644
--- a/dbaccess/source/ui/dlg/sqlmessage.src
+++ b/dbaccess/source/ui/dlg/sqlmessage.src
@@ -20,19 +20,19 @@
 #include "dbaccess_helpid.hrc"
 #include "dbu_dlg.hrc"
 
-Image BMP_EXCEPTION_ERROR
+Bitmap BMP_EXCEPTION_ERROR
 {
-    ImageBitmap = Bitmap { File = "exerror.png"; };
+    File = "exerror.png";
 };
 
-Image BMP_EXCEPTION_WARNING
+Bitmap BMP_EXCEPTION_WARNING
 {
-    ImageBitmap = Bitmap { File = "exwarning.png"; };
+    File = "exwarning.png";
 };
 
-Image BMP_EXCEPTION_INFO
+Bitmap BMP_EXCEPTION_INFO
 {
-    ImageBitmap = Bitmap { File = "exinfo.png"; };
+    File = "exinfo.png";
 };
 
 String STR_EXCEPTION_STATUS
diff --git a/dbaccess/source/ui/imagelists/dbimagelists.src b/dbaccess/source/ui/imagelists/dbimagelists.src
index bf1a812952d3..9eabea7a038c 100644
--- a/dbaccess/source/ui/imagelists/dbimagelists.src
+++ b/dbaccess/source/ui/imagelists/dbimagelists.src
@@ -20,100 +20,100 @@
 #include "dbu_dlg.hrc"
 #include "browserids.hxx"
 
-Image IMG_FORMFOLDER_TREE_L
+Bitmap BMP_FORMFOLDER_TREE_L
 {
-    ImageBitmap = Bitmap { File = "forms_32"; };
+    File = "forms_32";
 };
 
-Image IMG_REPORTFOLDER_TREE_L
+Bitmap BMP_REPORTFOLDER_TREE_L
 {
-    ImageBitmap = Bitmap { File = "reports_32"; };
+    File = "reports_32";
 };
 
-Image IMG_QUERYFOLDER_TREE_L
+Bitmap BMP_QUERYFOLDER_TREE_L
 {
-    ImageBitmap = Bitmap { File = "queries_32"; };
+    File = "queries_32";
 };
 
-Image IMG_TABLEFOLDER_TREE_L
+Bitmap BMP_TABLEFOLDER_TREE_L
 {
-    ImageBitmap = Bitmap { File = "tables_32"; };
+    File = "tables_32";
 };
 
 // database object icons
 
 // the whole database
 
-Image DATABASE_TREE_ICON
+Bitmap DATABASE_TREE_ICON
 {
-    ImageBitmap = Bitmap { File = "db.png"; };
+    File = "db.png";
 };
 
 // tables and table folders
 
-Image TABLE_TREE_ICON
+Bitmap TABLE_TREE_ICON
 {
-    ImageBitmap = Bitmap { File = "sx03188.png"; };
+    File = "sx03188.png";
 };
 
-Image TABLEFOLDER_TREE_ICON
+Bitmap TABLEFOLDER_TREE_ICON
 {
-    ImageBitmap = Bitmap { File = "sx03187.png"; };
+    File = "sx03187.png";
 };
 
 // views
 
-Image VIEW_TREE_ICON
+Bitmap VIEW_TREE_ICON
 {
-    ImageBitmap = Bitmap { File = "sx16670.png"; };
+    File = "sx16670.png";
 };
 
 // queries and query folders
 
-Image QUERY_TREE_ICON
+Bitmap QUERY_TREE_ICON
 {
-    ImageBitmap = Bitmap { File = "sx03202.png"; };
+    File = "sx03202.png";
 };
 
-Image QUERYFOLDER_TREE_ICON
+Bitmap QUERYFOLDER_TREE_ICON
 {
-    ImageBitmap = Bitmap { File = "sx03201.png"; };
+    File = "sx03201.png";
 };
 
 // forms and form folders
 
-Image FORM_TREE_ICON
+Bitmap FORM_TREE_ICON
 {
-    ImageBitmap = Bitmap { File = "form_16"; };
+    File = "form_16";
 };
 
-Image FORMFOLDER_TREE_ICON
+Bitmap FORMFOLDER_TREE_ICON
 {
-    ImageBitmap = Bitmap { File = "forms_16"; };
+    File = "forms_16";
 };
 
 // reports and report folders
 
-Image REPORT_TREE_ICON
+Bitmap REPORT_TREE_ICON
 {
-    ImageBitmap = Bitmap { File = "report_16"; };
+    File = "report_16";
 };
 
-Image REPORTFOLDER_TREE_ICON
+Bitmap REPORTFOLDER_TREE_ICON
 {
-    ImageBitmap = Bitmap { File = "reports_16"; };
+    File = "reports_16";
 };
 
 // new folder and parent folder
 
-Image IMG_NAVIGATION_BTN_UP_SC
+Bitmap BMP_NAVIGATION_BTN_UP_SC
 {
-    ImageBitmap = Bitmap { File = "fp010"; };
+    File = "fp010";
 };
 
-Image IMG_NAVIGATION_CREATEFOLDER_SC
+Bitmap BMP_NAVIGATION_CREATEFOLDER_SC
 {
-    ImageBitmap = Bitmap { File = "fp015"; };
+    File = "fp015";
 };
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/inc/dbu_misc.hrc b/dbaccess/source/ui/inc/dbu_misc.hrc
index da47b360d54c..0f68311d4e0c 100644
--- a/dbaccess/source/ui/inc/dbu_misc.hrc
+++ b/dbaccess/source/ui/inc/dbu_misc.hrc
@@ -21,8 +21,8 @@
 
 #include "dbu_resource.hrc"
 
-#define IMG_UP                              RID_STR_MISC_START +  0
-#define IMG_DOWN                            RID_STR_MISC_START +  1
+#define BMP_UP                              RID_STR_MISC_START +  0
+#define BMP_DOWN                            RID_STR_MISC_START +  1
 #define STR_WIZ_COLUMN_SELECT_TITEL         RID_STR_MISC_START +  2
 #define STR_WIZ_TYPE_SELECT_TITEL           RID_STR_MISC_START +  3
 #define STR_WIZ_NAME_ALREADY_DEFINED        RID_STR_MISC_START +  4
diff --git a/dbaccess/source/ui/inc/dbu_resource.hrc b/dbaccess/source/ui/inc/dbu_resource.hrc
index 8049de29ef53..5851cec7ea77 100644
--- a/dbaccess/source/ui/inc/dbu_resource.hrc
+++ b/dbaccess/source/ui/inc/dbu_resource.hrc
@@ -107,15 +107,15 @@
 #define DATABASE_TREE_ICON              RID_IMAGE_START +  8
 #define BMP_PRIMARY_KEY                 RID_IMAGE_START +  9
 // free
-#define IMG_PKEYICON                    RID_IMAGE_START + 12
+#define BMP_PKEYICON                    RID_IMAGE_START + 12
 // free
 #define REPORTFOLDER_TREE_ICON          RID_IMAGE_START + 24
-#define IMG_FORMFOLDER_TREE_L           RID_IMAGE_START + 39
-#define IMG_REPORTFOLDER_TREE_L         RID_IMAGE_START + 40
-#define IMG_QUERYFOLDER_TREE_L          RID_IMAGE_START + 41
-#define IMG_TABLEFOLDER_TREE_L          RID_IMAGE_START + 42
-#define IMG_NAVIGATION_BTN_UP_SC        RID_IMAGE_START + 47
-#define IMG_NAVIGATION_CREATEFOLDER_SC  RID_IMAGE_START + 49
+#define BMP_FORMFOLDER_TREE_L           RID_IMAGE_START + 39
+#define BMP_REPORTFOLDER_TREE_L         RID_IMAGE_START + 40
+#define BMP_QUERYFOLDER_TREE_L          RID_IMAGE_START + 41
+#define BMP_TABLEFOLDER_TREE_L          RID_IMAGE_START + 42
+#define BMP_NAVIGATION_BTN_UP_SC        RID_IMAGE_START + 47
+#define BMP_NAVIGATION_CREATEFOLDER_SC  RID_IMAGE_START + 49
 #define FORM_TREE_ICON                  RID_IMAGE_START + 51
 #define REPORT_TREE_ICON                RID_IMAGE_START + 52
 // free
diff --git a/dbaccess/source/ui/misc/WNameMatch.cxx b/dbaccess/source/ui/misc/WNameMatch.cxx
index 477608d8e490..ee457f1b945e 100644
--- a/dbaccess/source/ui/misc/WNameMatch.cxx
+++ b/dbaccess/source/ui/misc/WNameMatch.cxx
@@ -33,8 +33,8 @@ using namespace ::dbaui;
 // OWizColumnSelect
 OWizNameMatching::OWizNameMatching( vcl::Window* pParent)
         :OWizardPage( pParent, "NameMatching", "dbaccess/ui/namematchingpage.ui" )
-        , m_aImgUp(ModuleRes(IMG_UP))
-        , m_aImgDown(ModuleRes(IMG_DOWN))
+        , m_aImgUp(BitmapEx(ModuleRes(BMP_UP)))
+        , m_aImgDown(BitmapEx(ModuleRes(BMP_DOWN)))
 {
     get(m_pTABLE_LEFT, "leftlabel");
     get(m_pTABLE_RIGHT, "rightlabel");
diff --git a/dbaccess/source/ui/misc/WizardPages.src b/dbaccess/source/ui/misc/WizardPages.src
index 398e348e82a8..affd3c6f9933 100644
--- a/dbaccess/source/ui/misc/WizardPages.src
+++ b/dbaccess/source/ui/misc/WizardPages.src
@@ -70,21 +70,14 @@ Menu RID_SBA_RTF_PKEYPOPUP
     };
 };
 
-
-Image IMG_UP
+Bitmap BMP_UP
 {
-    ImageBitmap = Bitmap
-    {
-        File = "sortup.png" ;
-    };
+    File = "sortup.png" ;
 };
 
-Image IMG_DOWN
+Bitmap BMP_DOWN
 {
-    ImageBitmap = Bitmap
-    {
-        File = "sortdown.png" ;
-    };
+    File = "sortdown.png" ;
 };
 
 String STR_WIZ_TABLE_COPY
diff --git a/dbaccess/source/ui/misc/imageprovider.cxx b/dbaccess/source/ui/misc/imageprovider.cxx
index ba570bfa62ab..6e4db31a9c1c 100644
--- a/dbaccess/source/ui/misc/imageprovider.cxx
+++ b/dbaccess/source/ui/misc/imageprovider.cxx
@@ -140,7 +140,7 @@ namespace dbaui
                 lcl_getTableImageResourceID_nothrow( *m_pData, _rName, nImageResourceID );
 
                 if ( nImageResourceID && !_out_rImage )
-                    _out_rImage = Image( ModuleRes( nImageResourceID ) );
+                    _out_rImage = Image(BitmapEx(ModuleRes(nImageResourceID)));
             }
         }
     }
@@ -150,7 +150,7 @@ namespace dbaui
         Image aObjectImage;
         sal_uInt16 nImageResourceID( getDefaultImageResourceID( _nDatabaseObjectType) );
         if ( nImageResourceID )
-            aObjectImage = Image( ModuleRes( nImageResourceID ) );
+            aObjectImage = Image(BitmapEx(ModuleRes(nImageResourceID)));
         return aObjectImage;
     }
 
@@ -202,13 +202,13 @@ namespace dbaui
 
         Image aFolderImage;
         if ( nImageResourceID )
-            aFolderImage = Image( ModuleRes( nImageResourceID ) );
+            aFolderImage = Image(BitmapEx(ModuleRes(nImageResourceID)));
         return aFolderImage;
     }
 
     Image ImageProvider::getDatabaseImage()
     {
-        return Image( ModuleRes( DATABASE_TREE_ICON ) );
+        return Image(BitmapEx(ModuleRes(DATABASE_TREE_ICON)));
     }
 
 } // namespace dbaui