sfx2: load BitmapEx resources instead of Image ones

Change-Id: I9c5a0f1b23eadf15fee3ff78e5061474214fcc35

15 files changed, 33 insertions, 42 deletions

diff --git a/sfx2/inc/doc.hrc b/sfx2/inc/doc.hrc
index 29e4f667efa9..d89e7b50457b 100644
--- a/sfx2/inc/doc.hrc
+++ b/sfx2/inc/doc.hrc
@@ -104,8 +104,8 @@
 #define STR_QMSG_SEL_FOLDER_DELETE          (RID_SFX_DOC_START+146)
 #define STR_QMSG_TEMPLATE_OVERWRITE         (RID_SFX_DOC_START+147)
 #define STR_QMSG_SEL_TEMPLATE_DELETE        (RID_SFX_DOC_START+148)
-#define IMG_ACTION_SORT                     (RID_SFX_DOC_START+149)
-#define IMG_ACTION_REFRESH                  (RID_SFX_DOC_START+150)
+#define BMP_ACTION_SORT                     (RID_SFX_DOC_START+149)
+#define BMP_ACTION_REFRESH                  (RID_SFX_DOC_START+150)
 
 #define STR_OPEN                            (RID_SFX_DOC_START+151)
 #define STR_EDIT_TEMPLATE                   (RID_SFX_DOC_START+152)
diff --git a/sfx2/source/control/recentdocsview.cxx b/sfx2/source/control/recentdocsview.cxx
index 587bf7ce77a8..02c6019e7033 100644
--- a/sfx2/source/control/recentdocsview.cxx
+++ b/sfx2/source/control/recentdocsview.cxx
@@ -62,7 +62,7 @@ RecentDocsView::RecentDocsView( vcl::Window* pParent )
     , mnItemPadding(5)
     , mnItemMaxTextLength(30)
     , mnLastMouseDownItem(THUMBNAILVIEW_ITEM_NOTFOUND)
