d*: load BitmapEx resources instead of Image ones

Change-Id: Ibf741af5e5043fae6139a19cec3d244dee06f225

5 files changed, 20 insertions, 21 deletions

diff --git a/desktop/inc/dp_gui.hrc b/desktop/inc/dp_gui.hrc
index b970d44865f5..6e8662d08cd7 100644
--- a/desktop/inc/dp_gui.hrc
+++ b/desktop/inc/dp_gui.hrc
@@ -56,10 +56,10 @@
 #define RID_DLG_UPDATE_INSTALL_ERROR_LIC_DECLINED (RID_DEPLOYMENT_GUI_START + 43)
 #define RID_DLG_UPDATE_INSTALL_EXTENSION_NOINSTALL (RID_DEPLOYMENT_GUI_START + 44)
 
-#define RID_IMG_WARNING                        (RID_DEPLOYMENT_GUI_START+56)
-#define RID_IMG_LOCKED                         (RID_DEPLOYMENT_GUI_START+58)
-#define RID_IMG_EXTENSION                      (RID_DEPLOYMENT_GUI_START+60)
-#define RID_IMG_SHARED                         (RID_DEPLOYMENT_GUI_START+62)
+#define RID_BMP_WARNING                        (RID_DEPLOYMENT_GUI_START+56)
+#define RID_BMP_LOCKED                         (RID_DEPLOYMENT_GUI_START+58)
+#define RID_BMP_EXTENSION                      (RID_DEPLOYMENT_GUI_START+60)
+#define RID_BMP_SHARED                         (RID_DEPLOYMENT_GUI_START+62)
 
 #define RID_STR_ADD_PACKAGES                   (RID_DEPLOYMENT_GUI_START+70)
 
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.src b/desktop/source/deployment/gui/dp_gui_dialog2.src
index a399c22146d5..ce8ca18ddf54 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog2.src
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.src
@@ -20,24 +20,24 @@
 #include <svtools/controldims.hrc>
 #include "dp_gui.hrc"
 
-Image RID_IMG_WARNING
+Bitmap RID_BMP_WARNING
 {
-    ImageBitmap = Bitmap { File = "caution_16.png"; };
+    File = "caution_16.png";
 };
 
-Image RID_IMG_LOCKED
+Bitmap RID_BMP_LOCKED
 {
-    ImageBitmap = Bitmap { File = "lock_16.png"; };
+    File = "lock_16.png";
 };
 
-Image RID_IMG_SHARED
+Bitmap RID_BMP_SHARED
 {
-    ImageBitmap = Bitmap { File = "shared_16.png"; };
+    File = "shared_16.png";
 };
 
-Image RID_IMG_EXTENSION
+Bitmap RID_BMP_EXTENSION
 {
-    ImageBitmap = Bitmap { File = "extension_32.png"; };
+    File = "extension_32.png";
 };
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
index 929a2c8bd4c9..7939f06c3c23 100644
--- a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
+++ b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
@@ -189,10 +189,10 @@ ExtensionBox_Impl::ExtensionBox_Impl(vcl::Window* pParent) :
     m_nTopIndex( 0 ),
     m_nActiveHeight( 0 ),
     m_nExtraHeight( 2 ),
-    m_aSharedImage( DialogHelper::getResId( RID_IMG_SHARED ) ),
-    m_aLockedImage( DialogHelper::getResId( RID_IMG_LOCKED ) ),
-    m_aWarningImage( DialogHelper::getResId( RID_IMG_WARNING ) ),
-    m_aDefaultImage( DialogHelper::getResId( RID_IMG_EXTENSION ) ),
+    m_aSharedImage(BitmapEx(DialogHelper::getResId(RID_BMP_SHARED))),
+    m_aLockedImage(BitmapEx(DialogHelper::getResId(RID_BMP_LOCKED))),
+    m_aWarningImage(BitmapEx(DialogHelper::getResId(RID_BMP_WARNING))),
+    m_aDefaultImage(BitmapEx(DialogHelper::getResId(RID_BMP_EXTENSION))),
     m_pScrollBar( nullptr ),
     m_pManager( nullptr )
 {
diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
index cedfdbe7e504..3decee341847 100644
--- a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
+++ b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
@@ -603,7 +603,7 @@ UpdateDialog::CheckListBox::CheckListBox( vcl::Window* pParent, UpdateDialog & d
     m_enableUpdate( DPGUI_RESSTR( RID_DLG_UPDATE_ENABLE ) ),
     m_dialog(dialog)
 {
-    SetNormalStaticImage(Image(DpGuiResId(RID_DLG_UPDATE_NORMALALERT)));
+    SetNormalStaticImage(Image(BitmapEx(DpGuiResId(RID_DLG_UPDATE_NORMALALERT))));
 }
 
 sal_uInt16 UpdateDialog::CheckListBox::getItemCount() const {
diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.src b/desktop/source/deployment/gui/dp_gui_updatedialog.src
index 4f0f5def3a70..57389e286bb7 100644
--- a/desktop/source/deployment/gui/dp_gui_updatedialog.src
+++ b/desktop/source/deployment/gui/dp_gui_updatedialog.src
@@ -21,10 +21,9 @@
 
 #include "dp_gui.hrc"
 
-Image RID_DLG_UPDATE_NORMALALERT {
-    ImageBitmap = Bitmap {
-        File = "caution_12.png";
-    };
+Bitmap RID_DLG_UPDATE_NORMALALERT
+{
+    File = "caution_12.png";
 };
 
 String RID_DLG_UPDATE_NONE {