svx: load BitmapEx resources instead of Image ones

Change-Id: Id23523170f757361f3fc3d8a18b6db827f45d109

27 files changed, 318 insertions, 330 deletions

diff --git a/svx/source/dialog/docrecovery.cxx b/svx/source/dialog/docrecovery.cxx
index 032c15ff90f9..f257c3c1bf82 100644
--- a/svx/source/dialog/docrecovery.cxx
+++ b/svx/source/dialog/docrecovery.cxx
@@ -814,9 +814,9 @@ void RecovDocListEntry::Paint(const Point& aPos, SvTreeListBox& aDevice, vcl::Re
 
 RecovDocList::RecovDocList(SvSimpleTableContainer& rParent, ResMgr &rResMgr)
     : SvSimpleTable      ( rParent )
-    , m_aGreenCheckImg    ( ResId(RID_SVXIMG_GREENCHECK, rResMgr ) )
-    , m_aYellowCheckImg   ( ResId(RID_SVXIMG_YELLOWCHECK, rResMgr ) )
-    , m_aRedCrossImg      ( ResId(RID_SVXIMG_REDCROSS, rResMgr ) )
+    , m_aGreenCheckImg    (BitmapEx(ResId(RID_SVXBMP_GREENCHECK, rResMgr)))
+    , m_aYellowCheckImg   (BitmapEx(ResId(RID_SVXBMP_YELLOWCHECK, rResMgr)))
+    , m_aRedCrossImg      (BitmapEx(ResId(RID_SVXBMP_REDCROSS, rResMgr)))
     , m_aSuccessRecovStr  ( ResId(RID_SVXSTR_SUCCESSRECOV, rResMgr ) )
     , m_aOrigDocRecovStr  ( ResId(RID_SVXSTR_ORIGDOCRECOV, rResMgr ) )
     , m_aRecovFailedStr   ( ResId(RID_SVXSTR_RECOVFAILED, rResMgr ) )
diff --git a/svx/source/dialog/fontwork.cxx b/svx/source/dialog/fontwork.cxx
index b668941322a1..86b37f0e925c 100644
--- a/svx/source/dialog/fontwork.cxx
+++ b/svx/source/dialog/fontwork.cxx
@@ -803,13 +803,13 @@ void SvxFontWorkDialog::ApplyImageList()
 {
     if (nLastShadowTbxId == nShadowSlantId)
     {
-        m_pFbShadowX->SetImage(Image(SVX_RES(RID_SVXIMG_SHADOW_ANGLE)));
-        m_pFbShadowY->SetImage(Image(SVX_RES(RID_SVXIMG_SHADOW_SIZE)));
+        m_pFbShadowX->SetImage(Image(BitmapEx(SVX_RES(RID_SVXBMP_SHADOW_ANGLE))));
+        m_pFbShadowY->SetImage(Image(BitmapEx(SVX_RES(RID_SVXBMP_SHADOW_SIZE))));
     }
     else
     {
-        m_pFbShadowX->SetImage(Image(SVX_RES(RID_SVXIMG_SHADOW_XDIST)));
-        m_pFbShadowY->SetImage(Image(SVX_RES(RID_SVXIMG_SHADOW_YDIST)));
+        m_pFbShadowX->SetImage(Image(BitmapEx(SVX_RES(RID_SVXBMP_SHADOW_XDIST))));
+        m_pFbShadowY->SetImage(Image(BitmapEx(SVX_RES(RID_SVXBMP_SHADOW_YDIST))));
     }
 }
 
diff --git a/svx/source/dialog/langbox.cxx b/svx/source/dialog/langbox.cxx
index 47340894e2a4..60e5278c8277 100644
--- a/svx/source/dialog/langbox.cxx
+++ b/svx/source/dialog/langbox.cxx
@@ -140,8 +140,8 @@ SvxLanguageBoxBase::SvxLanguageBoxBase()
 
 void SvxLanguageBoxBase::ImplLanguageBoxBaseInit()
 {
-    m_aNotCheckedImage = Image( SVX_RES( RID_SVXIMG_NOTCHECKED ) );
-    m_aCheckedImage = Image( SVX_RES( RID_SVXIMG_CHECKED ) );
+    m_aNotCheckedImage = Image(BitmapEx(SVX_RES(RID_SVXBMP_NOTCHECKED)));
+    m_aCheckedImage = Image(BitmapEx(SVX_RES(RID_SVXBMP_CHECKED)));
     m_aAllString            = SVX_RESSTR( RID_SVXSTR_LANGUAGE_ALL );
     m_nLangList             = SvxLanguageListFlags::EMPTY;
     m_bHasLangNone          = false;
diff --git a/svx/source/dialog/langbox.src b/svx/source/dialog/langbox.src
index 996018748be6..133dc1f557d2 100644
--- a/svx/source/dialog/langbox.src
+++ b/svx/source/dialog/langbox.src
@@ -19,14 +19,14 @@
 
 #include <svx/dialogs.hrc>
 
-Image RID_SVXIMG_NOTCHECKED
+Bitmap RID_SVXBMP_NOTCHECKED
 {
-    ImageBitmap = Bitmap { File = "notcheck.png" ; } ;
+    File = "notcheck.png";
 };
 
-Image RID_SVXIMG_CHECKED
+Bitmap RID_SVXBMP_CHECKED
 {
-    ImageBitmap = Bitmap { File = "lngcheck.png" ; } ;
+    File = "lngcheck.png";
 };
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/dialog/sdstring.src b/svx/source/dialog/sdstring.src
index 3bf08a9ec01b..79fc0f1ee81a 100644
--- a/svx/source/dialog/sdstring.src
+++ b/svx/source/dialog/sdstring.src
@@ -2295,39 +2295,39 @@ String RID_SVXSTR_VIEW
     Text [ en-US ] = "List" ;
 };
 
-Image RID_SVXIMG_GREENCHECK
+Bitmap RID_SVXBMP_GREENCHECK
 {
-    ImageBitmap = Bitmap { File = "nu01.png"; };
+    File = "nu01.png";
 };
 
-Image RID_SVXIMG_YELLOWCHECK
+Bitmap RID_SVXBMP_YELLOWCHECK
 {
-    ImageBitmap = Bitmap { File = "nu04.png"; };
+    File = "nu04.png";
 };
 
-Image RID_SVXIMG_REDCROSS
+Bitmap RID_SVXBMP_REDCROSS
 {
-    ImageBitmap = Bitmap { File = "nu02.png"; };
+    File = "nu02.png";
 };
 
-Image  RID_SVXIMG_SHADOW_ANGLE
+Bitmap RID_SVXBMP_SHADOW_ANGLE
 {
-    ImageBitmap = Bitmap { File = "fw018.png"; };
+    File = "fw018.png";
 };
 
-Image  RID_SVXIMG_SHADOW_SIZE
+Bitmap RID_SVXBMP_SHADOW_SIZE
 {
-    ImageBitmap = Bitmap { File = "fw019.png"; };
+    File = "fw019.png";
 };
 
-Image  RID_SVXIMG_SHADOW_XDIST
+Bitmap RID_SVXBMP_SHADOW_XDIST
 {
-    ImageBitmap = Bitmap { File = "fw016.png"; };
+    File = "fw016.png";
 };
 
-Image  RID_SVXIMG_SHADOW_YDIST
+Bitmap RID_SVXBMP_SHADOW_YDIST
 {
-    ImageBitmap = Bitmap { File = "fw017.png"; };
+    File = "fw017.png";
 };
 
 String RID_SVXSTR_SUCCESSRECOV
diff --git a/svx/source/engine3d/float3d.cxx b/svx/source/engine3d/float3d.cxx
index 80d065df7a22..b20b711f5a9f 100644
--- a/svx/source/engine3d/float3d.cxx
+++ b/svx/source/engine3d/float3d.cxx
@@ -87,8 +87,8 @@ namespace {
 Svx3DWin::Svx3DWin(SfxBindings* pInBindings, SfxChildWindow *pCW, vcl::Window* pParent)
     : SfxDockingWindow (pInBindings, pCW, pParent,
         "Docking3DEffects", "svx/ui/docking3deffects.ui")
-    , aImgLightOn(SVX_RES(RID_SVXIMAGE_LIGHT_ON))
-    , aImgLightOff(SVX_RES(RID_SVXIMAGE_LIGHT_OFF))
+    , aImgLightOn(BitmapEx(SVX_RES(RID_SVXBMP_LAMP_ON)))
+    , aImgLightOff(BitmapEx(SVX_RES(RID_SVXBMP_LAMP_OFF)))
     , bUpdate(false)
     , eViewType(ViewType3D::Geo)
     , pModel(nullptr)
diff --git a/svx/source/engine3d/float3d.src b/svx/source/engine3d/float3d.src
index 43a48855ae25..e58ad58e7acb 100644
--- a/svx/source/engine3d/float3d.src
+++ b/svx/source/engine3d/float3d.src
@@ -21,19 +21,19 @@
 #include "float3d.hrc"
 #include <svx/svxcommands.h>
 
-Image RID_SVXIMAGE_LIGHT_ON
+Bitmap RID_SVXBMP_LAMP_ON
 {
-    ImageBitmap = Bitmap { File = "lighton.png" ; };
+    File = "lighton.png";
 };
 
-Image RID_SVXIMAGE_LIGHT_OFF
+Bitmap RID_SVXBMP_LAMP_OFF
 {
-    ImageBitmap = Bitmap { File = "light.bmp" ; };
+    File = "light.bmp";
 };
 
-Image RID_SVXIMAGE_COLORDLG
+Bitmap RID_SVXBMP_COLORDLG
 {
-    ImageBitmap = Bitmap { File = "colordlg.bmp" ; };
+    File = "colordlg.bmp";
 };
 
 String RID_SVXFLOAT3D_FAVORITE
diff --git a/svx/source/sidebar/area/AreaPropertyPanel.src b/svx/source/sidebar/area/AreaPropertyPanel.src
index 5e9d13436b10..2b066f5165ff 100644
--- a/svx/source/sidebar/area/AreaPropertyPanel.src
+++ b/svx/source/sidebar/area/AreaPropertyPanel.src
@@ -20,29 +20,34 @@
 #include <svx/dialogs.hrc>
 #include "helpid.hrc"
 
-Image IMG_AXIAL
+Bitmap BMP_AXIAL
 {
-    ImageBitmap = Bitmap{File = "symphony/axial.png";};
+    File = "symphony/axial.png";
 };
-Image IMG_ELLI
+
+Bitmap BMP_ELLI
 {
-    ImageBitmap = Bitmap{File = "symphony/ellipsoid.png";};
+    File = "symphony/ellipsoid.png";
 };
-Image IMG_QUAD
+
+Bitmap BMP_QUAD
 {
-    ImageBitmap = Bitmap{File = "symphony/Quadratic.png";};
+    File = "symphony/Quadratic.png";
 };
-Image IMG_RADIAL
+
+Bitmap BMP_RADIAL
 {
-    ImageBitmap = Bitmap{File = "symphony/radial.png";};
+    File = "symphony/radial.png";
 };
-Image IMG_SQUARE
+
+Bitmap BMP_SQUARE
 {
-    ImageBitmap = Bitmap{File = "symphony/Square.png";};
+    File = "symphony/Square.png";
 };
-Image IMG_LINEAR
+
+Bitmap BMP_LINEAR
 {
-    ImageBitmap = Bitmap{File = "symphony/linear.png";};
+    File = "symphony/linear.png";
 };
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/sidebar/area/AreaPropertyPanelBase.cxx b/svx/source/sidebar/area/AreaPropertyPanelBase.cxx
index 318b95b20e23..dde9b0acc12c 100644
--- a/svx/source/sidebar/area/AreaPropertyPanelBase.cxx
+++ b/svx/source/sidebar/area/AreaPropertyPanelBase.cxx
@@ -85,12 +85,12 @@ AreaPropertyPanelBase::AreaPropertyPanelBase(
       mpFillGradientItem(),
       mpHatchItem(),
       mpBitmapItem(),
-      maImgAxial(SVX_RES(IMG_AXIAL)),
-      maImgElli(SVX_RES(IMG_ELLI)),
-      maImgQuad(SVX_RES(IMG_QUAD)),
-      maImgRadial(SVX_RES(IMG_RADIAL)),
-      maImgSquare(SVX_RES(IMG_SQUARE)),
-      maImgLinear(SVX_RES(IMG_LINEAR)),
+      maImgAxial(BitmapEx(SVX_RES(BMP_AXIAL))),
+      maImgElli(BitmapEx(SVX_RES(BMP_ELLI))),
+      maImgQuad(BitmapEx(SVX_RES(BMP_QUAD))),
+      maImgRadial(BitmapEx(SVX_RES(BMP_RADIAL))),
+      maImgSquare(BitmapEx(SVX_RES(BMP_SQUARE))),
+      maImgLinear(BitmapEx(SVX_RES(BMP_LINEAR))),
       mpFloatTransparenceItem(),
       mpTransparanceItem()
 {
diff --git a/svx/source/sidebar/line/LinePropertyPanel.src b/svx/source/sidebar/line/LinePropertyPanel.src
index ec3665a8cc33..2860e706ad6d 100644
--- a/svx/source/sidebar/line/LinePropertyPanel.src
+++ b/svx/source/sidebar/line/LinePropertyPanel.src
@@ -20,50 +20,59 @@
 #include <svx/dialogs.hrc>
 #include "helpid.hrc"
 
-Image IMG_NONE_ICON
+Bitmap BMP_NONE_ICON
 {
-    ImageBitmap = Bitmap{File = "symphony/blank.png";};
+    File = "symphony/blank.png";
 };
 
-Image IMG_WIDTH1_ICON
+Bitmap BMP_WIDTH1_ICON
 {
-    ImageBitmap = Bitmap{File = "symphony/width1.png";};
+    File = "symphony/width1.png";
 };
-Image IMG_WIDTH2_ICON
+
+Bitmap BMP_WIDTH2_ICON
 {
-    ImageBitmap = Bitmap{File = "symphony/width2.png";};
+    File = "symphony/width2.png";
 };
-Image IMG_WIDTH3_ICON
+
+Bitmap BMP_WIDTH3_ICON
 {
-    ImageBitmap = Bitmap{File = "symphony/width3.png";};
+    File = "symphony/width3.png";
 };
-Image IMG_WIDTH4_ICON
+
+Bitmap BMP_WIDTH4_ICON
 {
-    ImageBitmap = Bitmap{File = "symphony/width4.png";};
+    File = "symphony/width4.png";
 };
-Image IMG_WIDTH5_ICON
+
+Bitmap BMP_WIDTH5_ICON
 {
-    ImageBitmap = Bitmap{File = "symphony/width5.png";};
+    File = "symphony/width5.png";
 };
-Image IMG_WIDTH6_ICON
+
+Bitmap BMP_WIDTH6_ICON
 {
-    ImageBitmap = Bitmap{File = "symphony/width6.png";};
+    File = "symphony/width6.png";
 };
-Image IMG_WIDTH7_ICON
+
+Bitmap BMP_WIDTH7_ICON
 {
-    ImageBitmap = Bitmap{File = "symphony/width7.png";};
+    File = "symphony/width7.png";
 };
-Image IMG_WIDTH8_ICON
+
+Bitmap BMP_WIDTH8_ICON
 {
-    ImageBitmap = Bitmap{File = "symphony/width8.png";};
+    File = "symphony/width8.png";
 };
-Image RID_SVXIMG_WIDTH_CUSTOM
+
+Bitmap RID_SVXBMP_WIDTH_CUSTOM
 {
-    ImageBitmap = Bitmap{File = "symphony/last_custom_common.png";};
+    File = "symphony/last_custom_common.png";
 };
-Image RID_SVXIMG_WIDTH_CUSTOM_GRAY
+
+Bitmap RID_SVXBMP_WIDTH_CUSTOM_GRAY
 {
-    ImageBitmap = Bitmap{File = "symphony/last_custom_common_grey.png";};
+    File = "symphony/last_custom_common_grey.png";
 };
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/sidebar/line/LinePropertyPanelBase.cxx b/svx/source/sidebar/line/LinePropertyPanelBase.cxx
index 14de0a6f9a1f..89e105b21689 100644
--- a/svx/source/sidebar/line/LinePropertyPanelBase.cxx
+++ b/svx/source/sidebar/line/LinePropertyPanelBase.cxx
@@ -169,7 +169,7 @@ LinePropertyPanelBase::LinePropertyPanelBase(
     mpStartItem(),
     mpEndItem(),
     mxLineWidthPopup(VclPtr<LineWidthPopup>::Create(*this)),
-    maIMGNone(SVX_RES(IMG_NONE_ICON)),
+    maIMGNone(BitmapEx(SVX_RES(BMP_NONE_ICON))),
     mpIMGWidthIcon(),
     mbWidthValuable(true),
     mbArrowSupported(true)
@@ -221,14 +221,14 @@ void LinePropertyPanelBase::dispose()
 void LinePropertyPanelBase::Initialize()
 {
     mpIMGWidthIcon.reset(new Image[8]);
-    mpIMGWidthIcon[0] = Image(SVX_RES(IMG_WIDTH1_ICON));
-    mpIMGWidthIcon[1] = Image(SVX_RES(IMG_WIDTH2_ICON));
-    mpIMGWidthIcon[2] = Image(SVX_RES(IMG_WIDTH3_ICON));
-    mpIMGWidthIcon[3] = Image(SVX_RES(IMG_WIDTH4_ICON));
-    mpIMGWidthIcon[4] = Image(SVX_RES(IMG_WIDTH5_ICON));
-    mpIMGWidthIcon[5] = Image(SVX_RES(IMG_WIDTH6_ICON));
-    mpIMGWidthIcon[6] = Image(SVX_RES(IMG_WIDTH7_ICON));
-    mpIMGWidthIcon[7] = Image(SVX_RES(IMG_WIDTH8_ICON));
+    mpIMGWidthIcon[0] = Image(BitmapEx(SVX_RES(BMP_WIDTH1_ICON)));
+    mpIMGWidthIcon[1] = Image(BitmapEx(SVX_RES(BMP_WIDTH2_ICON)));
+    mpIMGWidthIcon[2] = Image(BitmapEx(SVX_RES(BMP_WIDTH3_ICON)));
+    mpIMGWidthIcon[3] = Image(BitmapEx(SVX_RES(BMP_WIDTH4_ICON)));
+    mpIMGWidthIcon[4] = Image(BitmapEx(SVX_RES(BMP_WIDTH5_ICON)));
+    mpIMGWidthIcon[5] = Image(BitmapEx(SVX_RES(BMP_WIDTH6_ICON)));
+    mpIMGWidthIcon[6] = Image(BitmapEx(SVX_RES(BMP_WIDTH7_ICON)));
+    mpIMGWidthIcon[7] = Image(BitmapEx(SVX_RES(BMP_WIDTH8_ICON)));
 
     FillLineStyleList();
     SelectLineStyle();
diff --git a/svx/source/sidebar/line/LineWidthPopup.cxx b/svx/source/sidebar/line/LineWidthPopup.cxx
index 52f60d0b67bc..e89b2d707eef 100644
--- a/svx/source/sidebar/line/LineWidthPopup.cxx
+++ b/svx/source/sidebar/line/LineWidthPopup.cxx
@@ -38,8 +38,8 @@ LineWidthPopup::LineWidthPopup(LinePropertyPanelBase& rParent)
     , m_bCloseByEdit(false)
     , m_nCustomWidth(0)
     , m_nTmpCustomWidth(0)
-    , m_aIMGCus(SVX_RES(RID_SVXIMG_WIDTH_CUSTOM))
-    , m_aIMGCusGray(SVX_RES(RID_SVXIMG_WIDTH_CUSTOM_GRAY))
+    , m_aIMGCus(BitmapEx(SVX_RES(RID_SVXBMP_WIDTH_CUSTOM)))
+    , m_aIMGCusGray(BitmapEx(SVX_RES(RID_SVXBMP_WIDTH_CUSTOM_GRAY)))
 {
     get(m_xMFWidth, "spin");
 
diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
index 3ece38aa122a..742f256ebdde 100644
--- a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
+++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
@@ -545,7 +545,7 @@ ParaPropertyPanel::ParaPropertyPanel(vcl::Window* pParent,
     const css::uno::Reference<css::ui::XSidebar>& rxSidebar)
     : PanelLayout(pParent, "ParaPropertyPanel", "svx/ui/sidebarparagraph.ui", rxFrame),
 
-      maIndHang (SVX_RES(IMG_INDENT_HANG)),
+      maIndHang(BitmapEx(SVX_RES(BMP_INDENT_HANG))),
       maTxtLeft (0),
       maUpper (0),
       maLower (0),
diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.src b/svx/source/sidebar/paragraph/ParaPropertyPanel.src
index 073e12043c34..65558ecd2d32 100644
--- a/svx/source/sidebar/paragraph/ParaPropertyPanel.src
+++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.src
@@ -20,13 +20,14 @@
 #include "helpid.hrc"
 #include <svx/dialogs.hrc>
 
-Image IMG_SPACE3
+Bitmap BMP_SPACE3
 {
-    ImageBitmap = Bitmap{File = "symphony/spacing3.png";};
+    File = "symphony/spacing3.png";
 };
-Image IMG_INDENT_HANG
+
+Bitmap BMP_INDENT_HANG
 {
-    ImageBitmap = Bitmap{File = "symphony/Indent_Hanging.png";};
+    File = "symphony/Indent_Hanging.png";
 };
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/stbctrls/modctrl.cxx b/svx/source/stbctrls/modctrl.cxx
index 50abd3d36e22..ccdf094082db 100644
--- a/svx/source/stbctrls/modctrl.cxx
+++ b/svx/source/stbctrls/modctrl.cxx
@@ -54,9 +54,9 @@ struct SvxModifyControl::ImplData
     ImplData():
         mnModState(MODIFICATION_STATE_NO)
     {
-        maImages[MODIFICATION_STATE_NO]       = Image(SVX_RES(RID_SVXBMP_DOC_MODIFIED_NO));
-        maImages[MODIFICATION_STATE_YES]      = Image(SVX_RES(RID_SVXBMP_DOC_MODIFIED_YES));
-        maImages[MODIFICATION_STATE_FEEDBACK] = Image(SVX_RES(RID_SVXBMP_DOC_MODIFIED_FEEDBACK));
+        maImages[MODIFICATION_STATE_NO]       = Image(BitmapEx(SVX_RES(RID_SVXBMP_DOC_MODIFIED_NO)));
+        maImages[MODIFICATION_STATE_YES]      = Image(BitmapEx(SVX_RES(RID_SVXBMP_DOC_MODIFIED_YES)));
+        maImages[MODIFICATION_STATE_FEEDBACK] = Image(BitmapEx(SVX_RES(RID_SVXBMP_DOC_MODIFIED_FEEDBACK)));
 
         maIdle.SetPriority(TaskPriority::LOWEST);
     }
diff --git a/svx/source/stbctrls/pszctrl.cxx b/svx/source/stbctrls/pszctrl.cxx
index 90e15949925e..4fafe04060e4 100644
--- a/svx/source/stbctrls/pszctrl.cxx
+++ b/svx/source/stbctrls/pszctrl.cxx
@@ -174,15 +174,14 @@ SvxPosSizeStatusBarControl::SvxPosSizeStatusBarControl( sal_uInt16 _nSlotId,
     pImpl->bTable = false;
     pImpl->bHasMenu = false;
     pImpl->nFunctionSet = 0;
-    pImpl->aPosImage = Image( ResId( RID_SVXBMP_POSITION, DIALOG_MGR() ) );
-    pImpl->aSizeImage = Image( ResId( RID_SVXBMP_SIZE, DIALOG_MGR() ) );
+    pImpl->aPosImage = Image(BitmapEx(ResId(RID_SVXBMP_POSITION, DIALOG_MGR())));
+    pImpl->aSizeImage = Image(BitmapEx(ResId(RID_SVXBMP_SIZE, DIALOG_MGR())));
 
     addStatusListener( STR_POSITION);         // SID_ATTR_POSITION
     addStatusListener( STR_TABLECELL);   // SID_TABLE_CELL
     addStatusListener( STR_FUNC);    // SID_PSZ_FUNCTION
 }
 
-
 /*  [Description]
 
     Dtor():
diff --git a/svx/source/stbctrls/selctrl.cxx b/svx/source/stbctrls/selctrl.cxx
index 8cf5f5c0031b..c6ef39f929b8 100644
--- a/svx/source/stbctrls/selctrl.cxx
+++ b/svx/source/stbctrls/selctrl.cxx
@@ -75,12 +75,11 @@ SvxSelectionModeControl::SvxSelectionModeControl( sal_uInt16 _nSlotId,
                                                   StatusBar& rStb ) :
     SfxStatusBarControl( _nSlotId, _nId, rStb ),
     mnState( 0 ),
-    maImage( SVX_RES( RID_SVXBMP_SELECTION ) )
+    maImage(BitmapEx(SVX_RES(RID_SVXBMP_SELECTION)))
 {
     GetStatusBar().SetItemText( GetId(), "" );
 }
 
-
 void SvxSelectionModeControl::StateChanged( sal_uInt16, SfxItemState eState,
                                             const SfxPoolItem* pState )
 {
diff --git a/svx/source/stbctrls/stbctrls.src b/svx/source/stbctrls/stbctrls.src
index 259bc8ee1af1..83618a44226d 100644
--- a/svx/source/stbctrls/stbctrls.src
+++ b/svx/source/stbctrls/stbctrls.src
@@ -68,12 +68,9 @@ Menu RID_SVXMENU_SELECTION
     };
 };
 
-Image RID_SVXBMP_SELECTION
+Bitmap RID_SVXBMP_SELECTION
 {
-    ImageBitmap = Bitmap
-    {
-        File = "selection_10x22.png" ;
-    };
+    File = "selection_10x22.png" ;
 };
 
 String RID_SVXSTR_XMLSEC_SIG_OK
@@ -309,92 +306,64 @@ Menu RID_SVXMNU_XMLSECSTATBAR
     };
 };
 
-// Images ----------------------------------------------------------------
-
-Image RID_SVXBMP_POSITION
+Bitmap RID_SVXBMP_POSITION
 {
-    ImageBitmap = Bitmap
-    {
-        File = "sc10223.png" ;
-    };
+    File = "sc10223.png" ;
 };
-Image RID_SVXBMP_SIZE
+
+Bitmap RID_SVXBMP_SIZE
 {
-    ImageBitmap = Bitmap
-    {
-        File = "sc10224.png" ;
-    };
+    File = "sc10224.png" ;
 };
-Image RID_SVXBMP_SIGNET
+
+Bitmap RID_SVXBMP_SIGNET
 {
-    ImageBitmap = Bitmap
-    {
-        File = "signet_11x16.png" ;
-    };
+    File = "signet_11x16.png" ;
 };
-Image RID_SVXBMP_SIGNET_BROKEN
+
+Bitmap RID_SVXBMP_SIGNET_BROKEN
 {
-    ImageBitmap = Bitmap
-    {
-        File = "caution_11x16.png" ;
-    };
+    File = "caution_11x16.png" ;
 };
-Image RID_SVXBMP_SIGNET_NOTVALIDATED
+
+Bitmap RID_SVXBMP_SIGNET_NOTVALIDATED
 {
-    ImageBitmap = Bitmap
-    {
-        File = "notcertificate_16.png" ;
-    };
+    File = "notcertificate_16.png" ;
 };
 
-Image RID_SVXBMP_SLIDERBUTTON
+Bitmap RID_SVXBMP_SLIDERBUTTON
 {
-    ImageBitmap = Bitmap
-    {
-        File = "slidezoombutton_10.png" ;
-    };
+    File = "slidezoombutton_10.png" ;
 };
-Image RID_SVXBMP_SLIDERDECREASE
+
+Bitmap RID_SVXBMP_SLIDERDECREASE
 {
-    ImageBitmap = Bitmap
-    {
-        File = "slidezoomout_10.png" ;
-    };
+    File = "slidezoomout_10.png" ;
 };
-Image RID_SVXBMP_SLIDERINCREASE
+
+Bitmap RID_SVXBMP_SLIDERINCREASE
 {
-    ImageBitmap = Bitmap
-    {
-        File = "slidezoomin_10.png" ;
-    };
+    File = "slidezoomin_10.png" ;
 };
-Image RID_SVXBMP_DOC_MODIFIED_YES
+
+Bitmap RID_SVXBMP_DOC_MODIFIED_YES
 {
-    ImageBitmap = Bitmap
-    {
-        File = "doc_modified_yes_14.png" ;
-    };
+    File = "doc_modified_yes_14.png" ;
 };
-Image RID_SVXBMP_DOC_MODIFIED_NO
+
+Bitmap RID_SVXBMP_DOC_MODIFIED_NO
 {
-    ImageBitmap = Bitmap
-    {
-        File = "doc_modified_no_14.png" ;
-    };
+    File = "doc_modified_no_14.png" ;
 };
-Image RID_SVXBMP_DOC_MODIFIED_FEEDBACK
+
+Bitmap RID_SVXBMP_DOC_MODIFIED_FEEDBACK
 {
-    ImageBitmap = Bitmap
-    {
-        File = "doc_modified_feedback.png" ;
-    };
+    File = "doc_modified_feedback.png" ;
 };
-Image RID_SVXBMP_ZOOM_PAGE
+
+Bitmap RID_SVXBMP_ZOOM_PAGE
 {
-    ImageBitmap = Bitmap
-    {
-        File = "zoom_page_statusbar.png" ;
-    };
+    File = "zoom_page_statusbar.png" ;
 };
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/stbctrls/xmlsecctrl.cxx b/svx/source/stbctrls/xmlsecctrl.cxx
index 2fb9bd3c8c14..e8047c2e57fc 100644
--- a/svx/source/stbctrls/xmlsecctrl.cxx
+++ b/svx/source/stbctrls/xmlsecctrl.cxx
@@ -54,9 +54,9 @@ XmlSecStatusBarControl::XmlSecStatusBarControl( sal_uInt16 _nSlotId,  sal_uInt16
 {
     mpImpl->mnState = SignatureState::UNKNOWN;
 
-    mpImpl->maImage             = Image( SVX_RES( RID_SVXBMP_SIGNET              ) );
-    mpImpl->maImageBroken       = Image( SVX_RES( RID_SVXBMP_SIGNET_BROKEN       ) );
-    mpImpl->maImageNotValidated = Image( SVX_RES( RID_SVXBMP_SIGNET_NOTVALIDATED ) );
+    mpImpl->maImage             = Image(BitmapEx(SVX_RES(RID_SVXBMP_SIGNET)));
+    mpImpl->maImageBroken       = Image(BitmapEx(SVX_RES(RID_SVXBMP_SIGNET_BROKEN)));
+    mpImpl->maImageNotValidated = Image(BitmapEx(SVX_RES(RID_SVXBMP_SIGNET_NOTVALIDATED)));
 }
 
 XmlSecStatusBarControl::~XmlSecStatusBarControl()
diff --git a/svx/source/stbctrls/zoomctrl.cxx b/svx/source/stbctrls/zoomctrl.cxx
index 0ab191c6ba36..be7eb431daff 100644
--- a/svx/source/stbctrls/zoomctrl.cxx
+++ b/svx/source/stbctrls/zoomctrl.cxx
@@ -177,7 +177,7 @@ SFX_IMPL_STATUSBAR_CONTROL(SvxZoomPageStatusBarControl,SfxVoidItem);
 SvxZoomPageStatusBarControl::SvxZoomPageStatusBarControl(sal_uInt16 _nSlotId,
     sal_uInt16 _nId, StatusBar& rStb)
     : SfxStatusBarControl(_nSlotId, _nId, rStb)
-    , maImage(SVX_RES(RID_SVXBMP_ZOOM_PAGE))
+    , maImage(BitmapEx(SVX_RES(RID_SVXBMP_ZOOM_PAGE)))
 {
     GetStatusBar().SetQuickHelpText(GetId(), SVX_RESSTR(RID_SVXSTR_FIT_SLIDE));
 }
diff --git a/svx/source/stbctrls/zoomsliderctrl.cxx b/svx/source/stbctrls/zoomsliderctrl.cxx
index 8811a26cc0b4..c9187ecbc3fa 100644
--- a/svx/source/stbctrls/zoomsliderctrl.cxx
+++ b/svx/source/stbctrls/zoomsliderctrl.cxx
@@ -156,9 +156,9 @@ SvxZoomSliderControl::SvxZoomSliderControl( sal_uInt16 _nSlotId,  sal_uInt16 _nI
     SfxStatusBarControl( _nSlotId, _nId, rStatusBar ),
     mxImpl( new SvxZoomSliderControl_Impl )
 {
-    mxImpl->maSliderButton   = Image( SVX_RES( RID_SVXBMP_SLIDERBUTTON   ) );
-    mxImpl->maIncreaseButton = Image( SVX_RES( RID_SVXBMP_SLIDERINCREASE ) );
-    mxImpl->maDecreaseButton = Image( SVX_RES( RID_SVXBMP_SLIDERDECREASE ) );
+    mxImpl->maSliderButton   = Image(BitmapEx(SVX_RES(RID_SVXBMP_SLIDERBUTTON)));
+    mxImpl->maIncreaseButton = Image(BitmapEx(SVX_RES(RID_SVXBMP_SLIDERINCREASE)));
+    mxImpl->maDecreaseButton = Image(BitmapEx(SVX_RES(RID_SVXBMP_SLIDERDECREASE)));
 }
 
 SvxZoomSliderControl::~SvxZoomSliderControl()
diff --git a/svx/source/tbxctrls/extrusioncontrols.cxx b/svx/source/tbxctrls/extrusioncontrols.cxx
index 1e96224cb085..4bcb8ce12a9a 100644
--- a/svx/source/tbxctrls/extrusioncontrols.cxx
+++ b/svx/source/tbxctrls/extrusioncontrols.cxx
@@ -63,12 +63,12 @@ ExtrusionDirectionWindow::ExtrusionDirectionWindow(
 )
     : ToolbarMenu(rController.getFrameInterface(), pParentWindow, WB_STDPOPUP)
     , mrController(rController)
-    , maImgPerspective(SVX_RES(RID_SVXIMG_PERSPECTIVE))
-    , maImgParallel(SVX_RES(RID_SVXIMG_PARALLEL))
+    , maImgPerspective(BitmapEx(SVX_RES(RID_SVXBMP_PERSPECTIVE)))
+    , maImgParallel(BitmapEx(SVX_RES(RID_SVXBMP_PARALLEL)))
 {
     for(sal_uInt16 i = DIRECTION_NW; i <= DIRECTION_SE; ++i)
     {
-        maImgDirection[i] = Image( SVX_RES( RID_SVXIMG_DIRECTION + i ) );
+        maImgDirection[i] = Image(BitmapEx(SVX_RES(RID_SVXBMP_DIRECTION + i)));
     }
 
     SetSelectHdl( LINK( this, ExtrusionDirectionWindow, SelectToolbarMenuHdl ) );
@@ -322,12 +322,12 @@ ExtrusionDepthWindow::ExtrusionDepthWindow(
     vcl::Window* pParentWindow
 )   : ToolbarMenu( rController.getFrameInterface(), pParentWindow, WB_STDPOPUP )
     , mrController( rController )
-    , maImgDepth0(SVX_RES(RID_SVXIMG_DEPTH_0))
-    , maImgDepth1(SVX_RES(RID_SVXIMG_DEPTH_1))
-    , maImgDepth2(SVX_RES(RID_SVXIMG_DEPTH_2))
-    , maImgDepth3(SVX_RES(RID_SVXIMG_DEPTH_3))
-    , maImgDepth4(SVX_RES(RID_SVXIMG_DEPTH_4))
-    , maImgDepthInfinity(SVX_RES(RID_SVXIMG_DEPTH_INFINITY))
+    , maImgDepth0(BitmapEx(SVX_RES(RID_SVXBMP_DEPTH_0)))
+    , maImgDepth1(BitmapEx(SVX_RES(RID_SVXBMP_DEPTH_1)))
+    , maImgDepth2(BitmapEx(SVX_RES(RID_SVXBMP_DEPTH_2)))
+    , maImgDepth3(BitmapEx(SVX_RES(RID_SVXBMP_DEPTH_3)))
+    , maImgDepth4(BitmapEx(SVX_RES(RID_SVXBMP_DEPTH_4)))
+    , maImgDepthInfinity(BitmapEx(SVX_RES(RID_SVXBMP_DEPTH_INFINITY)))
     , meUnit(FUNIT_NONE)
     , mfDepth( -1.0 )
     , msExtrusionDepth( ".uno:ExtrusionDepth" )
@@ -528,9 +528,9 @@ ExtrusionLightingWindow::ExtrusionLightingWindow(svt::ToolboxController& rContro
                                                  vcl::Window* pParentWindow)
     : ToolbarMenu(rController.getFrameInterface(), pParentWindow, WB_STDPOPUP)
     , mrController(rController)
-    , maImgBright(SVX_RES(RID_SVXIMG_LIGHTING_BRIGHT))
-    , maImgNormal(SVX_RES(RID_SVXIMG_LIGHTING_NORMAL))
-    , maImgDim(SVX_RES(RID_SVXIMG_LIGHTING_DIM))
+    , maImgBright(BitmapEx(SVX_RES(RID_SVXBMP_LIGHTING_BRIGHT)))
+    , maImgNormal(BitmapEx(SVX_RES(RID_SVXBMP_LIGHTING_NORMAL)))
+    , maImgDim(BitmapEx(SVX_RES(RID_SVXBMP_LIGHTING_DIM)))
     , mnLevel(0)
     , mbLevelEnabled(false)
     , mnDirection(FROM_FRONT)
@@ -540,10 +540,10 @@ ExtrusionLightingWindow::ExtrusionLightingWindow(svt::ToolboxController& rContro
     {
         if( i != FROM_FRONT )
         {
-            maImgLightingOff[i] = Image(SVX_RES(RID_SVXIMG_LIGHT_OFF + i));
-            maImgLightingOn[i] = Image(SVX_RES(RID_SVXIMG_LIGHT_ON + i));
+            maImgLightingOff[i] = Image(BitmapEx(SVX_RES(RID_SVXBMP_LIGHT_OFF + i)));
+            maImgLightingOn[i] = Image(BitmapEx(SVX_RES(RID_SVXBMP_LIGHT_ON + i)));
         }
-        maImgLightingPreview[i] = Image(SVX_RES(RID_SVXIMG_LIGHT_PREVIEW + i));
+        maImgLightingPreview[i] = Image(BitmapEx(SVX_RES(RID_SVXBMP_LIGHT_PREVIEW + i)));
     }
 
     SetSelectHdl( LINK( this, ExtrusionLightingWindow, SelectToolbarMenuHdl ) );
@@ -797,10 +797,10 @@ ExtrusionSurfaceWindow::ExtrusionSurfaceWindow(
     vcl::Window* pParentWindow)
     : ToolbarMenu(rController.getFrameInterface(), pParentWindow, WB_STDPOPUP)
     , mrController(rController)
-    , maImgSurface1(SVX_RES(RID_SVXIMG_WIRE_FRAME))
-    , maImgSurface2(SVX_RES(RID_SVXIMG_MATTE))
-    , maImgSurface3(SVX_RES(RID_SVXIMG_PLASTIC))
-    , maImgSurface4(SVX_RES(RID_SVXIMG_METAL))
+    , maImgSurface1(BitmapEx(SVX_RES(RID_SVXBMP_WIRE_FRAME)))
+    , maImgSurface2(BitmapEx(SVX_RES(RID_SVXBMP_MATTE)))
+    , maImgSurface3(BitmapEx(SVX_RES(RID_SVXBMP_PLASTIC)))
+    , maImgSurface4(BitmapEx(SVX_RES(RID_SVXBMP_METAL)))
 {
     SetSelectHdl( LINK( this, ExtrusionSurfaceWindow, SelectHdl ) );
 
diff --git a/svx/source/tbxctrls/extrusioncontrols.src b/svx/source/tbxctrls/extrusioncontrols.src
index 8760914079e7..80d53459fb3a 100644
--- a/svx/source/tbxctrls/extrusioncontrols.src
+++ b/svx/source/tbxctrls/extrusioncontrols.src
@@ -20,59 +20,59 @@
 #include <svx/dialogs.hrc>
 #include "extrusioncontrols.hrc"
 
-Image RID_SVXIMG_DIRECTION + DIRECTION_NW
+Bitmap RID_SVXBMP_DIRECTION + DIRECTION_NW
 {
-    ImageBitmap = Bitmap { File = "directionnorthwest_22.bmp" ; };
+    File = "directionnorthwest_22.bmp";
 };
 
-Image RID_SVXIMG_DIRECTION + DIRECTION_N
+Bitmap RID_SVXBMP_DIRECTION + DIRECTION_N
 {
-    ImageBitmap = Bitmap { File = "directionnorth_22.bmp" ; };
+    File = "directionnorth_22.bmp";
 };
 
-Image RID_SVXIMG_DIRECTION + DIRECTION_NE
+Bitmap RID_SVXBMP_DIRECTION + DIRECTION_NE
 {
-    ImageBitmap = Bitmap { File = "directionnortheast_22.bmp"; };
+    File = "directionnortheast_22.bmp";
 };
 
-Image RID_SVXIMG_DIRECTION + DIRECTION_W
+Bitmap RID_SVXBMP_DIRECTION + DIRECTION_W
 {
-    ImageBitmap = Bitmap { File = "directionwest_22.bmp"; };
+    File = "directionwest_22.bmp";
 };
 
-Image RID_SVXIMG_DIRECTION + DIRECTION_NONE
+Bitmap RID_SVXBMP_DIRECTION + DIRECTION_NONE
 {
-    ImageBitmap = Bitmap { File = "directionstraight_22.bmp"; };
+    File = "directionstraight_22.bmp";
 };
 
-Image RID_SVXIMG_DIRECTION + DIRECTION_E
+Bitmap RID_SVXBMP_DIRECTION + DIRECTION_E
 {
-    ImageBitmap = Bitmap { File = "directioneast_22.bmp"; };
+    File = "directioneast_22.bmp";
 };
 
-Image RID_SVXIMG_DIRECTION + DIRECTION_SW
+Bitmap RID_SVXBMP_DIRECTION + DIRECTION_SW
 {
-    ImageBitmap = Bitmap { File = "directionsouthwest_22.bmp"; };
+    File = "directionsouthwest_22.bmp";
 };
 
-Image RID_SVXIMG_DIRECTION + DIRECTION_S
+Bitmap RID_SVXBMP_DIRECTION + DIRECTION_S
 {
-    ImageBitmap = Bitmap { File = "directionsouth_22.bmp"; };
+    File = "directionsouth_22.bmp";
 };
 
-Image RID_SVXIMG_DIRECTION + DIRECTION_SE
+Bitmap RID_SVXBMP_DIRECTION + DIRECTION_SE
 {
-    ImageBitmap = Bitmap { File = "directionsoutheast_22.bmp"; };
+    File = "directionsoutheast_22.bmp";
 };
 
-Image RID_SVXIMG_PERSPECTIVE
+Bitmap RID_SVXBMP_PERSPECTIVE
 {
-    ImageBitmap = Bitmap { File = "perspective_16.bmp"; };
+    File = "perspective_16.bmp";
 };
 
-Image RID_SVXIMG_PARALLEL
+Bitmap RID_SVXBMP_PARALLEL
 {
-    ImageBitmap = Bitmap { File = "parallel_16.bmp"; };
+    File = "parallel_16.bmp";
 };
 
 String RID_SVXSTR_PERSPECTIVE
@@ -130,144 +130,144 @@ String RID_SVXSTR_DIRECTION + DIRECTION_SE
     Text [ en-US ] = "Extrusion South-East";
 };
 
-Image RID_SVXIMG_LIGHT_OFF + FROM_TOP_LEFT
+Bitmap RID_SVXBMP_LIGHT_OFF + FROM_TOP_LEFT
 {
-    ImageBitmap = Bitmap { File = "lightofffromtopleft_22.bmp"; };
+    File = "lightofffromtopleft_22.bmp";
 };
 
-Image RID_SVXIMG_LIGHT_OFF + FROM_TOP
+Bitmap RID_SVXBMP_LIGHT_OFF + FROM_TOP
 {
-    ImageBitmap = Bitmap { File = "lightofffromtop_22.bmp"; };
+    File = "lightofffromtop_22.bmp";
 };
 
-Image RID_SVXIMG_LIGHT_OFF + FROM_TOP_RIGHT
+Bitmap RID_SVXBMP_LIGHT_OFF + FROM_TOP_RIGHT
 {
-    ImageBitmap = Bitmap { File = "lightofffromtopright_22.bmp"; };
+    File = "lightofffromtopright_22.bmp";
 };
 
-Image RID_SVXIMG_LIGHT_OFF + FROM_LEFT
+Bitmap RID_SVXBMP_LIGHT_OFF + FROM_LEFT
 {
-    ImageBitmap = Bitmap { File = "lightofffromleft_22.bmp"; };
+    File = "lightofffromleft_22.bmp";
 };
 
-Image RID_SVXIMG_LIGHT_OFF + FROM_RIGHT
+Bitmap RID_SVXBMP_LIGHT_OFF + FROM_RIGHT
 {
-    ImageBitmap = Bitmap { File = "lightofffromright_22.bmp"; };
+    File = "lightofffromright_22.bmp";
 };
 
-Image RID_SVXIMG_LIGHT_OFF + FROM_BOTTOM_LEFT
+Bitmap RID_SVXBMP_LIGHT_OFF + FROM_BOTTOM_LEFT
 {
-    ImageBitmap = Bitmap { File = "lightofffrombottomleft_22.bmp"; };
+    File = "lightofffrombottomleft_22.bmp";
 };
 
-Image RID_SVXIMG_LIGHT_OFF + FROM_BOTTOM
+Bitmap RID_SVXBMP_LIGHT_OFF + FROM_BOTTOM
 {
-    ImageBitmap = Bitmap { File = "lightofffrombottom_22.bmp"; };
+    File = "lightofffrombottom_22.bmp";
 };
 
-Image RID_SVXIMG_LIGHT_OFF + FROM_BOTTOM_RIGHT
+Bitmap RID_SVXBMP_LIGHT_OFF + FROM_BOTTOM_RIGHT
 {
-    ImageBitmap = Bitmap { File = "lightofffrombottomright_22.bmp"; };
+    File = "lightofffrombottomright_22.bmp";
 };
 
-Image RID_SVXIMG_LIGHT_ON + FROM_TOP_LEFT
+Bitmap RID_SVXBMP_LIGHT_ON + FROM_TOP_LEFT
 {
-    ImageBitmap = Bitmap { File = "lightonfromtopleft_22.bmp"; };
+    File = "lightonfromtopleft_22.bmp";
 };
 
-Image RID_SVXIMG_LIGHT_ON + FROM_TOP
+Bitmap RID_SVXBMP_LIGHT_ON + FROM_TOP
 {
-    ImageBitmap = Bitmap { File = "lightonfromtop_22.bmp"; };
+    File = "lightonfromtop_22.bmp";
 };
 
-Image RID_SVXIMG_LIGHT_ON + FROM_TOP_RIGHT
+Bitmap RID_SVXBMP_LIGHT_ON + FROM_TOP_RIGHT
 {
-    ImageBitmap = Bitmap { File = "lightonfromtopright_22.bmp"; };
+    File = "lightonfromtopright_22.bmp";
 };
 
-Image RID_SVXIMG_LIGHT_ON + FROM_LEFT
+Bitmap RID_SVXBMP_LIGHT_ON + FROM_LEFT
 {
-    ImageBitmap = Bitmap { File = "lightonfromleft_22.bmp"; };
+    File = "lightonfromleft_22.bmp";
 };
 
-Image RID_SVXIMG_LIGHT_ON + FROM_RIGHT
+Bitmap RID_SVXBMP_LIGHT_ON + FROM_RIGHT
 {
-    ImageBitmap = Bitmap { File = "lightonfromright_22.bmp"; };
+    File = "lightonfromright_22.bmp";
 };
 
-Image RID_SVXIMG_LIGHT_ON + FROM_BOTTOM_LEFT
+Bitmap RID_SVXBMP_LIGHT_ON + FROM_BOTTOM_LEFT
 {
-    ImageBitmap = Bitmap { File = "lightonfrombottomleft_22.bmp"; };
+    File = "lightonfrombottomleft_22.bmp";
 };
 
-Image RID_SVXIMG_LIGHT_ON + FROM_BOTTOM
+Bitmap RID_SVXBMP_LIGHT_ON + FROM_BOTTOM
 {
-    ImageBitmap = Bitmap { File = "lightonfrombottom_22.bmp"; };
+    File = "lightonfrombottom_22.bmp";
 };
 
-Image RID_SVXIMG_LIGHT_ON + FROM_BOTTOM_RIGHT
+Bitmap RID_SVXBMP_LIGHT_ON + FROM_BOTTOM_RIGHT
 {
-    ImageBitmap = Bitmap { File = "lightonfrombottomright_22.bmp"; };
+    File = "lightonfrombottomright_22.bmp";
 };
 
-Image RID_SVXIMG_LIGHT_PREVIEW + FROM_TOP_LEFT
+Bitmap RID_SVXBMP_LIGHT_PREVIEW + FROM_TOP_LEFT
 {
-    ImageBitmap = Bitmap { File = "lightfromtopleft_22.bmp"; };
+    File = "lightfromtopleft_22.bmp";
 };
 
-Image RID_SVXIMG_LIGHT_PREVIEW + FROM_TOP
+Bitmap RID_SVXBMP_LIGHT_PREVIEW + FROM_TOP
 {
-    ImageBitmap = Bitmap { File = "lightfromtop_22.bmp"; };
+    File = "lightfromtop_22.bmp";
 };
 
-Image RID_SVXIMG_LIGHT_PREVIEW + FROM_TOP_RIGHT
+Bitmap RID_SVXBMP_LIGHT_PREVIEW + FROM_TOP_RIGHT
 {
-    ImageBitmap = Bitmap { File = "lightfromtopright_22.bmp"; };
+    File = "lightfromtopright_22.bmp";
 };
 
-Image RID_SVXIMG_LIGHT_PREVIEW + FROM_LEFT
+Bitmap RID_SVXBMP_LIGHT_PREVIEW + FROM_LEFT
 {
-    ImageBitmap = Bitmap { File = "lightfromleft_22.bmp"; };
+    File = "lightfromleft_22.bmp";
 };
 
-Image RID_SVXIMG_LIGHT_PREVIEW + FROM_RIGHT
+Bitmap RID_SVXBMP_LIGHT_PREVIEW + FROM_RIGHT
 {
-    ImageBitmap = Bitmap { File = "lightfromright_22.bmp"; };
+    File = "lightfromright_22.bmp";
 };
 
-Image RID_SVXIMG_LIGHT_PREVIEW + FROM_FRONT
+Bitmap RID_SVXBMP_LIGHT_PREVIEW + FROM_FRONT
 {
-    ImageBitmap = Bitmap { File = "lightfromfront_22.bmp"; };
+    File = "lightfromfront_22.bmp";
 };
 
-Image RID_SVXIMG_LIGHT_PREVIEW + FROM_BOTTOM_LEFT
+Bitmap RID_SVXBMP_LIGHT_PREVIEW + FROM_BOTTOM_LEFT
 {
-    ImageBitmap = Bitmap { File = "lightfrombottomleft_22.bmp"; };
+    File = "lightfrombottomleft_22.bmp";
 };
 
-Image RID_SVXIMG_LIGHT_PREVIEW + FROM_BOTTOM
+Bitmap RID_SVXBMP_LIGHT_PREVIEW + FROM_BOTTOM
 {
-    ImageBitmap = Bitmap { File = "lightfrombottom_22.bmp"; };
+    File = "lightfrombottom_22.bmp";
 };
 
-Image RID_SVXIMG_LIGHT_PREVIEW + FROM_BOTTOM_RIGHT
+Bitmap RID_SVXBMP_LIGHT_PREVIEW + FROM_BOTTOM_RIGHT
 {
-    ImageBitmap = Bitmap { File = "lightfrombottomright_22.bmp"; };
+    File = "lightfrombottomright_22.bmp";
 };
 
-Image RID_SVXIMG_LIGHTING_BRIGHT
+Bitmap RID_SVXBMP_LIGHTING_BRIGHT
 {
-    ImageBitmap = Bitmap { File = "brightlit_16.bmp"; };
+    File = "brightlit_16.png";
 };
 
-Image RID_SVXIMG_LIGHTING_NORMAL
+Bitmap RID_SVXBMP_LIGHTING_NORMAL
 {
-    ImageBitmap = Bitmap { File = "normallit_16.bmp"; };
+    File = "normallit_16.png";
 };
 
-Image RID_SVXIMG_LIGHTING_DIM
+Bitmap RID_SVXBMP_LIGHTING_DIM
 {
-    ImageBitmap = Bitmap { File = "dimlit_16.bmp"; };
+    File = "dimlit_16.png";
 };
 
 String RID_SVXSTR_BRIGHT
@@ -305,54 +305,54 @@ String RID_SVXSTR_METAL
     Text [ en-US ] = "Me~tal";
 };
 
-Image RID_SVXIMG_WIRE_FRAME
+Bitmap RID_SVXBMP_WIRE_FRAME
 {
-    ImageBitmap = Bitmap { File = "wireframe_16.bmp"; };
+    File = "wireframe_16.bmp";
 };
 
-Image RID_SVXIMG_MATTE
+Bitmap RID_SVXBMP_MATTE
 {
-    ImageBitmap = Bitmap { File = "matte_16.bmp"; };
+    File = "matte_16.bmp";
 };
 
-Image RID_SVXIMG_PLASTIC
+Bitmap RID_SVXBMP_PLASTIC
 {
-    ImageBitmap = Bitmap { File = "plastic_16.bmp"; };
+    File = "plastic_16.bmp";
 };
 
-Image RID_SVXIMG_METAL
+Bitmap RID_SVXBMP_METAL
 {
-    ImageBitmap = Bitmap { File = "metal_16.bmp"; };
+    File = "metal_16.bmp";
 };
 
-Image RID_SVXIMG_DEPTH_0
+Bitmap RID_SVXBMP_DEPTH_0
 {
-    ImageBitmap = Bitmap { File = "extrusion0inch_16.bmp"; };
+    File = "extrusion0inch_16.bmp";
 };
 
-Image RID_SVXIMG_DEPTH_1
+Bitmap RID_SVXBMP_DEPTH_1
 {
-    ImageBitmap = Bitmap { File = "extrusion05inch_16.bmp"; };
+    File = "extrusion05inch_16.bmp";
 };
 
-Image RID_SVXIMG_DEPTH_2
+Bitmap RID_SVXBMP_DEPTH_2
 {
-    ImageBitmap = Bitmap { File = "extrusion1inch_16.bmp"; };
+    File = "extrusion1inch_16.bmp";
 };
 
-Image RID_SVXIMG_DEPTH_3
+Bitmap RID_SVXBMP_DEPTH_3
 {
-    ImageBitmap = Bitmap { File = "extrusion2inch_16.bmp"; };
+    File = "extrusion2inch_16.bmp";
 };
 
-Image RID_SVXIMG_DEPTH_4
+Bitmap RID_SVXBMP_DEPTH_4
 {
-    ImageBitmap = Bitmap { File = "extrusion4inch_16.bmp"; };
+    File = "extrusion4inch_16.bmp";
 };
 
-Image RID_SVXIMG_DEPTH_INFINITY
+Bitmap RID_SVXBMP_DEPTH_INFINITY
 {
-    ImageBitmap = Bitmap { File = "extrusioninfinity_16.bmp"; };
+    File = "extrusioninfinity_16.bmp";
 };
 
 String RID_SVXSTR_DEPTH_0
diff --git a/svx/source/tbxctrls/fontworkgallery.cxx b/svx/source/tbxctrls/fontworkgallery.cxx
index e8d5f369212e..bc3099f4b5b0 100644
--- a/svx/source/tbxctrls/fontworkgallery.cxx
+++ b/svx/source/tbxctrls/fontworkgallery.cxx
@@ -269,11 +269,11 @@ private:
 FontworkAlignmentWindow::FontworkAlignmentWindow(svt::ToolboxController& rController, vcl::Window* pParentWindow)
     : ToolbarMenu(rController.getFrameInterface(), pParentWindow, WB_STDPOPUP)
     , mrController(rController)
-    , maImgAlgin1(SVX_RES(RID_SVXIMG_FONTWORK_ALIGN_LEFT))
-    , maImgAlgin2(SVX_RES(RID_SVXIMG_FONTWORK_ALIGN_CENTER))
-    , maImgAlgin3(SVX_RES(RID_SVXIMG_FONTWORK_ALIGN_RIGHT))
-    , maImgAlgin4(SVX_RES(RID_SVXIMG_FONTWORK_ALIGN_WORD))
-    , maImgAlgin5(SVX_RES(RID_SVXIMG_FONTWORK_ALIGN_STRETCH))
+    , maImgAlgin1(BitmapEx(SVX_RES(RID_SVXBMP_FONTWORK_ALIGN_LEFT)))
+    , maImgAlgin2(BitmapEx(SVX_RES(RID_SVXBMP_FONTWORK_ALIGN_CENTER)))
+    , maImgAlgin3(BitmapEx(SVX_RES(RID_SVXBMP_FONTWORK_ALIGN_RIGHT)))
+    , maImgAlgin4(BitmapEx(SVX_RES(RID_SVXBMP_FONTWORK_ALIGN_WORD)))
+    , maImgAlgin5(BitmapEx(SVX_RES(RID_SVXBMP_FONTWORK_ALIGN_STRETCH)))
     , msFontworkAlignment(".uno:FontworkAlignment")
 {
     SetSelectHdl( LINK( this, FontworkAlignmentWindow, SelectHdl ) );
diff --git a/svx/source/tbxctrls/fontworkgallery.src b/svx/source/tbxctrls/fontworkgallery.src
index 86d7954ee031..6b61f89dc3f2 100644
--- a/svx/source/tbxctrls/fontworkgallery.src
+++ b/svx/source/tbxctrls/fontworkgallery.src
@@ -45,29 +45,29 @@ String RID_SVXSTR_ALIGN_STRETCH
     Text [ en-US ] = "S~tretch Justify";
 };
 
-Image RID_SVXIMG_FONTWORK_ALIGN_LEFT
+Bitmap RID_SVXBMP_FONTWORK_ALIGN_LEFT
 {
-    ImageBitmap = Bitmap { File = "fontworkalignleft_16.png"; };
+    File = "fontworkalignleft_16.png";
 };
 
-Image RID_SVXIMG_FONTWORK_ALIGN_CENTER
+Bitmap RID_SVXBMP_FONTWORK_ALIGN_CENTER
 {
-    ImageBitmap = Bitmap { File = "fontworkaligncentered_16.png"; };
+    File = "fontworkaligncentered_16.png";
 };
 
-Image RID_SVXIMG_FONTWORK_ALIGN_RIGHT
+Bitmap RID_SVXBMP_FONTWORK_ALIGN_RIGHT
 {
-    ImageBitmap = Bitmap { File = "fontworkalignright_16.png"; };
+    File = "fontworkalignright_16.png";
 };
 
-Image RID_SVXIMG_FONTWORK_ALIGN_WORD
+Bitmap RID_SVXBMP_FONTWORK_ALIGN_WORD
 {
-    ImageBitmap = Bitmap { File = "fontworkalignjustified_16.png"; };
+    File = "fontworkalignjustified_16.png";
 };
 
-Image RID_SVXIMG_FONTWORK_ALIGN_STRETCH
+Bitmap RID_SVXBMP_FONTWORK_ALIGN_STRETCH
 {
-    ImageBitmap = Bitmap { File = "fontworkalignstretch_16.png"; };
+    File = "fontworkalignstretch_16.png";
 };
 
 String RID_SVXSTR_CHARS_SPACING_VERY_TIGHT
diff --git a/svx/source/tbxctrls/grafctrl.cxx b/svx/source/tbxctrls/grafctrl.cxx
index 3c53cd790103..2ce539616209 100644
--- a/svx/source/tbxctrls/grafctrl.cxx
+++ b/svx/source/tbxctrls/grafctrl.cxx
@@ -190,13 +190,13 @@ static sal_uInt16 ImplGetRID( const OUString& aCommand )
 {
     static const CommandToRID aImplCommandToResMap[] =
     {
-        { ".uno:GrafRed",           RID_SVXIMG_GRAF_RED             },
-        { ".uno:GrafGreen",         RID_SVXIMG_GRAF_GREEN           },
-        { ".uno:GrafBlue",          RID_SVXIMG_GRAF_BLUE            },
-        { ".uno:GrafLuminance",     RID_SVXIMG_GRAF_LUMINANCE       },
-        { ".uno:GrafContrast",      RID_SVXIMG_GRAF_CONTRAST        },
-        { ".uno:GrafGamma",         RID_SVXIMG_GRAF_GAMMA           },
-        { ".uno:GrafTransparence",  RID_SVXIMG_GRAF_TRANSPARENCE    },
+        { ".uno:GrafRed",           RID_SVXBMP_GRAF_RED             },
+        { ".uno:GrafGreen",         RID_SVXBMP_GRAF_GREEN           },
+        { ".uno:GrafBlue",          RID_SVXBMP_GRAF_BLUE            },
+        { ".uno:GrafLuminance",     RID_SVXBMP_GRAF_LUMINANCE       },
+        { ".uno:GrafContrast",      RID_SVXBMP_GRAF_CONTRAST        },
+        { ".uno:GrafGamma",         RID_SVXBMP_GRAF_GAMMA           },
+        { ".uno:GrafTransparence",  RID_SVXBMP_GRAF_TRANSPARENCE    },
         { nullptr, 0 }
     };
 
@@ -247,13 +247,13 @@ ImplGrafControl::ImplGrafControl(
     , maField( VclPtr<ImplGrafMetricField>::Create(this, rCmd, rFrame) )
 {
     ResId   aResId( ImplGetRID( rCmd ), DIALOG_MGR() ) ;
-    Image   aImage( aResId );
+    BitmapEx aBitmapEx(aResId);
 
-    Size    aImgSize( aImage.GetSizePixel() );
-    Size    aFldSize( maField->GetSizePixel() );
+    Size    aImgSize(aBitmapEx.GetSizePixel());
+    Size    aFldSize(maField->GetSizePixel());
     long    nFldY, nImgY;
 
-    maImage->SetImage( aImage );
+    maImage->SetImage(Image(aBitmapEx));
     maImage->SetSizePixel( aImgSize );
     // we want to see the background of the toolbox, not of the FixedImage or Control
     maImage->SetBackground( Wallpaper( COL_TRANSPARENT ) );
diff --git a/svx/source/tbxctrls/tbcontrl.src b/svx/source/tbxctrls/tbcontrl.src
index 4cc977597cdb..eb98816a5678 100644
--- a/svx/source/tbxctrls/tbcontrl.src
+++ b/svx/source/tbxctrls/tbcontrl.src
@@ -168,33 +168,39 @@ String RID_SVXSTR_PAGES
     Text [ en-US ] = "Pages";
 };
 
-Image RID_SVXIMG_GRAF_RED
+Bitmap RID_SVXBMP_GRAF_RED
 {
-    ImageBitmap = Bitmap { File = "sc10865.png" ; };
+    File = "sc10865.png";
 };
-Image RID_SVXIMG_GRAF_GREEN
+
+Bitmap RID_SVXBMP_GRAF_GREEN
 {
-    ImageBitmap = Bitmap { File = "sc10866.png" ; };
+    File = "sc10866.png";
 };
-Image RID_SVXIMG_GRAF_BLUE
+
+Bitmap RID_SVXBMP_GRAF_BLUE
 {
-    ImageBitmap = Bitmap { File = "sc10867.png" ; };
+    File = "sc10867.png";
 };
-Image RID_SVXIMG_GRAF_LUMINANCE
+
+Bitmap RID_SVXBMP_GRAF_LUMINANCE
 {
-    ImageBitmap = Bitmap { File = "sc10863.png" ; };
+    File = "sc10863.png";
 };
-Image RID_SVXIMG_GRAF_CONTRAST
+
+Bitmap RID_SVXBMP_GRAF_CONTRAST
 {
-    ImageBitmap = Bitmap { File = "sc10864.png" ; };
+    File = "sc10864.png";
 };
-Image RID_SVXIMG_GRAF_GAMMA
+
+Bitmap RID_SVXBMP_GRAF_GAMMA
 {
-    ImageBitmap = Bitmap { File = "sc10868.png" ; };
+    File = "sc10868.png";
 };
-Image RID_SVXIMG_GRAF_TRANSPARENCE
+
+Bitmap RID_SVXBMP_GRAF_TRANSPARENCE
 {
-    ImageBitmap = Bitmap { File = "sc10869.png" ; };
+    File = "sc10869.png";
 };
 
 String RID_SVXSTR_CLEARFORM