b*, c*: load BitmapEx resources instead of Image ones

Change-Id: Idbf99de17e5349712ef7c3da3ce8bb8b5f879ef7

13 files changed, 77 insertions, 82 deletions

diff --git a/cui/source/customize/acccfg.hrc b/cui/source/customize/acccfg.hrc
index 7ad1eba98c1b..e5a4755ce3e6 100644
--- a/cui/source/customize/acccfg.hrc
+++ b/cui/source/customize/acccfg.hrc
@@ -20,9 +20,6 @@
 #define STR_GROUP_STYLES        58
 #define STR_PDF_EXPORT_SEND     59
 
-#define BMP_COLLAPSED           63
-#define BMP_EXPANDED            64
-
 #define STR_BASICMACROS         67
 #define STR_HUMAN_APPNAME       69
 
diff --git a/cui/source/customize/acccfg.src b/cui/source/customize/acccfg.src
index ae2eccb3507c..74dafebecfcd 100644
--- a/cui/source/customize/acccfg.src
+++ b/cui/source/customize/acccfg.src
@@ -35,20 +35,6 @@ Resource RID_SVXPAGE_CONFIGGROUPBOX
     {
         Text [ en-US ] = "Styles" ;
     };
-    Image BMP_COLLAPSED
-    {
-        ImageBitmap = Bitmap
-        {
-            File = "plus.bmp" ;
-        };
-    };
-    Image BMP_EXPANDED
-    {
-        ImageBitmap = Bitmap
-        {
-            File = "minus.bmp" ;
-        };
-    };
 };
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx
index 99cc9fec65d1..06356ac2e2ef 100644
--- a/cui/source/customize/cfgutil.cxx
+++ b/cui/source/customize/cfgutil.cxx
@@ -359,17 +359,17 @@ struct SvxConfigGroupBoxResource_Impl : public Resource
 
 SvxConfigGroupBoxResource_Impl::SvxConfigGroupBoxResource_Impl() :
     Resource(CUI_RES(RID_SVXPAGE_CONFIGGROUPBOX)),
-    m_hdImage(CUI_RES(RID_CUIIMG_HARDDISK)),
-    m_libImage(CUI_RES(RID_CUIIMG_LIB)),
-    m_macImage(CUI_RES(RID_CUIIMG_MACRO)),
-    m_docImage(CUI_RES(RID_CUIIMG_DOC)),
+    m_hdImage(BitmapEx(CUI_RES(RID_CUIBMP_HARDDISK))),
+    m_libImage(BitmapEx(CUI_RES(RID_CUIBMP_LIB))),
+    m_macImage(BitmapEx(CUI_RES(RID_CUIBMP_MACRO))),
+    m_docImage(BitmapEx(CUI_RES(RID_CUIBMP_DOC))),
     m_sMyMacros(CUI_RESSTR(RID_SVXSTR_MYMACROS)),
     m_sProdMacros(CUI_RESSTR(RID_SVXSTR_PRODMACROS)),
     m_sMacros(CUI_RESSTR(STR_BASICMACROS)),
     m_sDlgMacros(CUI_RESSTR(RID_SVXSTR_PRODMACROS)),
     m_aStrGroupStyles(CUI_RESSTR(STR_GROUP_STYLES)),
-    m_collapsedImage(CUI_RES(BMP_COLLAPSED)),
-    m_expandedImage(CUI_RES(BMP_EXPANDED))
+    m_collapsedImage(BitmapEx(CUI_RES(RID_CUIBMP_COLLAPSED))),
+    m_expandedImage(BitmapEx(CUI_RES(RID_CUIBMP_EXPANDED)))
 {
     FreeResource();
 }