-    , maWelcomeImage(SfxResId(IMG_WELCOME))
+    , maWelcomeImage(BitmapEx(SfxResId(BMP_WELCOME)))
     , maWelcomeLine1(SfxResId(STR_WELCOME_LINE1))
     , maWelcomeLine2(SfxResId(STR_WELCOME_LINE2))
 {
diff --git a/sfx2/source/control/recentdocsviewitem.cxx b/sfx2/source/control/recentdocsviewitem.cxx
index 5260f0540e6d..4005e20306b7 100644
--- a/sfx2/source/control/recentdocsviewitem.cxx
+++ b/sfx2/source/control/recentdocsviewitem.cxx
@@ -36,8 +36,8 @@ RecentDocsViewItem::RecentDocsViewItem(ThumbnailView &rView, const OUString &rUR
     : ThumbnailViewItem(rView, nId),
       maURL(rURL),
       m_bRemoveIconHighlighted(false),
-      m_aRemoveRecentBitmap(SfxResId(IMG_RECENTDOC_REMOVE)),
-      m_aRemoveRecentBitmapHighlighted(SfxResId(IMG_RECENTDOC_REMOVE_HIGHLIGHTED))
+      m_aRemoveRecentBitmap(SfxResId(BMP_RECENTDOC_REMOVE)),
+      m_aRemoveRecentBitmapHighlighted(SfxResId(BMP_RECENTDOC_REMOVE_HIGHLIGHTED))
 {
     OUString aTitle(rTitle);
     INetURLObject aURLObj(rURL);
diff --git a/sfx2/source/control/templateview.hrc b/sfx2/source/control/templateview.hrc
index 783363907d26..693cceafa509 100644
--- a/sfx2/source/control/templateview.hrc
+++ b/sfx2/source/control/templateview.hrc
@@ -9,9 +9,9 @@
 
 #define STR_WELCOME_LINE1                259
 #define STR_WELCOME_LINE2                260
-#define IMG_WELCOME                      261
-#define IMG_RECENTDOC_REMOVE             262
-#define IMG_RECENTDOC_REMOVE_HIGHLIGHTED 263
-#define IMG_DEFAULT                      264
+#define BMP_WELCOME                      261
+#define BMP_RECENTDOC_REMOVE             262
+#define BMP_RECENTDOC_REMOVE_HIGHLIGHTED 263
+#define BMP_DEFAULT                      264
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/control/templateview.src b/sfx2/source/control/templateview.src
index 52f4e3db5e3b..cf05b69773e9 100644
--- a/sfx2/source/control/templateview.src
+++ b/sfx2/source/control/templateview.src
@@ -19,22 +19,22 @@ String STR_WELCOME_LINE2
     Text [ en-US ] = "Drop a document here or pick an app from the left side to create one.";
 };
 
-Image IMG_WELCOME
+Bitmap BMP_WELCOME
 {
-    ImageBitmap = Bitmap { File = "logo.png" ; };
+    File = "logo.png";
 };
 
-Bitmap IMG_RECENTDOC_REMOVE
+Bitmap BMP_RECENTDOC_REMOVE
 {
     File = "recentdoc_remove.png";
 };
 
-Bitmap IMG_RECENTDOC_REMOVE_HIGHLIGHTED
+Bitmap BMP_RECENTDOC_REMOVE_HIGHLIGHTED
 {
     File = "recentdoc_remove_highlighted.png";
 };
 
-Bitmap IMG_DEFAULT
+Bitmap BMP_DEFAULT
 {
     File = "templatestar.png";
 };
diff --git a/sfx2/source/control/templateviewitem.cxx b/sfx2/source/control/templateviewitem.cxx
index 28dc70254562..2d396b9e640f 100644
--- a/sfx2/source/control/templateviewitem.cxx
+++ b/sfx2/source/control/templateviewitem.cxx
@@ -34,7 +34,7 @@ TemplateViewItem::TemplateViewItem (ThumbnailView &rView, sal_uInt16 nId)
     : ThumbnailViewItem(rView, nId),
       mnRegionId(USHRT_MAX),
       mnDocId(USHRT_MAX),
-      maDefaultBitmap(SfxResId(IMG_DEFAULT)),
+      maDefaultBitmap(SfxResId(BMP_DEFAULT)),
       mbIsDefaultTemplate(false)
 {
 }
diff --git a/sfx2/source/dialog/dialog.hrc b/sfx2/source/dialog/dialog.hrc
index c860dbd4b565..6864546c7819 100644
--- a/sfx2/source/dialog/dialog.hrc
+++ b/sfx2/source/dialog/dialog.hrc
@@ -56,7 +56,7 @@
 #define STR_CANCEL_RECORDING            ( RC_DIALOG_BEGIN + 108 )
 
 #define STR_PDF_EXPORT_SEND             ( RC_DIALOG_BEGIN + 120 )
-#define IMG_INFO                        ( RC_DIALOG_BEGIN + 122 )
+#define BMP_INFO                        ( RC_DIALOG_BEGIN + 122 )
 //free
 #define SFX_ST_EDIT                     ( RC_DIALOG_BEGIN + 124 )
 #define STR_STYLE_ELEMTLIST             ( RC_DIALOG_BEGIN + 125 )
diff --git a/sfx2/source/dialog/dialog.src b/sfx2/source/dialog/dialog.src
index 60128b6c3884..6c1198b47afa 100644
--- a/sfx2/source/dialog/dialog.src
+++ b/sfx2/source/dialog/dialog.src
@@ -108,12 +108,9 @@ String STR_PDF_EXPORT_SEND
   Text [ en-US ] = "Send" ;
 };
 
-Image IMG_INFO
+Bitmap BMP_INFO
 {
-    ImageBitmap = Bitmap
-    {
-        File = "info.png" ;
-    };
+    File = "info.png" ;
 };
 
 String STR_FONT_TABPAGE
diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx
index cddee1ef3425..e3917d9514ae 100644
--- a/sfx2/source/dialog/dinfdlg.cxx
+++ b/sfx2/source/dialog/dinfdlg.cxx
@@ -1450,7 +1450,7 @@ CustomPropertyLine::CustomPropertyLine( vcl::Window* pParent ) :
     m_aTimeField->SetExtFormat( ExtTimeFieldFormat::Long24H );
     m_aDateField->SetExtDateFormat( ExtDateFieldFormat::SystemShortYYYY );
 
-    m_aRemoveButton->SetModeImage(Image(SfxResId(SFX_IMG_PROPERTY_REMOVE)));
+    m_aRemoveButton->SetModeImage(Image(BitmapEx(SfxResId(SFX_BMP_PROPERTY_REMOVE))));
     m_aRemoveButton->SetQuickHelpText(SfxResId(STR_SFX_REMOVE_PROPERTY).toString());
 
     m_aEditButton->SetText(SfxResId(SFX_ST_EDIT).toString());
diff --git a/sfx2/source/dialog/dinfdlg.src b/sfx2/source/dialog/dinfdlg.src
index 558588bdddeb..96cd929e63f5 100644
--- a/sfx2/source/dialog/dinfdlg.src
+++ b/sfx2/source/dialog/dinfdlg.src
@@ -93,9 +93,9 @@ String STR_SFX_REMOVE_PROPERTY
     Text [ en-US ] = "Remove Property" ;
 };
 
-Image SFX_IMG_PROPERTY_REMOVE
+Bitmap SFX_BMP_PROPERTY_REMOVE
 {
-    ImageBitmap = Bitmap { File = "deleterow.bmp" ; };
+    File = "deleterow.bmp";
 };
 
 String STR_SFX_QUERY_WRONG_TYPE
