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

Change-Id: I3383e222829042557a8fd9f575049c47aeddeb09

5 files changed, 24 insertions, 30 deletions

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 ) );