diff --git a/cui/source/customize/selector.cxx b/cui/source/customize/selector.cxx
index c8a843fabcf5..814ba4bfe908 100644
--- a/cui/source/customize/selector.cxx
+++ b/cui/source/customize/selector.cxx
@@ -201,10 +201,10 @@ SvxConfigGroupListBox::SvxConfigGroupListBox(vcl::Window* pParent, WinBits nStyl
     , m_bShowSlots(false)
     , pFunctionListBox(nullptr)
     , m_pImageProvider(nullptr)
-    , m_hdImage(CUI_RES(RID_CUIIMG_HARDDISK))
-    , m_libImage(CUI_RES(RID_CUIIMG_LIB))
-    , m_macImage(CUI_RES(RID_CUIIMG_MACRO))
-    , m_docImage(CUI_RES(RID_CUIIMG_DOC))
+    , m_hdImage(BitmapEx(CUI_RES(RID_CUIBMP_HARDDISK)))
+    , m_libImage(BitmapEx(CUI_RES(RID_CUIBMP_LIB)))
+    , m_macImage(BitmapEx(CUI_RES(RID_CUIBMP_MACRO)))
+    , m_docImage(BitmapEx(CUI_RES(RID_CUIBMP_DOC)))
     , m_sMyMacros(CUI_RESSTR(RID_SVXSTR_MYMACROS))
     , m_sProdMacros(CUI_RESSTR(RID_SVXSTR_PRODMACROS))
 {
diff --git a/cui/source/dialogs/cuihyperdlg.cxx b/cui/source/dialogs/cuihyperdlg.cxx
index ad18fcbcdd00..ab7ae4575cb3 100644
--- a/cui/source/dialogs/cuihyperdlg.cxx
+++ b/cui/source/dialogs/cuihyperdlg.cxx
@@ -86,10 +86,10 @@ SvxHpLinkDlg::SvxHpLinkDlg (vcl::Window* pParent, SfxBindings* pBindings)
     std::vector<Image> imgVector;
     OUString aStrTitle;
     SvxIconChoiceCtrlEntry *pEntry;
-    imgVector.push_back( Image( CUI_RES ( RID_SVXBMP_HLINETTP ) ) );
-    imgVector.push_back( Image( CUI_RES ( RID_SVXBMP_HLMAILTP ) ) );
-    imgVector.push_back( Image( CUI_RES ( RID_SVXBMP_HLDOCTP  ) ) );
-    imgVector.push_back( Image( CUI_RES ( RID_SVXBMP_HLDOCNTP ) ) );
+    imgVector.push_back(Image(BitmapEx(CUI_RES(RID_SVXBMP_HLINETTP))));
+    imgVector.push_back(Image(BitmapEx(CUI_RES(RID_SVXBMP_HLMAILTP))));
+    imgVector.push_back(Image(BitmapEx(CUI_RES(RID_SVXBMP_HLDOCTP))));
+    imgVector.push_back(Image(BitmapEx(CUI_RES(RID_SVXBMP_HLDOCNTP))));
 
     for(Image &aImage : imgVector )
     {
diff --git a/cui/source/dialogs/cuires.src b/cui/source/dialogs/cuires.src
index aabffbfc1f81..88e2abdc1c9d 100644
--- a/cui/source/dialogs/cuires.src
+++ b/cui/source/dialogs/cuires.src
@@ -70,24 +70,34 @@ String RID_SVXSTR_EDIT_GRAPHIC
     Text [ en-US ] = "Link" ;
 };
 
-Image RID_CUIIMG_HARDDISK
+Bitmap RID_CUIBMP_HARDDISK
 {
-    ImageBitmap = Bitmap { File = "harddisk_16.png" ; };
+    File = "harddisk_16.png";
 };
 
-Image RID_CUIIMG_LIB
+Bitmap RID_CUIBMP_LIB
 {
-    ImageBitmap = Bitmap { File = "im30820.png"; };
+    File = "im30820.png";
 };
 
-Image RID_CUIIMG_MACRO
+Bitmap RID_CUIBMP_MACRO
 {
-    ImageBitmap = Bitmap { File = "im30821.png"; };
+    File = "im30821.png";
 };
 
-Image RID_CUIIMG_DOC
+Bitmap RID_CUIBMP_DOC
 {
-    ImageBitmap = Bitmap { File = "im30826.png"; };
+    File = "im30826.png";
+};
+
+Bitmap RID_CUIBMP_COLLAPSED
+{
+    File = "plus.bmp" ;
+};
+
+Bitmap RID_CUIBMP_EXPANDED
+{
+    File = "minus.bmp" ;
 };
 
 String RID_SVXSTR_LOADACCELCONFIG
diff --git a/cui/source/dialogs/hldocntp.cxx b/cui/source/dialogs/hldocntp.cxx
index b4bac2b0574e..6015ef853ad8 100644
--- a/cui/source/dialogs/hldocntp.cxx
+++ b/cui/source/dialogs/hldocntp.cxx
@@ -105,7 +105,7 @@ SvxHyperlinkNewDocTp::SvxHyperlinkNewDocTp ( vcl::Window *pParent, IconChoiceDia
     get(m_pCbbPath, "path");
     m_pCbbPath->SetSmartProtocol(INetProtocol::File);
     get(m_pBtCreate, "create");
-    BitmapEx aBitmap = Image(CUI_RES(RID_SVXBMP_NEWDOC)).GetBitmapEx();
+    BitmapEx aBitmap(CUI_RES(RID_SVXBMP_NEWDOC));
     aBitmap.Scale(GetDPIScaleFactor(),GetDPIScaleFactor(),BmpScaleFlag::BestQuality );
     m_pBtCreate->SetModeImage(Image(aBitmap));
     get(m_pLbDocTypes, "types");
diff --git a/cui/source/dialogs/hldoctp.cxx b/cui/source/dialogs/hldoctp.cxx
index 304408d8d88b..b4cb44e42680 100644
--- a/cui/source/dialogs/hldoctp.cxx
+++ b/cui/source/dialogs/hldoctp.cxx
@@ -41,13 +41,13 @@ SvxHyperlinkDocTp::SvxHyperlinkDocTp ( vcl::Window *pParent, IconChoiceDialog* p
     get(m_pCbbPath, "path");
     m_pCbbPath->SetSmartProtocol(INetProtocol::File);
     get(m_pBtFileopen, "fileopen");
-    BitmapEx aBitmap = Image(CUI_RES(RID_SVXBMP_FILEOPEN)).GetBitmapEx();
+    BitmapEx aBitmap(CUI_RES(RID_SVXBMP_FILEOPEN));
     aBitmap.Scale(GetDPIScaleFactor(),GetDPIScaleFactor(),BmpScaleFlag::BestQuality);
     m_pBtFileopen->SetModeImage(Image(aBitmap));
     get(m_pEdTarget, "target");
     get(m_pFtFullURL, "url");
     get(m_pBtBrowse, "browse");
-    aBitmap = Image(CUI_RES(RID_SVXBMP_TARGET)).GetBitmapEx();
+    aBitmap = BitmapEx(CUI_RES(RID_SVXBMP_TARGET));
     aBitmap.Scale(GetDPIScaleFactor(),GetDPIScaleFactor(),BmpScaleFlag::BestQuality );
     m_pBtBrowse->SetModeImage(Image(aBitmap));
 
diff --git a/cui/source/dialogs/hlmailtp.cxx b/cui/source/dialogs/hlmailtp.cxx
index 3050e15ebe7d..3b617bd6205e 100644
--- a/cui/source/dialogs/hlmailtp.cxx
+++ b/cui/source/dialogs/hlmailtp.cxx
@@ -44,7 +44,7 @@ SvxHyperlinkMailTp::SvxHyperlinkMailTp ( vcl::Window *pParent, IconChoiceDialog*
     get(m_pCbbReceiver, "receiver");
     m_pCbbReceiver->SetSmartProtocol(INetProtocol::Mailto);
     get(m_pBtAdrBook, "adressbook");
-    BitmapEx aBitmap = Image(CUI_RES(RID_SVXBMP_ADRESSBOOK)).GetBitmapEx();
+    BitmapEx aBitmap(CUI_RES(RID_SVXBMP_ADRESSBOOK));
     aBitmap.Scale(GetDPIScaleFactor(),GetDPIScaleFactor(),BmpScaleFlag::BestQuality );
     m_pBtAdrBook->SetModeImage(Image(aBitmap));
     get(m_pFtSubject, "subject_label");
diff --git a/cui/source/dialogs/hltpbase.cxx b/cui/source/dialogs/hltpbase.cxx
index c8a73f663764..d8cfadf9e5cf 100644
--- a/cui/source/dialogs/hltpbase.cxx
+++ b/cui/source/dialogs/hltpbase.cxx
@@ -172,7 +172,7 @@ void SvxHyperlinkTabPageBase::InitStdControls ()
         get(mpEdIndication, "indication");
         get(mpEdText, "name");
         get(mpBtScript, "script");
-        BitmapEx aBitmap = Image(CUI_RES (RID_SVXBMP_SCRIPT)).GetBitmapEx();
+        BitmapEx aBitmap(CUI_RES(RID_SVXBMP_SCRIPT));
         aBitmap.Scale(GetDPIScaleFactor(),GetDPIScaleFactor(),BmpScaleFlag::BestQuality );
         mpBtScript->SetModeImage(Image(aBitmap));
 
diff --git a/cui/source/dialogs/hyperdlg.src b/cui/source/dialogs/hyperdlg.src
index 11fc1d8d3938..ba6c6eb99438 100644
--- a/cui/source/dialogs/hyperdlg.src
+++ b/cui/source/dialogs/hyperdlg.src
@@ -94,54 +94,54 @@ String RID_SVXSTR_HYPERDLG_QUERYOVERWRITE
     Text [ en-US ] = "The file already exists. Overwrite?" ;
 };
 
-Image RID_SVXBMP_HLINETTP
+Bitmap RID_SVXBMP_HLINETTP
 {
-    ImageBitmap = Bitmap { File = "hlinettp.png" ; };
+    File = "hlinettp.png";
 };
 
-Image RID_SVXBMP_HLMAILTP
+Bitmap RID_SVXBMP_HLMAILTP
 {
-    ImageBitmap = Bitmap { File = "hlmailtp.png" ; };
+    File = "hlmailtp.png";
 };
 
-Image RID_SVXBMP_HLDOCTP
+Bitmap RID_SVXBMP_HLDOCTP
 {
-    ImageBitmap = Bitmap { File = "hldoctp.png" ; };
+    File = "hldoctp.png";
 };
 
-Image RID_SVXBMP_HLDOCNTP
+Bitmap RID_SVXBMP_HLDOCNTP
 {
-    ImageBitmap = Bitmap { File = "hldocntp.png" ; };
+    File = "hldocntp.png";
 };
 
-Image RID_SVXBMP_BROWSE
+Bitmap RID_SVXBMP_BROWSE
 {
-    ImageBitmap = Bitmap { File = "browse.png" ; };
+    File = "browse.png";
 };
 
-Image RID_SVXBMP_SCRIPT
+Bitmap RID_SVXBMP_SCRIPT
 {
-    ImageBitmap = Bitmap { File = "script.png" ; };
+    File = "script.png";
 };
 
-Image RID_SVXBMP_ADRESSBOOK
+Bitmap RID_SVXBMP_ADRESSBOOK
 {
-    ImageBitmap = Bitmap { File = "adrbook.png" ; };
+    File = "adrbook.png";
 };
 
-Image RID_SVXBMP_FILEOPEN
+Bitmap RID_SVXBMP_FILEOPEN
 {
-    ImageBitmap = Bitmap { File = "fileopen.png" ; };
+    File = "fileopen.png";
 };
 
-Image RID_SVXBMP_TARGET
+Bitmap RID_SVXBMP_TARGET
 {
-    ImageBitmap = Bitmap { File = "target.png" ; };
+    File = "target.png";
 };
 
-Image RID_SVXBMP_NEWDOC
+Bitmap RID_SVXBMP_NEWDOC
 {
-    ImageBitmap = Bitmap { File = "newdoc.png" ; };
+    File = "newdoc.png";
 };
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx
index 6f06d1444203..0ab49c7357e3 100644
--- a/cui/source/dialogs/scriptdlg.cxx
+++ b/cui/source/dialogs/scriptdlg.cxx
@@ -76,10 +76,10 @@ void ShowErrorDialog( const Any& aException )
 
 SFTreeListBox::SFTreeListBox(vcl::Window* pParent)
     : SvTreeListBox(pParent)
-    , m_hdImage(CUI_RES(RID_CUIIMG_HARDDISK))
-    , m_libImage(CUI_RES(RID_CUIIMG_LIB))
-    , m_macImage(CUI_RES(RID_CUIIMG_MACRO))
-    , m_docImage(CUI_RES(RID_CUIIMG_DOC))
+    , m_hdImage(BitmapEx(CUI_RES(RID_CUIBMP_HARDDISK)))
+    , m_libImage(BitmapEx(CUI_RES(RID_CUIBMP_LIB)))
+    , m_macImage(BitmapEx(CUI_RES(RID_CUIBMP_MACRO)))
+    , m_docImage(BitmapEx(CUI_RES(RID_CUIBMP_DOC)))
     , m_sMyMacros(CUI_RESSTR(RID_SVXSTR_MYMACROS))
     , m_sProdMacros(CUI_RESSTR(RID_SVXSTR_PRODMACROS))
 {
@@ -237,7 +237,7 @@ void SFTreeListBox::Init( const OUString& language  )
         Reference< browse::XBrowseNode > langEntries =
             getLangNodeFromRootNode( children[ n ], lang );
 
-        insertEntry( uiName, app ? RID_CUIIMG_HARDDISK : RID_CUIIMG_DOC,
+        insertEntry( uiName, app ? RID_CUIBMP_HARDDISK : RID_CUIBMP_DOC,
             nullptr, true, o3tl::make_unique< SFEntry >( OBJTYPE_SFROOT, langEntries, xDocumentModel ), factoryURL );
     }
 
@@ -319,11 +319,11 @@ void SFTreeListBox:: RequestSubEntries( SvTreeListEntry* pRootEntry, Reference<
         OUString name( children[ n ]->getName() );
         if (  children[ n ]->getType() !=  browse::BrowseNodeTypes::SCRIPT)
         {
-            insertEntry( name, RID_CUIIMG_LIB, pRootEntry, true, o3tl::make_unique< SFEntry >( OBJTYPE_SCRIPTCONTAINER, children[ n ],model ));
+            insertEntry(name, RID_CUIBMP_LIB, pRootEntry, true, o3tl::make_unique< SFEntry >( OBJTYPE_SCRIPTCONTAINER, children[ n ],model));
         }
         else
         {
-            insertEntry( name, RID_CUIIMG_MACRO, pRootEntry, false, o3tl::make_unique< SFEntry >( OBJTYPE_METHOD, children[ n ],model ));
+            insertEntry(name, RID_CUIBMP_MACRO, pRootEntry, false, o3tl::make_unique< SFEntry >( OBJTYPE_METHOD, children[ n ],model));
         }
     }
 }
@@ -338,7 +338,7 @@ SvTreeListEntry * SFTreeListBox::insertEntry(
     bool bChildrenOnDemand, std::unique_ptr< SFEntry > && aUserData, const OUString& factoryURL )
 {
     SvTreeListEntry * p;
-    if( nBitmap == RID_CUIIMG_DOC && !factoryURL.isEmpty() )
+    if( nBitmap == RID_CUIBMP_DOC && !factoryURL.isEmpty() )
     {
         Image aImage = SvFileInformationManager::GetFileImage( INetURLObject(factoryURL) );
         p = InsertEntry(
@@ -357,19 +357,19 @@ SvTreeListEntry * SFTreeListBox::insertEntry(
     bool bChildrenOnDemand, std::unique_ptr< SFEntry > && aUserData )
 {
     Image aImage;
-    if( nBitmap == RID_CUIIMG_HARDDISK )
+    if( nBitmap == RID_CUIBMP_HARDDISK )
     {
         aImage = m_hdImage;
     }
-    else if( nBitmap == RID_CUIIMG_LIB )
+    else if( nBitmap == RID_CUIBMP_LIB )
     {
         aImage = m_libImage;
     }
-    else if( nBitmap == RID_CUIIMG_MACRO )
+    else if( nBitmap == RID_CUIBMP_MACRO )
     {
         aImage = m_macImage;
     }
-    else if( nBitmap == RID_CUIIMG_DOC )
+    else if( nBitmap == RID_CUIBMP_DOC )
     {
         aImage = m_docImage;
     }
@@ -956,12 +956,12 @@ void SvxScriptOrgDialog::createEntry( SvTreeListEntry* pEntry )
         if ( aChildNode->getType() == browse::BrowseNodeTypes::SCRIPT )
         {
             pNewEntry = m_pScriptsBox->insertEntry( aChildName,
-                    RID_CUIIMG_MACRO, pEntry, false, o3tl::make_unique< SFEntry >( OBJTYPE_METHOD, aChildNode,xDocumentModel ) );
+                    RID_CUIBMP_MACRO, pEntry, false, o3tl::make_unique< SFEntry >( OBJTYPE_METHOD, aChildNode,xDocumentModel ) );
         }
         else
         {
             pNewEntry = m_pScriptsBox->insertEntry( aChildName,
-                RID_CUIIMG_LIB, pEntry, false, o3tl::make_unique< SFEntry >( OBJTYPE_SCRIPTCONTAINER, aChildNode,xDocumentModel ) );
+                RID_CUIBMP_LIB, pEntry, false, o3tl::make_unique< SFEntry >( OBJTYPE_SCRIPTCONTAINER, aChildNode,xDocumentModel ) );
 
             // If the Parent is not loaded then set to
             // loaded, this will prevent RequestingChildren ( called
diff --git a/cui/source/inc/cuires.hrc b/cui/source/inc/cuires.hrc
index b6cfb103515a..38283b58edfb 100644
--- a/cui/source/inc/cuires.hrc
+++ b/cui/source/inc/cuires.hrc
@@ -28,10 +28,12 @@
 // RID_SVX_START + 0 unused
 #define RID_SVXSTR_OPTIONS_RESTART          (RID_SVX_START + 1)
 
-#define RID_CUIIMG_HARDDISK                 (RID_SVX_START + 4)
-#define RID_CUIIMG_LIB                      (RID_SVX_START + 5)
-#define RID_CUIIMG_MACRO                    (RID_SVX_START + 6)
-#define RID_CUIIMG_DOC                      (RID_SVX_START + 7)
+#define RID_CUIBMP_HARDDISK                 (RID_SVX_START + 4)
+#define RID_CUIBMP_LIB                      (RID_SVX_START + 5)
+#define RID_CUIBMP_MACRO                    (RID_SVX_START + 6)
+#define RID_CUIBMP_DOC                      (RID_SVX_START + 7)
+#define RID_CUIBMP_COLLAPSED                (RID_SVX_START + 8)
+#define RID_CUIBMP_EXPANDED                 (RID_SVX_START + 9)
 
 // Gallery
 #define RID_CUI_GALLERY_START               (RID_SVX_START + 360)