diff --git a/sfx2/source/dialog/titledockwin.cxx b/sfx2/source/dialog/titledockwin.cxx
index c084cbcd267c..5299973e9705 100644
--- a/sfx2/source/dialog/titledockwin.cxx
+++ b/sfx2/source/dialog/titledockwin.cxx
@@ -214,8 +214,8 @@ namespace sfx2
         m_aToolbox->Clear();
 
         // Get the closer bitmap and set it as right most button.
-        Image aImage( SfxResId( SFX_IMG_CLOSE_DOC ) );
-        m_aToolbox->InsertItem( 1, aImage );
+        BitmapEx aBitmapEx(SfxResId(SFX_BMP_CLOSE_DOC));
+        m_aToolbox->InsertItem(1, Image(aBitmapEx));
         m_aToolbox->ShowItem( 1 );
     }
 
diff --git a/sfx2/source/dialog/titledockwin.src b/sfx2/source/dialog/titledockwin.src
index 3b55d53ac433..f60c61f17085 100644
--- a/sfx2/source/dialog/titledockwin.src
+++ b/sfx2/source/dialog/titledockwin.src
@@ -20,9 +20,9 @@
 #include <sfx2/sfx.hrc>
 #include "sfxlocal.hrc"
 
-Image SFX_IMG_CLOSE_DOC
+Bitmap SFX_BMP_CLOSE_DOC
 {
-    ImageBitmap = Bitmap { File = "closedoc.png" ; };
+    File = "closedoc.png";
 };
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/doc/doc.src b/sfx2/source/doc/doc.src
index d607087c16f6..cb065144cdf6 100644
--- a/sfx2/source/doc/doc.src
+++ b/sfx2/source/doc/doc.src
@@ -368,20 +368,14 @@ String STR_QMSG_ERROR_OPENING_FILE_CONTINUE
     Text [ en-US ] = "\nProceeding with import may cause data loss or corruption, and application may become unstable or crash.\n\nDo you want to ignore the error and attempt to continue loading the file?";
 };
 
-Image IMG_ACTION_SORT
+Bitmap BMP_ACTION_SORT
 {
-    ImageBitmap = Bitmap
-    {
-        File = "sortascending.png";
-    };
+    File = "sortascending.png";
 };
 
-Image IMG_ACTION_REFRESH
+Bitmap BMP_ACTION_REFRESH
 {
-    ImageBitmap = Bitmap
-    {
-        File = "reload.png";
-    };
+    File = "reload.png";
 };
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index 3b35ed496e45..da048e996281 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -172,7 +172,7 @@ SfxTemplateManagerDlg::SfxTemplateManagerDlg(vcl::Window *parent)
     mpActionMenu = VclPtr<PopupMenu>::Create();
     mpActionMenu->InsertItem(MNI_ACTION_NEW_FOLDER,
         SfxResId(STR_CATEGORY_NEW).toString(),
-        Image(SfxResId(IMG_ACTION_REFRESH)));
+        Image(BitmapEx(SfxResId(BMP_ACTION_REFRESH))));
     mpActionMenu->InsertItem(MNI_ACTION_RENAME_FOLDER,
         SfxResId(STR_CATEGORY_RENAME).toString());
     mpActionMenu->InsertItem(MNI_ACTION_DELETE_FOLDER,
@@ -180,7 +180,7 @@ SfxTemplateManagerDlg::SfxTemplateManagerDlg(vcl::Window *parent)
     mpActionMenu->InsertSeparator();
     mpActionMenu->InsertItem(MNI_ACTION_REFRESH,
         SfxResId(STR_ACTION_REFRESH).toString(),
-        Image(SfxResId(IMG_ACTION_REFRESH)));
+        Image(BitmapEx(SfxResId(BMP_ACTION_REFRESH))));
     mpActionMenu->InsertItem(MNI_ACTION_DEFAULT,SfxResId(STR_ACTION_DEFAULT).toString());
     mpActionMenu->SetSelectHdl(LINK(this,SfxTemplateManagerDlg,MenuSelectHdl));
 
diff --git a/sfx2/source/inc/sfxlocal.hrc b/sfx2/source/inc/sfxlocal.hrc
index f1fa47483d98..100d008cbd48 100644
--- a/sfx2/source/inc/sfxlocal.hrc
+++ b/sfx2/source/inc/sfxlocal.hrc
@@ -40,8 +40,8 @@
 #define SFX_CB_PROPERTY_STRINGARRAY         (RID_SFX_SFXLOCAL_START + 13)
 
 // Images ----------------------------------------------------------------
-#define SFX_IMG_PROPERTY_REMOVE             (RID_SFX_SFXLOCAL_START +  0)
-#define SFX_IMG_CLOSE_DOC                   (RID_SFX_SFXLOCAL_START +  2)
+#define SFX_BMP_PROPERTY_REMOVE             (RID_SFX_SFXLOCAL_START +  0)
+#define SFX_BMP_CLOSE_DOC                   (RID_SFX_SFXLOCAL_START +  2)
 
 #endif