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

Change-Id: I3383e222829042557a8fd9f575049c47aeddeb09

13 files changed, 45 insertions, 55 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: */
diff --git a/formula/source/ui/dlg/formdlgs.src b/formula/source/ui/dlg/formdlgs.src
index e6466069d568..fc9e22834d3a 100644
--- a/formula/source/ui/dlg/formdlgs.src
+++ b/formula/source/ui/dlg/formdlgs.src
@@ -20,24 +20,24 @@
 #include "formdlgs.hrc"
 #include "ForResId.hrc"
 
-Image BMP_STR_CLOSE
+Bitmap BMP_STR_CLOSE
 {
-    ImageBitmap = Bitmap { File = "fapclose.png"; };
+    File = "fapclose.png";
 };
 
-Image BMP_STR_OPEN
+Bitmap BMP_STR_OPEN
 {
-    ImageBitmap = Bitmap { File = "fapopen.png"; };
+    File = "fapopen.png";
 };
 
-Image BMP_STR_END
+Bitmap BMP_STR_END
 {
-    ImageBitmap = Bitmap { File = "fapok.png"; };
+    File = "fapok.png";
 };
 
-Image BMP_STR_ERROR
+Bitmap BMP_STR_ERROR
 {
-    ImageBitmap = Bitmap { File = "faperror.png"; };
+    File = "faperror.png";
 };
 
 String STR_STRUCT_ERR1
@@ -65,12 +65,9 @@ String STR_END
     Text [ en-US ] = "~End" ;
 };
 
-Image RID_BMP_REFBTN1
+Bitmap RID_BMP_REFBTN1
 {
-    ImageBitmap = Bitmap
-    {
-        File = "refinp1.png";
-    };
+    File = "refinp1.png";
 };
 
 String RID_STR_SHRINK
@@ -78,12 +75,9 @@ String RID_STR_SHRINK
     Text [ en-US ] = "Shrink" ;
 };
 
-Image RID_BMP_REFBTN2
+Bitmap RID_BMP_REFBTN2
 {
-    ImageBitmap = Bitmap
-    {
-        File = "refinp2.png";
-    };
+    File = "refinp2.png";
 };
 
 String RID_STR_EXPAND
diff --git a/formula/source/ui/dlg/funcutl.cxx b/formula/source/ui/dlg/funcutl.cxx
index f312b3897f42..238986494768 100644
--- a/formula/source/ui/dlg/funcutl.cxx
+++ b/formula/source/ui/dlg/funcutl.cxx
@@ -525,8 +525,8 @@ IMPL_LINK_NOARG(RefEdit, UpdateHdl, Idle *, void)
 //class RefButton
 RefButton::RefButton( vcl::Window* _pParent, WinBits nStyle ) :
     ImageButton( _pParent, nStyle ),
-    aImgRefStart( ModuleRes( RID_BMP_REFBTN1 ) ),
-    aImgRefDone( ModuleRes( RID_BMP_REFBTN2 ) ),
+    aImgRefStart(BitmapEx(ModuleRes(RID_BMP_REFBTN1))),
+    aImgRefDone(BitmapEx(ModuleRes(RID_BMP_REFBTN2))),
     aShrinkQuickHelp( ModuleRes( RID_STR_SHRINK ).toString() ),
     aExpandQuickHelp( ModuleRes( RID_STR_EXPAND ).toString() ),
     pAnyRefDlg( nullptr ),
diff --git a/formula/source/ui/dlg/parawin.cxx b/formula/source/ui/dlg/parawin.cxx
index 1e6823a54911..a2ab34ec2df8 100644
--- a/formula/source/ui/dlg/parawin.cxx
+++ b/formula/source/ui/dlg/parawin.cxx
@@ -58,13 +58,13 @@ ParaWin::ParaWin(vcl::Window* pParent,IControlReferenceHandler* _pDlg):
     m_pFtArgDesc->SetText("");
 
     get(m_pBtnFx1, "FX1");
-    m_pBtnFx1->SetModeImage(Image(ModuleRes( BMP_FX )));
+    m_pBtnFx1->SetModeImage(Image(BitmapEx(ModuleRes(BMP_FX))));
     get(m_pBtnFx2, "FX2");
-    m_pBtnFx2->SetModeImage(Image(ModuleRes( BMP_FX )));
+    m_pBtnFx2->SetModeImage(Image(BitmapEx(ModuleRes(BMP_FX))));
     get(m_pBtnFx3, "FX3");
-    m_pBtnFx3->SetModeImage(Image(ModuleRes( BMP_FX )));
+    m_pBtnFx3->SetModeImage(Image(BitmapEx(ModuleRes(BMP_FX))));
     get(m_pBtnFx4, "FX4");
-    m_pBtnFx4->SetModeImage(Image(ModuleRes( BMP_FX )));
+    m_pBtnFx4->SetModeImage(Image(BitmapEx(ModuleRes(BMP_FX))));
 
     get(m_pFtArg1, "FT_ARG1");
     get(m_pFtArg2, "FT_ARG2");
