e*, f*: load BitmapEx resources instead of Image ones

Change-Id: I3383e222829042557a8fd9f575049c47aeddeb09

5 files changed, 13 insertions, 18 deletions

diff --git a/extensions/source/dbpilots/commonpagesdbp.cxx b/extensions/source/dbpilots/commonpagesdbp.cxx
index 99382137faee..968a95354184 100644
--- a/extensions/source/dbpilots/commonpagesdbp.cxx
+++ b/extensions/source/dbpilots/commonpagesdbp.cxx
@@ -361,9 +361,8 @@ namespace dbp
             return;
         }
 
-        Image aTableImage, aQueryImage;
-        aTableImage = Image( ModuleRes( IMG_TABLE ) );
-        aQueryImage = Image( ModuleRes( IMG_QUERY ) );
+        Image aTableImage(BitmapEx(ModuleRes(BMP_TABLE)));
+        Image aQueryImage(BitmapEx(ModuleRes(BMP_QUERY)));
 
         lcl_fillEntries( *m_pTable, aTableNames, aTableImage, CommandType::TABLE );
         lcl_fillEntries( *m_pTable, aQueryNames, aQueryImage, CommandType::QUERY );
diff --git a/extensions/source/dbpilots/commonpagesdbp.src b/extensions/source/dbpilots/commonpagesdbp.src
index dec21f0d7281..8e332f439dd7 100644
--- a/extensions/source/dbpilots/commonpagesdbp.src
+++ b/extensions/source/dbpilots/commonpagesdbp.src
@@ -19,15 +19,14 @@
 
 #include "dbpresid.hrc"
 
-
-Image IMG_TABLE
+Bitmap BMP_TABLE
 {
-    ImageBitmap = Bitmap { File = "sx03188.png"; };
+    File = "sx03188.png";
 };
 
-Image IMG_QUERY
+Bitmap BMP_QUERY
 {
-    ImageBitmap = Bitmap { File = "sx03202.png"; };
+    File = "sx03202.png";
 };
 
 String RID_STR_OPTION_DB_FIELD_TITLE
diff --git a/extensions/source/dbpilots/dbpresid.hrc b/extensions/source/dbpilots/dbpresid.hrc
index 84c85f70f913..75b6b466ed48 100644
--- a/extensions/source/dbpilots/dbpresid.hrc
+++ b/extensions/source/dbpilots/dbpresid.hrc
@@ -80,8 +80,8 @@
 
 // Image
 
-#define IMG_TABLE                   ( RID_DIALOG_START + 1 )
-#define IMG_QUERY                   ( RID_DIALOG_START + 2 )
+#define BMP_TABLE                   ( RID_DIALOG_START + 1 )
+#define BMP_QUERY                   ( RID_DIALOG_START + 2 )
 
 #define WINDOW_SIZE_X       260
 #define WINDOW_SIZE_Y       185
diff --git a/extensions/source/update/ui/updatecheckui.cxx b/extensions/source/update/ui/updatecheckui.cxx
index d1297893d403..13268dfbc037 100644
--- a/extensions/source/update/ui/updatecheckui.cxx
+++ b/extensions/source/update/ui/updatecheckui.cxx
@@ -236,7 +236,6 @@ UpdateCheckUI::getImplementationName() throw (uno::RuntimeException, std::except
     return ::getImplementationName();
 }
 
-
 uno::Sequence< OUString > SAL_CALL
 UpdateCheckUI::getSupportedServiceNames() throw (uno::RuntimeException, std::exception)
 {
@@ -249,7 +248,6 @@ UpdateCheckUI::supportsService( OUString const & serviceName ) throw (uno::Runti
     return cppu::supportsService(this, serviceName);
 }
 
-
 Image UpdateCheckUI::GetMenuBarIcon( MenuBar* pMBar )
 {
     sal_uInt32 nResID;
@@ -264,10 +262,9 @@ Image UpdateCheckUI::GetMenuBarIcon( MenuBar* pMBar )
     else
         nResID = RID_UPDATE_AVAILABLE_16;
 
-    return Image( ResId( nResID, *mpUpdResMgr ) );
+    return Image(BitmapEx(ResId(nResID, *mpUpdResMgr)));
 }
 
-
 Image UpdateCheckUI::GetBubbleImage( OUString &rURL )
 {
     Image aImage;
diff --git a/extensions/source/update/ui/updatecheckui.src b/extensions/source/update/ui/updatecheckui.src
index a151f8b2dc31..ec57e5c2d9e9 100644
--- a/extensions/source/update/ui/updatecheckui.src
+++ b/extensions/source/update/ui/updatecheckui.src
@@ -19,14 +19,14 @@
 
 #include "updatecheckui.hrc"
 
-Image RID_UPDATE_AVAILABLE_16
+Bitmap RID_UPDATE_AVAILABLE_16
 {
-    ImageBitmap = Bitmap{ file = "onlineupdate_16.png"; };
+    File = "onlineupdate_16.png";
 };
 
-Image RID_UPDATE_AVAILABLE_26
+Bitmap RID_UPDATE_AVAILABLE_26
 {
-    ImageBitmap = Bitmap{ file = "onlineupdate_26.png"; };
+    File = "onlineupdate_26.png";
 };
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */