svx: load BitmapEx resources instead of Image ones

Change-Id: Id23523170f757361f3fc3d8a18b6db827f45d109

6 files changed, 163 insertions, 157 deletions

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