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.

Change-Id: I3224e11937d720fa484b0d659d25673a9e809267
Reviewed-on: https://gerrit.libreoffice.org/64760
Tested-by: Jenkins
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>

1 files changed, 23 insertions, 23 deletions

diff --git a/svx/source/form/fmexpl.cxx b/svx/source/form/fmexpl.cxx
index 76e4b853ef6c..6eb21dbe0e95 100644
--- a/svx/source/form/fmexpl.cxx
+++ b/svx/source/form/fmexpl.cxx
@@ -326,7 +326,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())
@@ -338,91 +338,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;
     }