use Image(OUString) instead of Image(Bitmap(OUString))

which benefits LOOL since we can delay creating the image until
we know the dpi setting of the display we are going to write to.

Achieved by

    perl -pi -w -e "s/\bImage\s*\(\s*BitmapEx\s*\((\w+)\s*\)\s*\)/Image\(\1\)/g" $( git grep -lw "BitmapEx" )

followed by

    git grep -nP '\bImage\s*\(\s*BitmapEx\s*\('

followed by commenting out the BitmapEx(OUString) constructor and seeing
what needed adjusting.

Reviewed-on: https://gerrit.libreoffice.org/64760
Tested-by: Jenkins
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/64860
Tested-by: Michael Meeks <michael.meeks@collabora.com>
(cherry picked from commit 89161e4d5835b93f0942e960a116a0d3863cc55c)

Change-Id: I3224e11937d720fa484b0d659d25673a9e809267
Reviewed-on: https://gerrit.libreoffice.org/79844
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

21 files changed, 113 insertions, 114 deletions

diff --git a/svx/source/dialog/docrecovery.cxx b/svx/source/dialog/docrecovery.cxx
index 13677d4c63fc..8cebf4708949 100644
--- a/svx/source/dialog/docrecovery.cxx
+++ b/svx/source/dialog/docrecovery.cxx
@@ -804,9 +804,9 @@ void RecovDocListEntry::Paint(const Point& aPos, SvTreeListBox& aDevice, vcl::Re
 
 RecovDocList::RecovDocList(SvSimpleTableContainer& rParent)
     : SvSimpleTable      ( rParent )
-    , m_aGreenCheckImg    (BitmapEx(RID_SVXBMP_GREENCHECK))
-    , m_aYellowCheckImg   (BitmapEx(RID_SVXBMP_YELLOWCHECK))
-    , m_aRedCrossImg      (BitmapEx(RID_SVXBMP_REDCROSS))
+    , m_aGreenCheckImg    (StockImage::Yes, RID_SVXBMP_GREENCHECK)
+    , m_aYellowCheckImg   (StockImage::Yes, RID_SVXBMP_YELLOWCHECK)
+    , m_aRedCrossImg      (StockImage::Yes, RID_SVXBMP_REDCROSS)
     , m_aSuccessRecovStr  (SvxResId(RID_SVXSTR_SUCCESSRECOV))
     , m_aOrigDocRecovStr  (SvxResId(RID_SVXSTR_ORIGDOCRECOV))
     , m_aRecovFailedStr   (SvxResId(RID_SVXSTR_RECOVFAILED))
diff --git a/svx/source/dialog/fontwork.cxx b/svx/source/dialog/fontwork.cxx
index 197a0180d388..ac8e68e353ad 100644
--- a/svx/source/dialog/fontwork.cxx
+++ b/svx/source/dialog/fontwork.cxx
@@ -801,13 +801,13 @@ void SvxFontWorkDialog::ApplyImageList()
 {
     if (nLastShadowTbxId == nShadowSlantId)
     {
-        m_pFbShadowX->SetImage(Image(BitmapEx(RID_SVXBMP_SHADOW_ANGLE)));
-        m_pFbShadowY->SetImage(Image(BitmapEx(RID_SVXBMP_SHADOW_SIZE)));
+        m_pFbShadowX->SetImage(Image(StockImage::Yes, RID_SVXBMP_SHADOW_ANGLE));
+        m_pFbShadowY->SetImage(Image(StockImage::Yes, RID_SVXBMP_SHADOW_SIZE));
     }
     else
     {
-        m_pFbShadowX->SetImage(Image(BitmapEx(RID_SVXBMP_SHADOW_XDIST)));
-        m_pFbShadowY->SetImage(Image(BitmapEx(RID_SVXBMP_SHADOW_YDIST)));
+        m_pFbShadowX->SetImage(Image(StockImage::Yes, RID_SVXBMP_SHADOW_XDIST));
+        m_pFbShadowY->SetImage(Image(StockImage::Yes, RID_SVXBMP_SHADOW_YDIST));
     }
 }
 
diff --git a/svx/source/dialog/langbox.cxx b/svx/source/dialog/langbox.cxx
index fedbe1a5c4c1..7f268b3096d6 100644
--- a/svx/source/dialog/langbox.cxx
+++ b/svx/source/dialog/langbox.cxx
@@ -147,8 +147,8 @@ SvxLanguageBoxBase::SvxLanguageBoxBase()
 
 void SvxLanguageBoxBase::ImplLanguageBoxBaseInit()
 {
-    m_aNotCheckedImage = Image(BitmapEx(RID_SVXBMP_NOTCHECKED));
-    m_aCheckedImage = Image(BitmapEx(RID_SVXBMP_CHECKED));
+    m_aNotCheckedImage = Image(StockImage::Yes, RID_SVXBMP_NOTCHECKED);
+    m_aCheckedImage = Image(StockImage::Yes, RID_SVXBMP_CHECKED);
     m_aAllString            = SvxResId( RID_SVXSTR_LANGUAGE_ALL );
     m_bHasLangNone          = false;
     m_bLangNoneIsLangAll    = false;
diff --git a/svx/source/engine3d/float3d.cxx b/svx/source/engine3d/float3d.cxx
index 8d0a72d11923..6451b1778893 100644
--- a/svx/source/engine3d/float3d.cxx
+++ b/svx/source/engine3d/float3d.cxx
@@ -88,8 +88,8 @@ namespace {
 Svx3DWin::Svx3DWin(SfxBindings* pInBindings, SfxChildWindow *pCW, vcl::Window* pParent)
     : SfxDockingWindow (pInBindings, pCW, pParent,
         "Docking3DEffects", "svx/ui/docking3deffects.ui")
-    , aImgLightOn(BitmapEx(RID_SVXBMP_LAMP_ON))
-    , aImgLightOff(BitmapEx(RID_SVXBMP_LAMP_OFF))
+    , aImgLightOn(StockImage::Yes, RID_SVXBMP_LAMP_ON)
+    , aImgLightOff(StockImage::Yes, RID_SVXBMP_LAMP_OFF)
     , bUpdate(false)
     , eViewType(ViewType3D::Geo)
     , pBindings(pInBindings)
diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx
index 8ab6df731009..acd329d5ceca 100644
--- a/svx/source/fmcomp/fmgridcl.cxx
+++ b/svx/source/fmcomp/fmgridcl.cxx
@@ -100,8 +100,7 @@ struct FmGridHeaderData
 
 static void SetMenuItem(const OUString& rImgID, const OString &rID, Menu& rMenu, bool bDesignMode)
 {
-    BitmapEx aBitmap(rImgID);
-    Image aImage(aBitmap);
+    Image aImage(StockImage::Yes, rImgID);
     sal_uInt16 nID = rMenu.GetItemId(rID);
     rMenu.SetItemImage(nID, aImage);
     rMenu.EnableItem(nID, bDesignMode);
diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx
index 741c9c191e5e..1a0421c26786 100644
--- a/svx/source/form/datanavi.cxx
+++ b/svx/source/form/datanavi.cxx
@@ -348,11 +348,11 @@ constexpr OUStringLiteral MethodString::m_sGet_API;
         m_pItemList->SetToolBoxItemIds(m_nAddId, m_nAddElementId, m_nAddAttributeId, m_nEditId, m_nRemoveId);
 
         m_pToolBox->InsertSeparator(4,5);
-        m_pToolBox->SetItemImage(m_nAddId, Image(BitmapEx(RID_SVXBMP_ADD)));
-        m_pToolBox->SetItemImage(m_nAddElementId, Image(BitmapEx(RID_SVXBMP_ADD_ELEMENT)));
-        m_pToolBox->SetItemImage(m_nAddAttributeId, Image(BitmapEx(RID_SVXBMP_ADD_ATTRIBUTE)));
-        m_pToolBox->SetItemImage(m_nEditId, Image(BitmapEx(RID_SVXBMP_EDIT)));
-        m_pToolBox->SetItemImage(m_nRemoveId, Image(BitmapEx(RID_SVXBMP_REMOVE)));
+        m_pToolBox->SetItemImage(m_nAddId, Image(StockImage::Yes, RID_SVXBMP_ADD));
+        m_pToolBox->SetItemImage(m_nAddElementId, Image(StockImage::Yes, RID_SVXBMP_ADD_ELEMENT));
+        m_pToolBox->SetItemImage(m_nAddAttributeId, Image(StockImage::Yes, RID_SVXBMP_ADD_ATTRIBUTE));
+        m_pToolBox->SetItemImage(m_nEditId, Image(StockImage::Yes, RID_SVXBMP_EDIT));
+        m_pToolBox->SetItemImage(m_nRemoveId, Image(StockImage::Yes, RID_SVXBMP_REMOVE));
 
         if ( DGTInstance == m_eGroup )
             m_pToolBox->RemoveItem( m_pToolBox->GetItemPos( m_nAddId ) );
@@ -436,16 +436,16 @@ constexpr OUStringLiteral MethodString::m_sGet_API;
                     switch ( eChildType )
                     {
                         case css::xml::dom::NodeType_ATTRIBUTE_NODE:
-                            aExpImg = aCollImg = Image(BitmapEx(RID_SVXBMP_ATTRIBUTE));
+                            aExpImg = aCollImg = Image(StockImage::Yes, RID_SVXBMP_ATTRIBUTE);
                             break;
                         case css::xml::dom::NodeType_ELEMENT_NODE:
-                            aExpImg = aCollImg = Image(BitmapEx(RID_SVXBMP_ELEMENT));
+                            aExpImg = aCollImg = Image(StockImage::Yes, RID_SVXBMP_ELEMENT);
                             break;
                         case css::xml::dom::NodeType_TEXT_NODE:
-                            aExpImg = aCollImg = Image(BitmapEx(RID_SVXBMP_TEXT));
+                            aExpImg = aCollImg = Image(StockImage::Yes, RID_SVXBMP_TEXT);
                             break;
                         default:
-                            aExpImg = aCollImg = Image(BitmapEx(RID_SVXBMP_OTHER));
+                            aExpImg = aCollImg = Image(StockImage::Yes, RID_SVXBMP_OTHER);
                     }
 
                     OUString sName = m_xUIHelper->getNodeDisplayName( xChild, bShowDetails );
@@ -459,7 +459,7 @@ constexpr OUStringLiteral MethodString::m_sGet_API;
                             Reference< css::xml::dom::XNamedNodeMap > xMap = xChild->getAttributes();
                             if ( xMap.is() )
                             {
-                                aExpImg = aCollImg = Image(BitmapEx(RID_SVXBMP_ATTRIBUTE));
+                                aExpImg = aCollImg = Image(StockImage::Yes, RID_SVXBMP_ATTRIBUTE);
                                 sal_Int32 j, nMapLen = xMap->getLength();
                                 for ( j = 0; j < nMapLen; ++j )
                                 {
@@ -799,7 +799,7 @@ constexpr OUStringLiteral MethodString::m_sGet_API;
     SvTreeListEntry* XFormsPage::AddEntry( ItemNode* _pNewNode, bool _bIsElement )
     {
         SvTreeListEntry* pParent = m_pItemList->FirstSelected();
-        Image aImage(BitmapEx(_bIsElement ? OUString(RID_SVXBMP_ELEMENT) : OUString(RID_SVXBMP_ATTRIBUTE)));
+        Image aImage(StockImage::Yes, _bIsElement ? OUString(RID_SVXBMP_ELEMENT) : OUString(RID_SVXBMP_ATTRIBUTE));
         OUString sName;
         try
         {
@@ -817,7 +817,7 @@ constexpr OUStringLiteral MethodString::m_sGet_API;
     SvTreeListEntry* XFormsPage::AddEntry( const Reference< XPropertySet >& _rEntry )
     {
         SvTreeListEntry* pEntry = nullptr;
-        Image aImage(BitmapEx(RID_SVXBMP_ELEMENT));
+        Image aImage(StockImage::Yes, RID_SVXBMP_ELEMENT);
 
         ItemNode* pNode = new ItemNode( _rEntry );
         OUString sTemp;
@@ -1168,7 +1168,7 @@ constexpr OUStringLiteral MethodString::m_sGet_API;
                         Reference < XEnumeration > xNum = xNumAccess->createEnumeration();
                         if ( xNum.is() && xNum->hasMoreElements() )
                         {
-                            Image aImage(BitmapEx(RID_SVXBMP_ELEMENT));
+                            Image aImage(StockImage::Yes, RID_SVXBMP_ELEMENT);
                             while ( xNum->hasMoreElements() )
                             {
                                 Reference< XPropertySet > xPropSet;
diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx
index 48ca4b5cecf9..a96ab4b18a9a 100644
--- a/svx/source/form/filtnav.cxx
+++ b/svx/source/form/filtnav.cxx
@@ -140,7 +140,7 @@ FmParentData::~FmParentData()
 
 Image FmFormItem::GetImage() const
 {
-    return Image(BitmapEx(RID_SVXBMP_FORM));
+    return Image(StockImage::Yes, RID_SVXBMP_FORM);
 }
 
 FmFilterItem* FmFilterItems::Find( const ::sal_Int32 _nFilterComponentIndex ) const
@@ -156,7 +156,7 @@ FmFilterItem* FmFilterItems::Find( const ::sal_Int32 _nFilterComponentIndex ) co
 
 Image FmFilterItems::GetImage() const
 {
-    return Image(BitmapEx(RID_SVXBMP_FILTER));
+    return Image(StockImage::Yes, RID_SVXBMP_FILTER);
 }
 
 FmFilterItem::FmFilterItem( FmFilterItems* pParent,
@@ -171,7 +171,7 @@ FmFilterItem::FmFilterItem( FmFilterItems* pParent,
 
 Image FmFilterItem::GetImage() const
 {
-    return Image(BitmapEx(RID_SVXBMP_FIELD));
+    return Image(StockImage::Yes, RID_SVXBMP_FIELD);
 }
 
 // Hints for communication between model and view
@@ -1062,8 +1062,8 @@ FmFilterNavigator::FmFilterNavigator( vcl::Window* pParent )
     SetHelpId( HID_FILTER_NAVIGATOR );
 
     SetNodeBitmaps(
-        Image(BitmapEx(RID_SVXBMP_COLLAPSEDNODE)),
-        Image(BitmapEx(RID_SVXBMP_EXPANDEDNODE))
+        Image(StockImage::Yes, RID_SVXBMP_COLLAPSEDNODE),
+        Image(StockImage::Yes, RID_SVXBMP_EXPANDEDNODE)
     );
 
     m_pModel.reset( new FmFilterModel() );
diff --git a/svx/source/form/fmexpl.cxx b/svx/source/form/fmexpl.cxx
index 8f636b92d962..021d8e18d380 100644
--- a/svx/source/form/fmexpl.cxx
+++ b/svx/source/form/fmexpl.cxx
@@ -328,7 +328,7 @@ std::unique_ptr<FmEntryData> FmControlData::Clone()
 Image FmControlData::GetImage() const
 {
     // Default-Image
-    Image aImage(BitmapEx(RID_SVXBMP_CONTROL));
+    Image aImage(StockImage::Yes, RID_SVXBMP_CONTROL);
 
     Reference< XServiceInfo > xInfo( m_xFormComponent, UNO_QUERY );
     if (!m_xFormComponent.is())
@@ -340,91 +340,91 @@ Image FmControlData::GetImage() const
     switch (nObjectType)
     {
     case OBJ_FM_BUTTON:
-        aImage = Image(BitmapEx(RID_SVXBMP_BUTTON));
+        aImage = Image(StockImage::Yes, RID_SVXBMP_BUTTON);
         break;
 
     case OBJ_FM_FIXEDTEXT:
-        aImage = Image(BitmapEx(RID_SVXBMP_FIXEDTEXT));
+        aImage = Image(StockImage::Yes, RID_SVXBMP_FIXEDTEXT);
         break;
 
     case OBJ_FM_EDIT:
-        aImage = Image(BitmapEx(RID_SVXBMP_EDITBOX));
+        aImage = Image(StockImage::Yes, RID_SVXBMP_EDITBOX);
         break;
 
     case OBJ_FM_RADIOBUTTON:
-        aImage = Image(BitmapEx(RID_SVXBMP_RADIOBUTTON));
+        aImage = Image(StockImage::Yes, RID_SVXBMP_RADIOBUTTON);
         break;
 
     case OBJ_FM_CHECKBOX:
-        aImage = Image(BitmapEx(RID_SVXBMP_CHECKBOX));
+        aImage = Image(StockImage::Yes, RID_SVXBMP_CHECKBOX);
         break;
 
     case OBJ_FM_LISTBOX:
-        aImage = Image(BitmapEx(RID_SVXBMP_LISTBOX));
+        aImage = Image(StockImage::Yes, RID_SVXBMP_LISTBOX);
         break;
 
     case OBJ_FM_COMBOBOX:
-        aImage = Image(BitmapEx(RID_SVXBMP_COMBOBOX));
+        aImage = Image(StockImage::Yes, RID_SVXBMP_COMBOBOX);
         break;
 
     case OBJ_FM_NAVIGATIONBAR:
-        aImage = Image(BitmapEx(RID_SVXBMP_NAVIGATIONBAR));
+        aImage = Image(StockImage::Yes, RID_SVXBMP_NAVIGATIONBAR);
         break;
 
     case OBJ_FM_GROUPBOX:
-        aImage = Image(BitmapEx(RID_SVXBMP_GROUPBOX));
+        aImage = Image(StockImage::Yes, RID_SVXBMP_GROUPBOX);
         break;
 
     case OBJ_FM_IMAGEBUTTON:
-        aImage = Image(BitmapEx(RID_SVXBMP_IMAGEBUTTON));
+        aImage = Image(StockImage::Yes, RID_SVXBMP_IMAGEBUTTON);
         break;
 
     case OBJ_FM_FILECONTROL:
-        aImage = Image(BitmapEx(RID_SVXBMP_FILECONTROL));
+        aImage = Image(StockImage::Yes, RID_SVXBMP_FILECONTROL);
         break;
 
     case OBJ_FM_HIDDEN:
-        aImage = Image(BitmapEx(RID_SVXBMP_HIDDEN));
+        aImage = Image(StockImage::Yes, RID_SVXBMP_HIDDEN);
         break;
 
     case OBJ_FM_DATEFIELD:
-        aImage = Image(BitmapEx(RID_SVXBMP_DATEFIELD));
+        aImage = Image(StockImage::Yes, RID_SVXBMP_DATEFIELD);
         break;
 
     case OBJ_FM_TIMEFIELD:
-        aImage = Image(BitmapEx(RID_SVXBMP_TIMEFIELD));
+        aImage = Image(StockImage::Yes, RID_SVXBMP_TIMEFIELD);
         break;
 
     case OBJ_FM_NUMERICFIELD:
-        aImage = Image(BitmapEx(RID_SVXBMP_NUMERICFIELD));
+        aImage = Image(StockImage::Yes, RID_SVXBMP_NUMERICFIELD);
         break;
 
     case OBJ_FM_CURRENCYFIELD:
-        aImage = Image(BitmapEx(RID_SVXBMP_CURRENCYFIELD));
+        aImage = Image(StockImage::Yes, RID_SVXBMP_CURRENCYFIELD);
         break;
 
     case OBJ_FM_PATTERNFIELD:
-        aImage = Image(BitmapEx(RID_SVXBMP_PATTERNFIELD));
+        aImage = Image(StockImage::Yes, RID_SVXBMP_PATTERNFIELD);
         break;
 
     case OBJ_FM_IMAGECONTROL:
-        aImage = Image(BitmapEx(RID_SVXBMP_IMAGECONTROL));
+        aImage = Image(StockImage::Yes, RID_SVXBMP_IMAGECONTROL);
         break;
 
     case OBJ_FM_FORMATTEDFIELD:
-        aImage = Image(BitmapEx(RID_SVXBMP_FORMATTEDFIELD));
+        aImage = Image(StockImage::Yes, RID_SVXBMP_FORMATTEDFIELD);
         break;
 
     case OBJ_FM_GRID:
-        aImage = Image(BitmapEx(RID_SVXBMP_GRID));
+        aImage = Image(StockImage::Yes, RID_SVXBMP_GRID);
         break;
 
     case OBJ_FM_SCROLLBAR:
-        aImage = Image(BitmapEx(RID_SVXBMP_SCROLLBAR));
+        aImage = Image(StockImage::Yes, RID_SVXBMP_SCROLLBAR);
         break;
 
     case OBJ_FM_SPINBUTTON:
-        aImage = Image(BitmapEx(RID_SVXBMP_SPINBUTTON));
+        aImage = Image(StockImage::Yes, RID_SVXBMP_SPINBUTTON);
         break;
     }
 
diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx
index b4fe6dc14805..8e89b05ddda5 100644
--- a/svx/source/form/fmshimp.cxx
+++ b/svx/source/form/fmshimp.cxx
@@ -1038,7 +1038,7 @@ VclBuilder* FmXFormShell::GetConversionMenu_Lock()
     for (size_t i = 0; i < SAL_N_ELEMENTS(aConvertSlots); ++i)
     {
         // the corresponding image at it
-        pNewMenu->SetItemImage(pNewMenu->GetItemId(aConvertSlots[i]), Image(BitmapEx(aImgIds[i])));
+        pNewMenu->SetItemImage(pNewMenu->GetItemId(aConvertSlots[i]), Image(StockImage::Yes, aImgIds[i]));
     }
     return pBuilder;
 }
diff --git a/svx/source/form/navigatortree.cxx b/svx/source/form/navigatortree.cxx
index df5188783619..fa6e47fc0d6b 100644
--- a/svx/source/form/navigatortree.cxx
+++ b/svx/source/form/navigatortree.cxx
@@ -134,8 +134,8 @@ namespace svxform
         SetHelpId( HID_FORM_NAVIGATOR );
 
         SetNodeBitmaps(
-            Image(BitmapEx(RID_SVXBMP_COLLAPSEDNODE)),
-            Image(BitmapEx(RID_SVXBMP_EXPANDEDNODE))
+            Image(StockImage::Yes, RID_SVXBMP_COLLAPSEDNODE),
+            Image(StockImage::Yes, RID_SVXBMP_EXPANDEDNODE)
         );
 
         SetDragDropMode(DragDropMode::ALL);
@@ -368,12 +368,12 @@ namespace svxform
                     // 'New'\'Form' under the same terms
                     const sal_uInt16 nFormId = pSubMenuNew->GetItemId("form");
                     pSubMenuNew->EnableItem(nFormId, bSingleSelection && (m_nFormsSelected || m_bRootSelected));
-                    pSubMenuNew->SetItemImage(nFormId, Image(BitmapEx(RID_SVXBMP_FORM)));
+                    pSubMenuNew->SetItemImage(nFormId, Image(StockImage::Yes, RID_SVXBMP_FORM));
 
                     // 'New'\'hidden...', if exactly one form is selected
                     const sal_uInt16 nHiddenId = pSubMenuNew->GetItemId("hidden");
                     pSubMenuNew->EnableItem(nHiddenId, bSingleSelection && m_nFormsSelected);
-                    pSubMenuNew->SetItemImage(nHiddenId, Image(BitmapEx(RID_SVXBMP_HIDDEN)));
+                    pSubMenuNew->SetItemImage(nHiddenId, Image(StockImage::Yes, RID_SVXBMP_HIDDEN));
 
                     // 'Delete': everything which is not root can be removed
                     aContextMenu->EnableItem(aContextMenu->GetItemId("delete"), !m_bRootSelected);
@@ -581,7 +581,7 @@ namespace svxform
             SvTreeListBox::Clear();
 
             // default-entry "Forms"
-            Image aRootImage(BitmapEx(RID_SVXBMP_FORMS));
+            Image aRootImage(StockImage::Yes, RID_SVXBMP_FORMS);
             m_pRootEntry = InsertEntry( SvxResId(RID_STR_FORMS), aRootImage, aRootImage,
                 nullptr, false, 0 );
         }
diff --git a/svx/source/sidebar/area/AreaPropertyPanelBase.cxx b/svx/source/sidebar/area/AreaPropertyPanelBase.cxx
index 1235ecb98b2d..969cd2c18a01 100644
--- a/svx/source/sidebar/area/AreaPropertyPanelBase.cxx
+++ b/svx/source/sidebar/area/AreaPropertyPanelBase.cxx
@@ -82,12 +82,12 @@ AreaPropertyPanelBase::AreaPropertyPanelBase(
       mpFillGradientItem(),
       mpHatchItem(),
       mpBitmapItem(),
-      maImgAxial(BitmapEx(BMP_AXIAL)),
-      maImgElli(BitmapEx(BMP_ELLI)),
-      maImgQuad(BitmapEx(BMP_QUAD)),
-      maImgRadial(BitmapEx(BMP_RADIAL)),
-      maImgSquare(BitmapEx(BMP_SQUARE)),
-      maImgLinear(BitmapEx(BMP_LINEAR)),
+      maImgAxial(StockImage::Yes, BMP_AXIAL),
+      maImgElli(StockImage::Yes, BMP_ELLI),
+      maImgQuad(StockImage::Yes, BMP_QUAD),
+      maImgRadial(StockImage::Yes, BMP_RADIAL),
+      maImgSquare(StockImage::Yes, BMP_SQUARE),
+      maImgLinear(StockImage::Yes, BMP_LINEAR),
       mpFloatTransparenceItem(),
       mpTransparanceItem()
 {
diff --git a/svx/source/sidebar/line/LinePropertyPanelBase.cxx b/svx/source/sidebar/line/LinePropertyPanelBase.cxx
index 33c478fc457f..50da4a9d6b14 100644
--- a/svx/source/sidebar/line/LinePropertyPanelBase.cxx
+++ b/svx/source/sidebar/line/LinePropertyPanelBase.cxx
@@ -171,7 +171,7 @@ LinePropertyPanelBase::LinePropertyPanelBase(
     mpStartItem(),
     mpEndItem(),
     mxLineWidthPopup(VclPtr<LineWidthPopup>::Create(*this)),
-    maIMGNone(BitmapEx(BMP_NONE_ICON)),
+    maIMGNone(StockImage::Yes, BMP_NONE_ICON),
     mpIMGWidthIcon(),
     mbWidthValuable(true),
     mbArrowSupported(true)
@@ -223,14 +223,14 @@ void LinePropertyPanelBase::dispose()
 void LinePropertyPanelBase::Initialize()
 {
     mpIMGWidthIcon.reset(new Image[8]);
-    mpIMGWidthIcon[0] = Image(BitmapEx(BMP_WIDTH1_ICON));
-    mpIMGWidthIcon[1] = Image(BitmapEx(BMP_WIDTH2_ICON));
-    mpIMGWidthIcon[2] = Image(BitmapEx(BMP_WIDTH3_ICON));
-    mpIMGWidthIcon[3] = Image(BitmapEx(BMP_WIDTH4_ICON));
-    mpIMGWidthIcon[4] = Image(BitmapEx(BMP_WIDTH5_ICON));
-    mpIMGWidthIcon[5] = Image(BitmapEx(BMP_WIDTH6_ICON));
-    mpIMGWidthIcon[6] = Image(BitmapEx(BMP_WIDTH7_ICON));
-    mpIMGWidthIcon[7] = Image(BitmapEx(BMP_WIDTH8_ICON));
+    mpIMGWidthIcon[0] = Image(StockImage::Yes, BMP_WIDTH1_ICON);
+    mpIMGWidthIcon[1] = Image(StockImage::Yes, BMP_WIDTH2_ICON);
+    mpIMGWidthIcon[2] = Image(StockImage::Yes, BMP_WIDTH3_ICON);
+    mpIMGWidthIcon[3] = Image(StockImage::Yes, BMP_WIDTH4_ICON);
+    mpIMGWidthIcon[4] = Image(StockImage::Yes, BMP_WIDTH5_ICON);
+    mpIMGWidthIcon[5] = Image(StockImage::Yes, BMP_WIDTH6_ICON);
+    mpIMGWidthIcon[6] = Image(StockImage::Yes, BMP_WIDTH7_ICON);
+    mpIMGWidthIcon[7] = Image(StockImage::Yes, BMP_WIDTH8_ICON);
 
     FillLineStyleList();
     SelectLineStyle();
diff --git a/svx/source/sidebar/line/LineWidthPopup.cxx b/svx/source/sidebar/line/LineWidthPopup.cxx
index 97841ad1edb4..6ed094b82551 100644
--- a/svx/source/sidebar/line/LineWidthPopup.cxx
+++ b/svx/source/sidebar/line/LineWidthPopup.cxx
@@ -37,8 +37,8 @@ LineWidthPopup::LineWidthPopup(LinePropertyPanelBase& rParent)
     , m_bVSFocus(true)
     , m_bCustom(false)
     , m_nCustomWidth(0)
-    , m_aIMGCus(BitmapEx(RID_SVXBMP_WIDTH_CUSTOM))
-    , m_aIMGCusGray(BitmapEx(RID_SVXBMP_WIDTH_CUSTOM_GRAY))
+    , m_aIMGCus(StockImage::Yes, RID_SVXBMP_WIDTH_CUSTOM)
+    , m_aIMGCusGray(StockImage::Yes, RID_SVXBMP_WIDTH_CUSTOM_GRAY)
 {
     get(m_xMFWidth, "spin");
 
diff --git a/svx/source/stbctrls/modctrl.cxx b/svx/source/stbctrls/modctrl.cxx
index 81711ff62232..d057314eda35 100644
--- a/svx/source/stbctrls/modctrl.cxx
+++ b/svx/source/stbctrls/modctrl.cxx
@@ -55,9 +55,9 @@ struct SvxModifyControl::ImplData
     ImplData():
         mnModState(MODIFICATION_STATE_NO)
     {
-        maImages[MODIFICATION_STATE_NO]       = Image(BitmapEx(RID_SVXBMP_DOC_MODIFIED_NO));
-        maImages[MODIFICATION_STATE_YES]      = Image(BitmapEx(RID_SVXBMP_DOC_MODIFIED_YES));
-        maImages[MODIFICATION_STATE_FEEDBACK] = Image(BitmapEx(RID_SVXBMP_DOC_MODIFIED_FEEDBACK));
+        maImages[MODIFICATION_STATE_NO]       = Image(StockImage::Yes, RID_SVXBMP_DOC_MODIFIED_NO);
+        maImages[MODIFICATION_STATE_YES]      = Image(StockImage::Yes, RID_SVXBMP_DOC_MODIFIED_YES);
+        maImages[MODIFICATION_STATE_FEEDBACK] = Image(StockImage::Yes, RID_SVXBMP_DOC_MODIFIED_FEEDBACK);
 
         maIdle.SetPriority(TaskPriority::LOWEST);
         maIdle.SetDebugName("svx::SvxModifyControl maIdle");
diff --git a/svx/source/stbctrls/pszctrl.cxx b/svx/source/stbctrls/pszctrl.cxx
index 143cae23d057..1f91da7bdfa8 100644
--- a/svx/source/stbctrls/pszctrl.cxx
+++ b/svx/source/stbctrls/pszctrl.cxx
@@ -220,8 +220,8 @@ SvxPosSizeStatusBarControl::SvxPosSizeStatusBarControl( sal_uInt16 _nSlotId,
     pImpl->bTable = false;
     pImpl->bHasMenu = false;
     pImpl->nFunctionSet = 0;
-    pImpl->aPosImage = Image(BitmapEx(RID_SVXBMP_POSITION));
-    pImpl->aSizeImage = Image(BitmapEx(RID_SVXBMP_SIZE));
+    pImpl->aPosImage = Image(StockImage::Yes, RID_SVXBMP_POSITION);
+    pImpl->aSizeImage = Image(StockImage::Yes, RID_SVXBMP_SIZE);
 
     addStatusListener( STR_POSITION);         // SID_ATTR_POSITION
     addStatusListener( STR_TABLECELL);   // SID_TABLE_CELL
diff --git a/svx/source/stbctrls/selctrl.cxx b/svx/source/stbctrls/selctrl.cxx
index dfcc0ee9b2fb..12320c61fcc6 100644
--- a/svx/source/stbctrls/selctrl.cxx
+++ b/svx/source/stbctrls/selctrl.cxx
@@ -81,7 +81,7 @@ SvxSelectionModeControl::SvxSelectionModeControl( sal_uInt16 _nSlotId,
                                                   StatusBar& rStb ) :
     SfxStatusBarControl( _nSlotId, _nId, rStb ),
     mnState( 0 ),
-    maImage(BitmapEx(RID_SVXBMP_SELECTION))
+    maImage(StockImage::Yes, RID_SVXBMP_SELECTION)
 {
     GetStatusBar().SetItemText( GetId(), "" );
 }
diff --git a/svx/source/stbctrls/xmlsecctrl.cxx b/svx/source/stbctrls/xmlsecctrl.cxx
index 4784739c7079..1f9ea639444d 100644
--- a/svx/source/stbctrls/xmlsecctrl.cxx
+++ b/svx/source/stbctrls/xmlsecctrl.cxx
@@ -57,9 +57,9 @@ XmlSecStatusBarControl::XmlSecStatusBarControl( sal_uInt16 _nSlotId,  sal_uInt16
 {
     mpImpl->mnState = SignatureState::UNKNOWN;
 
-    mpImpl->maImage             = Image(BitmapEx(RID_SVXBMP_SIGNET));
-    mpImpl->maImageBroken       = Image(BitmapEx(RID_SVXBMP_SIGNET_BROKEN));
-    mpImpl->maImageNotValidated = Image(BitmapEx(RID_SVXBMP_SIGNET_NOTVALIDATED));
+    mpImpl->maImage             = Image(StockImage::Yes, RID_SVXBMP_SIGNET);
+    mpImpl->maImageBroken       = Image(StockImage::Yes, RID_SVXBMP_SIGNET_BROKEN);
+    mpImpl->maImageNotValidated = Image(StockImage::Yes, RID_SVXBMP_SIGNET_NOTVALIDATED);
 }
 
 XmlSecStatusBarControl::~XmlSecStatusBarControl()
diff --git a/svx/source/stbctrls/zoomctrl.cxx b/svx/source/stbctrls/zoomctrl.cxx
index ce763fdc9f2e..dfd8ed6871ea 100644
--- a/svx/source/stbctrls/zoomctrl.cxx
+++ b/svx/source/stbctrls/zoomctrl.cxx
@@ -182,7 +182,7 @@ SFX_IMPL_STATUSBAR_CONTROL(SvxZoomPageStatusBarControl,SfxVoidItem);
 SvxZoomPageStatusBarControl::SvxZoomPageStatusBarControl(sal_uInt16 _nSlotId,
     sal_uInt16 _nId, StatusBar& rStb)
     : SfxStatusBarControl(_nSlotId, _nId, rStb)
-    , maImage(BitmapEx(RID_SVXBMP_ZOOM_PAGE))
+    , maImage(StockImage::Yes, RID_SVXBMP_ZOOM_PAGE)
 {
     GetStatusBar().SetQuickHelpText(GetId(), SvxResId(RID_SVXSTR_FIT_SLIDE));
 }
diff --git a/svx/source/stbctrls/zoomsliderctrl.cxx b/svx/source/stbctrls/zoomsliderctrl.cxx
index 37254da36d50..c05a855e14ec 100644
--- a/svx/source/stbctrls/zoomsliderctrl.cxx
+++ b/svx/source/stbctrls/zoomsliderctrl.cxx
@@ -157,9 +157,9 @@ SvxZoomSliderControl::SvxZoomSliderControl( sal_uInt16 _nSlotId,  sal_uInt16 _nI
     SfxStatusBarControl( _nSlotId, _nId, rStatusBar ),
     mxImpl( new SvxZoomSliderControl_Impl )
 {
-    mxImpl->maSliderButton   = Image(BitmapEx(RID_SVXBMP_SLIDERBUTTON));
-    mxImpl->maIncreaseButton = Image(BitmapEx(RID_SVXBMP_SLIDERINCREASE));
-    mxImpl->maDecreaseButton = Image(BitmapEx(RID_SVXBMP_SLIDERDECREASE));
+    mxImpl->maSliderButton   = Image(StockImage::Yes, RID_SVXBMP_SLIDERBUTTON);
+    mxImpl->maIncreaseButton = Image(StockImage::Yes, RID_SVXBMP_SLIDERINCREASE);
+    mxImpl->maDecreaseButton = Image(StockImage::Yes, RID_SVXBMP_SLIDERDECREASE);
 }
 
 SvxZoomSliderControl::~SvxZoomSliderControl()
diff --git a/svx/source/tbxctrls/extrusioncontrols.cxx b/svx/source/tbxctrls/extrusioncontrols.cxx
index 8ee22d3bec00..369c54133fc8 100644
--- a/svx/source/tbxctrls/extrusioncontrols.cxx
+++ b/svx/source/tbxctrls/extrusioncontrols.cxx
@@ -126,12 +126,12 @@ ExtrusionDirectionWindow::ExtrusionDirectionWindow(
 )
     : ToolbarMenu(rController.getFrameInterface(), pParentWindow, WB_STDPOPUP)
     , mrController(rController)
-    , maImgPerspective(BitmapEx(RID_SVXBMP_PERSPECTIVE))
-    , maImgParallel(BitmapEx(RID_SVXBMP_PARALLEL))
+    , maImgPerspective(StockImage::Yes, RID_SVXBMP_PERSPECTIVE)
+    , maImgParallel(StockImage::Yes, RID_SVXBMP_PARALLEL)
 {
     for (sal_uInt16 i = DIRECTION_NW; i <= DIRECTION_SE; ++i)
     {
-        maImgDirection[i] = Image(BitmapEx(aDirectionBmps[i]));
+        maImgDirection[i] = Image(StockImage::Yes, aDirectionBmps[i]);
     }
 
     SetSelectHdl( LINK( this, ExtrusionDirectionWindow, SelectToolbarMenuHdl ) );
@@ -373,12 +373,12 @@ ExtrusionDepthWindow::ExtrusionDepthWindow(
 {
     SetSelectHdl( LINK( this, ExtrusionDepthWindow, SelectHdl ) );
 
-    Image aImgDepth0(BitmapEx(RID_SVXBMP_DEPTH_0));
-    Image aImgDepth1(BitmapEx(RID_SVXBMP_DEPTH_1));
-    Image aImgDepth2(BitmapEx(RID_SVXBMP_DEPTH_2));
-    Image aImgDepth3(BitmapEx(RID_SVXBMP_DEPTH_3));
-    Image aImgDepth4(BitmapEx(RID_SVXBMP_DEPTH_4));
-    Image aImgDepthInfinity(BitmapEx(RID_SVXBMP_DEPTH_INFINITY));
+    Image aImgDepth0(StockImage::Yes, RID_SVXBMP_DEPTH_0);
+    Image aImgDepth1(StockImage::Yes, RID_SVXBMP_DEPTH_1);
+    Image aImgDepth2(StockImage::Yes, RID_SVXBMP_DEPTH_2);
+    Image aImgDepth3(StockImage::Yes, RID_SVXBMP_DEPTH_3);
+    Image aImgDepth4(StockImage::Yes, RID_SVXBMP_DEPTH_4);
+    Image aImgDepthInfinity(StockImage::Yes, RID_SVXBMP_DEPTH_INFINITY);
 
     appendEntry(0, "", aImgDepth0);
     appendEntry(1, "", aImgDepth1);
@@ -585,9 +585,9 @@ ExtrusionLightingWindow::ExtrusionLightingWindow(svt::ToolboxController& rContro
                                                  vcl::Window* pParentWindow)
     : ToolbarMenu(rController.getFrameInterface(), pParentWindow, WB_STDPOPUP)
     , mrController(rController)
-    , maImgBright(BitmapEx(RID_SVXBMP_LIGHTING_BRIGHT))
-    , maImgNormal(BitmapEx(RID_SVXBMP_LIGHTING_NORMAL))
-    , maImgDim(BitmapEx(RID_SVXBMP_LIGHTING_DIM))
+    , maImgBright(StockImage::Yes, RID_SVXBMP_LIGHTING_BRIGHT)
+    , maImgNormal(StockImage::Yes, RID_SVXBMP_LIGHTING_NORMAL)
+    , maImgDim(StockImage::Yes, RID_SVXBMP_LIGHTING_DIM)
     , mnDirection(FROM_FRONT)
     , mbDirectionEnabled(false)
 {
@@ -595,10 +595,10 @@ ExtrusionLightingWindow::ExtrusionLightingWindow(svt::ToolboxController& rContro
     {
         if( i != FROM_FRONT )
         {
-            maImgLightingOff[i] = Image(BitmapEx(aLightOffBmps[i]));
-            maImgLightingOn[i] = Image(BitmapEx(aLightOnBmps[i]));
+            maImgLightingOff[i] = Image(StockImage::Yes, aLightOffBmps[i]);
+            maImgLightingOn[i] = Image(StockImage::Yes, aLightOnBmps[i]);
         }
-        maImgLightingPreview[i] = Image(BitmapEx(aLightPreviewBmps[i]));
+        maImgLightingPreview[i] = Image(StockImage::Yes, aLightPreviewBmps[i]);
     }
 
     SetSelectHdl( LINK( this, ExtrusionLightingWindow, SelectToolbarMenuHdl ) );
@@ -839,10 +839,10 @@ ExtrusionSurfaceWindow::ExtrusionSurfaceWindow(
 {
     SetSelectHdl( LINK( this, ExtrusionSurfaceWindow, SelectHdl ) );
 
-    Image aImgSurface1(BitmapEx(RID_SVXBMP_WIRE_FRAME));
-    Image aImgSurface2(BitmapEx(RID_SVXBMP_MATTE));
-    Image aImgSurface3(BitmapEx(RID_SVXBMP_PLASTIC));
-    Image aImgSurface4(BitmapEx(RID_SVXBMP_METAL));
+    Image aImgSurface1(StockImage::Yes, RID_SVXBMP_WIRE_FRAME);
+    Image aImgSurface2(StockImage::Yes, RID_SVXBMP_MATTE);
+    Image aImgSurface3(StockImage::Yes, RID_SVXBMP_PLASTIC);
+    Image aImgSurface4(StockImage::Yes, RID_SVXBMP_METAL);
 
     appendEntry(0, SvxResId(RID_SVXSTR_WIREFRAME), aImgSurface1);
     appendEntry(1, SvxResId(RID_SVXSTR_MATTE), aImgSurface2);
diff --git a/svx/source/tbxctrls/fontworkgallery.cxx b/svx/source/tbxctrls/fontworkgallery.cxx
index 9a910fa3d875..3b88ab1d78c7 100644
--- a/svx/source/tbxctrls/fontworkgallery.cxx
+++ b/svx/source/tbxctrls/fontworkgallery.cxx
@@ -285,11 +285,11 @@ FontworkAlignmentWindow::FontworkAlignmentWindow(svt::ToolboxController& rContro
 {
     SetSelectHdl( LINK( this, FontworkAlignmentWindow, SelectHdl ) );
 
-    Image aImgAlgin1(BitmapEx(RID_SVXBMP_FONTWORK_ALIGN_LEFT));
-    Image aImgAlgin2(BitmapEx(RID_SVXBMP_FONTWORK_ALIGN_CENTER));
-    Image aImgAlgin3(BitmapEx(RID_SVXBMP_FONTWORK_ALIGN_RIGHT));
-    Image aImgAlgin4(BitmapEx(RID_SVXBMP_FONTWORK_ALIGN_WORD));
-    Image aImgAlgin5(BitmapEx(RID_SVXBMP_FONTWORK_ALIGN_STRETCH));
+    Image aImgAlgin1(StockImage::Yes, RID_SVXBMP_FONTWORK_ALIGN_LEFT);
+    Image aImgAlgin2(StockImage::Yes, RID_SVXBMP_FONTWORK_ALIGN_CENTER);
+    Image aImgAlgin3(StockImage::Yes, RID_SVXBMP_FONTWORK_ALIGN_RIGHT);
+    Image aImgAlgin4(StockImage::Yes, RID_SVXBMP_FONTWORK_ALIGN_WORD);
+    Image aImgAlgin5(StockImage::Yes, RID_SVXBMP_FONTWORK_ALIGN_STRETCH);
 
     appendEntry(0, SvxResId(RID_SVXSTR_ALIGN_LEFT), aImgAlgin1);
     appendEntry(1, SvxResId(RID_SVXSTR_ALIGN_CENTER), aImgAlgin2);