diff --git a/formula/source/ui/dlg/parawin.src b/formula/source/ui/dlg/parawin.src
index df7fa389425b..93191b4937da 100644
--- a/formula/source/ui/dlg/parawin.src
+++ b/formula/source/ui/dlg/parawin.src
@@ -19,9 +19,9 @@
 
 #include "ForResId.hrc"
 
-Image BMP_FX
+Bitmap BMP_FX
 {
-    ImageBitmap = Bitmap { File = "fx.png" ; };
+    File = "fx.png";
 };
 
 String STR_OPTIONAL
diff --git a/formula/source/ui/dlg/structpg.cxx b/formula/source/ui/dlg/structpg.cxx
index f60862c5c6b5..b1eb5a030109 100644
--- a/formula/source/ui/dlg/structpg.cxx
+++ b/formula/source/ui/dlg/structpg.cxx
@@ -82,8 +82,8 @@ VCL_BUILDER_FACTORY_ARGS(StructListBox, WB_BORDER)
 
 StructPage::StructPage(vcl::Window* pParent):
     TabPage(pParent, "StructPage", "formula/ui/structpage.ui"),
-    maImgEnd        ( ModuleRes( BMP_STR_END ) ),
-    maImgError      ( ModuleRes( BMP_STR_ERROR ) ),
+    maImgEnd(BitmapEx(ModuleRes(BMP_STR_END))),
+    maImgError(BitmapEx(ModuleRes(BMP_STR_ERROR))),
     pSelectedToken  ( nullptr )
 {
     get(m_pTlbStruct, "struct");
@@ -94,8 +94,8 @@ StructPage::StructPage(vcl::Window* pParent):
                         WB_HASBUTTONS|WB_HSCROLL|WB_NOINITIALSELECTION);
 
     m_pTlbStruct->SetNodeDefaultImages();
-    m_pTlbStruct->SetDefaultExpandedEntryBmp(  Image( ModuleRes( BMP_STR_OPEN  ) ) );
-    m_pTlbStruct->SetDefaultCollapsedEntryBmp( Image( ModuleRes( BMP_STR_CLOSE ) ) );
+    m_pTlbStruct->SetDefaultExpandedEntryBmp(Image(BitmapEx(ModuleRes(BMP_STR_OPEN))));
+    m_pTlbStruct->SetDefaultCollapsedEntryBmp(Image(BitmapEx(ModuleRes(BMP_STR_CLOSE))));
 
 
     m_pTlbStruct->SetSelectHdl(LINK( this, StructPage, SelectHdl ) );
diff --git a/framework/inc/classes/resource.hrc b/framework/inc/classes/resource.hrc
index f3ad7e64981b..83656e5f31f5 100644
--- a/framework/inc/classes/resource.hrc
+++ b/framework/inc/classes/resource.hrc
@@ -53,8 +53,8 @@
 #define STR_REMOTE_TITLE                        (RID_STR_START+26)
 #define STR_SAFEMODE_TITLE                      (RID_STR_START+27)
 
-#define IMG_SAVEMODIFIED_SMALL                  (RID_IMAGE_START+0)
-#define IMG_SAVEMODIFIED_LARGE                  (RID_IMAGE_START+1)
+#define BMP_SAVEMODIFIED_SMALL                  (RID_IMAGE_START+0)
+#define BMP_SAVEMODIFIED_LARGE                  (RID_IMAGE_START+1)
 
 #define POPUPMENU_TOOLBAR_QUICKCUSTOMIZATION    (RID_MENU_START+0)
 
diff --git a/framework/source/classes/resource.src b/framework/source/classes/resource.src
index a95149f7ffcf..745e10e5c8c7 100644
--- a/framework/source/classes/resource.src
+++ b/framework/source/classes/resource.src
@@ -204,13 +204,14 @@ String STR_LANGSTATUS_HINT
     Text [ en-US ] = "Text Language. Right-click to set character or paragraph language" ;
 };
 
-Image IMG_SAVEMODIFIED_SMALL
+Bitmap BMP_SAVEMODIFIED_SMALL
 {
-    ImageBitmap = Bitmap{File = "savemodified_small.png";};
+    File = "savemodified_small.png";
 };
-Image IMG_SAVEMODIFIED_LARGE
+
+Bitmap BMP_SAVEMODIFIED_LARGE
 {
-    ImageBitmap = Bitmap{File = "savemodified_large.png";};
+    File = "savemodified_large.png";
 };
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/uielement/popuptoolbarcontroller.cxx b/framework/source/uielement/popuptoolbarcontroller.cxx
index c4e627d8c5a4..98b6b47b735c 100644
--- a/framework/source/uielement/popuptoolbarcontroller.cxx
+++ b/framework/source/uielement/popuptoolbarcontroller.cxx
@@ -515,7 +515,7 @@ void SaveToolbarController::updateImage()
     }
     else if ( m_bModified )
     {
-        Image aResImage(eImageType == vcl::ImageType::Size16 ? FwkResId(IMG_SAVEMODIFIED_SMALL) : FwkResId(IMG_SAVEMODIFIED_LARGE));
+        Image aResImage(BitmapEx(eImageType == vcl::ImageType::Size16 ? FwkResId(BMP_SAVEMODIFIED_SMALL) : FwkResId(BMP_SAVEMODIFIED_LARGE)));
         aImage = aResImage;
     }