remove bitmaps from .src files

and into includeable .hlst files, add them to
postprocess/CustomTarget_images.mk
to continue only including used bitmaps in icon-theme zips

Change-Id: I5c24c3eca93a9c4101bcdcacb0e4b2712133968e
Reviewed-on: https://gerrit.libreoffice.org/36941
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

14 files changed, 193 insertions, 613 deletions

diff --git a/vcl/AllLangResTarget_vcl.mk b/vcl/AllLangResTarget_vcl.mk
index c76fcd00d3e9..b12b29c9b1a5 100644
--- a/vcl/AllLangResTarget_vcl.mk
+++ b/vcl/AllLangResTarget_vcl.mk
@@ -44,8 +44,4 @@ $(eval $(call gb_SrsTarget_add_files,vcl/source/src,\
     vcl/source/edit/textundo.src \
 ))
 
-$(eval $(call gb_SrsTarget_add_nonlocalizable_files,vcl/source/src,\
-    vcl/source/src/images.src \
-))
-
 # vim: set noet sw=4 ts=4:
diff --git a/vcl/inc/bitmaps.hlst b/vcl/inc/bitmaps.hlst
new file mode 100644
index 000000000000..e096f92e65fa
--- /dev/null
+++ b/vcl/inc/bitmaps.hlst
@@ -0,0 +1,104 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#ifndef INCLUDED_VCL_INC_BITMAPS_HRC
+#define INCLUDED_VCL_INC_BITMAPS_HRC
+
+#define SV_RESID_BITMAP_CHECK1                       "vcl/res/check1.png"
+#define SV_RESID_BITMAP_CHECK2                       "vcl/res/check2.png"
+#define SV_RESID_BITMAP_CHECK3                       "vcl/res/check3.png"
+#define SV_RESID_BITMAP_CHECK4                       "vcl/res/check4.png"
+#define SV_RESID_BITMAP_CHECK5                       "vcl/res/check5.png"
+#define SV_RESID_BITMAP_CHECK6                       "vcl/res/check6.png"
+#define SV_RESID_BITMAP_CHECK7                       "vcl/res/check7.png"
+#define SV_RESID_BITMAP_CHECK8                       "vcl/res/check8.png"
+#define SV_RESID_BITMAP_CHECK9                       "vcl/res/check9.png"
+#define SV_RESID_BITMAP_CHECKMONO1                   "vcl/res/checkmono1.png"
+#define SV_RESID_BITMAP_CHECKMONO2                   "vcl/res/checkmono2.png"
+#define SV_RESID_BITMAP_CHECKMONO3                   "vcl/res/checkmono3.png"
+#define SV_RESID_BITMAP_CHECKMONO4                   "vcl/res/checkmono4.png"
+#define SV_RESID_BITMAP_CHECKMONO5                   "vcl/res/checkmono5.png"
+#define SV_RESID_BITMAP_CHECKMONO6                   "vcl/res/checkmono6.png"
+#define SV_RESID_BITMAP_CHECKMONO7                   "vcl/res/checkmono7.png"
+#define SV_RESID_BITMAP_CHECKMONO8                   "vcl/res/checkmono8.png"
+#define SV_RESID_BITMAP_CHECKMONO9                   "vcl/res/checkmono9.png"
+#define SV_RESID_BITMAP_RADIO1                       "vcl/res/radio1.png"
+#define SV_RESID_BITMAP_RADIO2                       "vcl/res/radio2.png"
+#define SV_RESID_BITMAP_RADIO3                       "vcl/res/radio3.png"
+#define SV_RESID_BITMAP_RADIO4                       "vcl/res/radio4.png"
+#define SV_RESID_BITMAP_RADIO5                       "vcl/res/radio5.png"
+#define SV_RESID_BITMAP_RADIO6                       "vcl/res/radio6.png"
+#define SV_RESID_BITMAP_RADIOMONO1                   "vcl/res/radiomono1.png"
+#define SV_RESID_BITMAP_RADIOMONO2                   "vcl/res/radiomono2.png"
+#define SV_RESID_BITMAP_RADIOMONO3                   "vcl/res/radiomono3.png"
+#define SV_RESID_BITMAP_RADIOMONO4                   "vcl/res/radiomono4.png"
+#define SV_RESID_BITMAP_RADIOMONO5                   "vcl/res/radiomono5.png"
+#define SV_RESID_BITMAP_RADIOMONO6                   "vcl/res/radiomono6.png"
+
+#define SV_RESID_BITMAP_ERRORBOX                     "vcl/res/errorbox.png"
+#define SV_RESID_BITMAP_QUERYBOX                     "vcl/res/querybox.png"
+#define SV_RESID_BITMAP_WARNINGBOX                   "vcl/res/warningbox.png"
+#define SV_RESID_BITMAP_INFOBOX                      "vcl/res/infobox.png"
+
+#define SV_RESID_BITMAP_SCROLLMSK                    "vcl/res/scrmsk.png"
+#define SV_RESID_BITMAP_WHEELVH                      "vcl/res/wheelvh.png"
+#define SV_RESID_BITMAP_WHEELV                       "vcl/res/wheelv.png"
+#define SV_RESID_BITMAP_WHEELH                       "vcl/res/wheelh.png"
+#define SV_RESID_BITMAP_SCROLLVH                     "vcl/res/scrollvh.png"
+#define SV_RESID_BITMAP_SCROLLV                      "vcl/res/scrollv.png"
+#define SV_RESID_BITMAP_SCROLLH                      "vcl/res/scrollh.png"
+#define SV_RESID_BITMAP_CLOSEDOC                     "vcl/res/closedoc.png"
+#define SV_RESID_BITMAP_INDEX                        "vcl/res/index.png"
+#define SV_RESID_BITMAP_REFRESH                      "res/reload.png"
+#define SV_RESID_BITMAP_NOTEBOOKBAR                  "res/notebookbar.png"
+
+#define SV_DISCLOSURE_PLUS                           "res/plus.png"
+#define SV_DISCLOSURE_MINUS                          "res/minus.png"
+
+#define SV_PRINT_COLLATE_BMP                         "vcl/res/collate.png"
+#define SV_PRINT_NOCOLLATE_BMP                       "vcl/res/ncollate.png"
+
+//start, Throbber::getDefaultImageURLs
+#define SPINNER_16_01                                "vcl/res/spinner-16-01.png"
+#define SPINNER_16_02                                "vcl/res/spinner-16-02.png"
+#define SPINNER_16_03                                "vcl/res/spinner-16-03.png"
+#define SPINNER_16_04                                "vcl/res/spinner-16-04.png"
+#define SPINNER_16_05                                "vcl/res/spinner-16-05.png"
+#define SPINNER_16_06                                "vcl/res/spinner-16-06.png"
+
+#define SPINNER_32_01                                "vcl/res/spinner-32-01.png"
+#define SPINNER_32_02                                "vcl/res/spinner-32-02.png"
+#define SPINNER_32_03                                "vcl/res/spinner-32-03.png"
+#define SPINNER_32_04                                "vcl/res/spinner-32-04.png"
+#define SPINNER_32_05                                "vcl/res/spinner-32-05.png"
+#define SPINNER_32_06                                "vcl/res/spinner-32-06.png"
+#define SPINNER_32_07                                "vcl/res/spinner-32-07.png"
+#define SPINNER_32_08                                "vcl/res/spinner-32-08.png"
+#define SPINNER_32_09                                "vcl/res/spinner-32-09.png"
+#define SPINNER_32_10                                "vcl/res/spinner-32-10.png"
+#define SPINNER_32_11                                "vcl/res/spinner-32-11.png"
+#define SPINNER_32_12                                "vcl/res/spinner-32-12.png"
+
+#define SPINNER_64_01                                "vcl/res/spinner-64-01.png"
+#define SPINNER_64_02                                "vcl/res/spinner-64-02.png"
+#define SPINNER_64_03                                "vcl/res/spinner-64-03.png"
+#define SPINNER_64_04                                "vcl/res/spinner-64-04.png"
+#define SPINNER_64_05                                "vcl/res/spinner-64-05.png"
+#define SPINNER_64_06                                "vcl/res/spinner-64-06.png"
+#define SPINNER_64_07                                "vcl/res/spinner-64-07.png"
+#define SPINNER_64_08                                "vcl/res/spinner-64-08.png"
+#define SPINNER_64_09                                "vcl/res/spinner-64-09.png"
+#define SPINNER_64_10                                "vcl/res/spinner-64-10.png"
+#define SPINNER_64_11                                "vcl/res/spinner-64-11.png"
+#define SPINNER_64_12                                "vcl/res/spinner-64-12.png"
+//end, Throbber::getDefaultImageURLs
+
+#endif // INCLUDED_VCL_INC_BITMAPS_HRC
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/vcl/inc/svdata.hxx b/vcl/inc/svdata.hxx
index b3c7f466a3bc..1d8d5ad56367 100644
--- a/vcl/inc/svdata.hxx
+++ b/vcl/inc/svdata.hxx
@@ -88,6 +88,18 @@ class VclEventListeners2;
 class SalData;
 class OpenGLContext;
 
+#define SV_ICON_ID_OFFICE                               1
+#define SV_ICON_ID_TEXT                                 2
+#define SV_ICON_ID_TEXT_TEMPLATE                        3
+#define SV_ICON_ID_SPREADSHEET                          4
+#define SV_ICON_ID_SPREADSHEET_TEMPLATE                 5
+#define SV_ICON_ID_DRAWING                              6
+#define SV_ICON_ID_PRESENTATION                         8
+#define SV_ICON_ID_MASTER_DOCUMENT                     10
+#define SV_ICON_ID_TEMPLATE                            11
+#define SV_ICON_ID_DATABASE                            12
+#define SV_ICON_ID_FORMULA                             13
+
 namespace vcl { class DisplayConnectionDispatch; class SettingsConfigItem; class DeleteOnDeinitBase; }
 
 class LocaleConfigurationListener : public utl::ConfigurationListener
diff --git a/vcl/inc/svids.hrc b/vcl/inc/svids.hrc
index 8d1f06dbb8f9..4d825e106f2f 100644
--- a/vcl/inc/svids.hrc
+++ b/vcl/inc/svids.hrc
@@ -20,57 +20,6 @@
 #ifndef INCLUDED_VCL_INC_SVIDS_HRC
 #define INCLUDED_VCL_INC_SVIDS_HRC
 
-#define SV_RESID_BITMAP_CHECK1                       1000
-#define SV_RESID_BITMAP_CHECK2                       1001
-#define SV_RESID_BITMAP_CHECK3                       1002
-#define SV_RESID_BITMAP_CHECK4                       1003
-#define SV_RESID_BITMAP_CHECK5                       1004
-#define SV_RESID_BITMAP_CHECK6                       1005
-#define SV_RESID_BITMAP_CHECK7                       1006
-#define SV_RESID_BITMAP_CHECK8                       1007
-#define SV_RESID_BITMAP_CHECK9                       1008
-#define SV_RESID_BITMAP_CHECKMONO1                   1009
-#define SV_RESID_BITMAP_CHECKMONO2                   1010
-#define SV_RESID_BITMAP_CHECKMONO3                   1011
-#define SV_RESID_BITMAP_CHECKMONO4                   1012
-#define SV_RESID_BITMAP_CHECKMONO5                   1013
-#define SV_RESID_BITMAP_CHECKMONO6                   1014
-#define SV_RESID_BITMAP_CHECKMONO7                   1015
-#define SV_RESID_BITMAP_CHECKMONO8                   1016
-#define SV_RESID_BITMAP_CHECKMONO9                   1017
-#define SV_RESID_BITMAP_RADIO1                       1018
-#define SV_RESID_BITMAP_RADIO2                       1019
-#define SV_RESID_BITMAP_RADIO3                       1020
-#define SV_RESID_BITMAP_RADIO4                       1021
-#define SV_RESID_BITMAP_RADIO5                       1022
-#define SV_RESID_BITMAP_RADIO6                       1023
-#define SV_RESID_BITMAP_RADIOMONO1                   1024
-#define SV_RESID_BITMAP_RADIOMONO2                   1025
-#define SV_RESID_BITMAP_RADIOMONO3                   1026
-#define SV_RESID_BITMAP_RADIOMONO4                   1027
-#define SV_RESID_BITMAP_RADIOMONO5                   1028
-#define SV_RESID_BITMAP_RADIOMONO6                   1029
-
-#define SV_RESID_BITMAP_ERRORBOX                     1030
-#define SV_RESID_BITMAP_QUERYBOX                     1031
-#define SV_RESID_BITMAP_WARNINGBOX                   1032
-#define SV_RESID_BITMAP_INFOBOX                      1033
-
-#define SV_RESID_BITMAP_SCROLLMSK                    1050
-#define SV_RESID_BITMAP_WHEELVH                      1051
-#define SV_RESID_BITMAP_WHEELV                       1052
-#define SV_RESID_BITMAP_WHEELH                       1053
-#define SV_RESID_BITMAP_SCROLLVH                     1054
-#define SV_RESID_BITMAP_SCROLLV                      1055
-#define SV_RESID_BITMAP_SCROLLH                      1056
-#define SV_RESID_BITMAP_CLOSEDOC                     1057
-#define SV_RESID_BITMAP_INDEX                        1058
-#define SV_RESID_BITMAP_REFRESH                      1059
-#define SV_RESID_BITMAP_NOTEBOOKBAR                  1060
-
-#define SV_DISCLOSURE_PLUS                           1070
-#define SV_DISCLOSURE_MINUS                          1071
-
 #define RID_STR_PAPERNAMES                           1080
 
 #define SV_RESID_STRING_NOSELECTIONPOSSIBLE          2001
@@ -166,8 +115,6 @@
 #define SV_PRINT_TOFILE_TXT                         10610
 #define SV_PRINT_DEFPRT_TXT                         10611
 #define SV_PRINT_PRINTPREVIEW_TXT                   10612
-#define SV_PRINT_COLLATE_BMP                        10613
-#define SV_PRINT_NOCOLLATE_BMP                      10614
 #define SV_PRINT_QUERYFAXNUMBER_TXT                 10615
 #define SV_PRINT_INVALID_TXT                        10616
 #define SV_PRINT_CUSTOM_TXT                         10617
@@ -187,18 +134,6 @@
 #define SV_ICON_SIZE32_START                        21000
 #define SV_ICON_SIZE16_START                        23000
 
-#define SV_ICON_ID_OFFICE                               1
-#define SV_ICON_ID_TEXT                                 2
-#define SV_ICON_ID_TEXT_TEMPLATE                        3
-#define SV_ICON_ID_SPREADSHEET                          4
-#define SV_ICON_ID_SPREADSHEET_TEMPLATE                 5
-#define SV_ICON_ID_DRAWING                              6
-#define SV_ICON_ID_PRESENTATION                         8
-#define SV_ICON_ID_MASTER_DOCUMENT                     10
-#define SV_ICON_ID_TEMPLATE                            11
-#define SV_ICON_ID_DATABASE                            12
-#define SV_ICON_ID_FORMULA                             13
-
 #endif // INCLUDED_VCL_INC_SVIDS_HRC
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx
index 493c74e4532f..ec1d80ca63e7 100644
--- a/vcl/source/control/button.cxx
+++ b/vcl/source/control/button.cxx
@@ -39,6 +39,7 @@
 #include <vcl/uitest/uiobject.hxx>
 
 #include <svids.hrc>
+#include <bitmaps.hlst>
 #include <svdata.hxx>
 #include <window.h>
 #include <controldata.hxx>
@@ -2738,7 +2739,7 @@ Size RadioButton::ImplGetRadioImageSize() const
 }
 
 static void LoadThemedImageList(const StyleSettings &rStyleSettings,
-                                std::vector<Image>& rList, const std::vector<ResId> &rResources)
+                                std::vector<Image>& rList, const std::vector<OUString> &rResources)
 {
     Color aColorAry1[6];
     Color aColorAry2[6];
@@ -2786,18 +2787,26 @@ Image RadioButton::GetRadioImage( const AllSettings& rSettings, DrawButtonFlags
         pSVData->maCtrlData.mnLastRadioWColor = rStyleSettings.GetWindowColor().GetColor();
         pSVData->maCtrlData.mnLastRadioLColor = rStyleSettings.GetLightColor().GetColor();
 
-        ResMgr* pResMgr = ImplGetResMgr();
-        if (pResMgr)
+        std::vector<OUString> aResources;
+        if (nStyle)
         {
-            std::vector<ResId> aResources;
-            aResources.push_back(ResId(nStyle ? SV_RESID_BITMAP_RADIOMONO1 : SV_RESID_BITMAP_RADIO1, *pResMgr));
-            aResources.push_back(ResId(nStyle ? SV_RESID_BITMAP_RADIOMONO2 : SV_RESID_BITMAP_RADIO2, *pResMgr));
-            aResources.push_back(ResId(nStyle ? SV_RESID_BITMAP_RADIOMONO3 : SV_RESID_BITMAP_RADIO3, *pResMgr));
-            aResources.push_back(ResId(nStyle ? SV_RESID_BITMAP_RADIOMONO4 : SV_RESID_BITMAP_RADIO4, *pResMgr));
-            aResources.push_back(ResId(nStyle ? SV_RESID_BITMAP_RADIOMONO5 : SV_RESID_BITMAP_RADIO5, *pResMgr));
-            aResources.push_back(ResId(nStyle ? SV_RESID_BITMAP_RADIOMONO6 : SV_RESID_BITMAP_RADIO6, *pResMgr));
-            LoadThemedImageList( rStyleSettings, pSVData->maCtrlData.maRadioImgList, aResources);
+            aResources.push_back(SV_RESID_BITMAP_RADIOMONO1);
+            aResources.push_back(SV_RESID_BITMAP_RADIOMONO2);
+            aResources.push_back(SV_RESID_BITMAP_RADIOMONO3);
+            aResources.push_back(SV_RESID_BITMAP_RADIOMONO4);
+            aResources.push_back(SV_RESID_BITMAP_RADIOMONO5);
+            aResources.push_back(SV_RESID_BITMAP_RADIOMONO6);
         }
+        else
+        {
+            aResources.push_back(SV_RESID_BITMAP_RADIO1);
+            aResources.push_back(SV_RESID_BITMAP_RADIO2);
+            aResources.push_back(SV_RESID_BITMAP_RADIO3);
+            aResources.push_back(SV_RESID_BITMAP_RADIO4);
+            aResources.push_back(SV_RESID_BITMAP_RADIO5);
+            aResources.push_back(SV_RESID_BITMAP_RADIO6);
+        }
+        LoadThemedImageList( rStyleSettings, pSVData->maCtrlData.maRadioImgList, aResources);
         pSVData->maCtrlData.mnRadioStyle = nStyle;
     }
 
@@ -3622,21 +3631,32 @@ Image CheckBox::GetCheckImage( const AllSettings& rSettings, DrawButtonFlags nFl
         pSVData->maCtrlData.mnLastCheckWColor = rStyleSettings.GetWindowColor().GetColor();
         pSVData->maCtrlData.mnLastCheckLColor = rStyleSettings.GetLightColor().GetColor();
 
-        ResMgr* pResMgr = ImplGetResMgr();
-        if( pResMgr )
-        {
-            std::vector<ResId> aResources;
-            aResources.push_back(ResId(nStyle ? SV_RESID_BITMAP_CHECKMONO1 : SV_RESID_BITMAP_CHECK1, *pResMgr));
-            aResources.push_back(ResId(nStyle ? SV_RESID_BITMAP_CHECKMONO2 : SV_RESID_BITMAP_CHECK2, *pResMgr));
-            aResources.push_back(ResId(nStyle ? SV_RESID_BITMAP_CHECKMONO3 : SV_RESID_BITMAP_CHECK3, *pResMgr));
-            aResources.push_back(ResId(nStyle ? SV_RESID_BITMAP_CHECKMONO4 : SV_RESID_BITMAP_CHECK4, *pResMgr));
-            aResources.push_back(ResId(nStyle ? SV_RESID_BITMAP_CHECKMONO5 : SV_RESID_BITMAP_CHECK5, *pResMgr));
-            aResources.push_back(ResId(nStyle ? SV_RESID_BITMAP_CHECKMONO6 : SV_RESID_BITMAP_CHECK6, *pResMgr));
-            aResources.push_back(ResId(nStyle ? SV_RESID_BITMAP_CHECKMONO7 : SV_RESID_BITMAP_CHECK7, *pResMgr));
-            aResources.push_back(ResId(nStyle ? SV_RESID_BITMAP_CHECKMONO8 : SV_RESID_BITMAP_CHECK8, *pResMgr));
-            aResources.push_back(ResId(nStyle ? SV_RESID_BITMAP_CHECKMONO9 : SV_RESID_BITMAP_CHECK9, *pResMgr));
-            LoadThemedImageList(rStyleSettings, pSVData->maCtrlData.maCheckImgList, aResources);
+        std::vector<OUString> aResources;
+        if (nStyle)
+        {
+            aResources.push_back(SV_RESID_BITMAP_CHECKMONO1);
+            aResources.push_back(SV_RESID_BITMAP_CHECKMONO2);
+            aResources.push_back(SV_RESID_BITMAP_CHECKMONO3);
+            aResources.push_back(SV_RESID_BITMAP_CHECKMONO4);
+            aResources.push_back(SV_RESID_BITMAP_CHECKMONO5);
+            aResources.push_back(SV_RESID_BITMAP_CHECKMONO6);
+            aResources.push_back(SV_RESID_BITMAP_CHECKMONO7);
+            aResources.push_back(SV_RESID_BITMAP_CHECKMONO8);
+            aResources.push_back(SV_RESID_BITMAP_CHECKMONO9);
         }
+        else
+        {
+            aResources.push_back(SV_RESID_BITMAP_CHECK1);
+            aResources.push_back(SV_RESID_BITMAP_CHECK2);
+            aResources.push_back(SV_RESID_BITMAP_CHECK3);
+            aResources.push_back(SV_RESID_BITMAP_CHECK4);
+            aResources.push_back(SV_RESID_BITMAP_CHECK5);
+            aResources.push_back(SV_RESID_BITMAP_CHECK6);
+            aResources.push_back(SV_RESID_BITMAP_CHECK7);
+            aResources.push_back(SV_RESID_BITMAP_CHECK8);
+            aResources.push_back(SV_RESID_BITMAP_CHECK9);
+        }
+        LoadThemedImageList(rStyleSettings, pSVData->maCtrlData.maCheckImgList, aResources);
         pSVData->maCtrlData.mnCheckStyle = nStyle;
     }
 
@@ -3826,9 +3846,9 @@ void DisclosureButton::ImplDrawCheckBoxState(vcl::RenderContext& rRenderContext)
     {
         ImplSVCtrlData& rCtrlData(ImplGetSVData()->maCtrlData);
         if (!rCtrlData.mpDisclosurePlus)
-            rCtrlData.mpDisclosurePlus = new Image(BitmapEx(VclResId(SV_DISCLOSURE_PLUS)));
+            rCtrlData.mpDisclosurePlus = new Image(BitmapEx(SV_DISCLOSURE_PLUS));
         if (!rCtrlData.mpDisclosureMinus)
-            rCtrlData.mpDisclosureMinus = new Image(BitmapEx(VclResId(SV_DISCLOSURE_MINUS)));
+            rCtrlData.mpDisclosureMinus = new Image(BitmapEx(SV_DISCLOSURE_MINUS));
 
         Image* pImg = nullptr;
         pImg = IsChecked() ? rCtrlData.mpDisclosureMinus : rCtrlData.mpDisclosurePlus;
diff --git a/vcl/source/control/tabctrl.cxx b/vcl/source/control/tabctrl.cxx
index 98bd3f8a3f36..de0c8d7952f9 100644
--- a/vcl/source/control/tabctrl.cxx
+++ b/vcl/source/control/tabctrl.cxx
@@ -32,6 +32,7 @@
 #include <vcl/settings.hxx>
 #include <vcl/uitest/uiobject.hxx>
 #include <vcl/builderfactory.hxx>
+#include <bitmaps.hlst>
 #include <svids.hrc>
 
 #include "controldata.hxx"
@@ -2207,7 +2208,7 @@ NotebookbarTabControlBase::NotebookbarTabControlBase(vcl::Window* pParent)
     , bLastContextWasSupported(true)
     , eLastContext(vcl::EnumContext::Context::Any)
 {
-    BitmapEx aBitmap(VclResId(SV_RESID_BITMAP_NOTEBOOKBAR), Color());
+    BitmapEx aBitmap(SV_RESID_BITMAP_NOTEBOOKBAR);
     InsertPage(1, "");
     SetPageImage(1, Image(aBitmap));
 }
diff --git a/vcl/source/control/throbber.ilst b/vcl/source/control/throbber.ilst
deleted file mode 100644
index 17f9e3eedf11..000000000000
--- a/vcl/source/control/throbber.ilst
+++ /dev/null
@@ -1,30 +0,0 @@
-%MODULE%/vcl/res/spinner-16-01.png
-%MODULE%/vcl/res/spinner-16-02.png
-%MODULE%/vcl/res/spinner-16-03.png
-%MODULE%/vcl/res/spinner-16-04.png
-%MODULE%/vcl/res/spinner-16-05.png
-%MODULE%/vcl/res/spinner-16-06.png
-%MODULE%/vcl/res/spinner-32-01.png
-%MODULE%/vcl/res/spinner-32-02.png
-%MODULE%/vcl/res/spinner-32-03.png
-%MODULE%/vcl/res/spinner-32-04.png
-%MODULE%/vcl/res/spinner-32-05.png
-%MODULE%/vcl/res/spinner-32-06.png
-%MODULE%/vcl/res/spinner-32-07.png
-%MODULE%/vcl/res/spinner-32-08.png
-%MODULE%/vcl/res/spinner-32-09.png
-%MODULE%/vcl/res/spinner-32-10.png
-%MODULE%/vcl/res/spinner-32-11.png
-%MODULE%/vcl/res/spinner-32-12.png
-%MODULE%/vcl/res/spinner-64-01.png
-%MODULE%/vcl/res/spinner-64-02.png
-%MODULE%/vcl/res/spinner-64-03.png
-%MODULE%/vcl/res/spinner-64-04.png
-%MODULE%/vcl/res/spinner-64-05.png
-%MODULE%/vcl/res/spinner-64-06.png
-%MODULE%/vcl/res/spinner-64-07.png
-%MODULE%/vcl/res/spinner-64-08.png
-%MODULE%/vcl/res/spinner-64-09.png
-%MODULE%/vcl/res/spinner-64-10.png
-%MODULE%/vcl/res/spinner-64-11.png
-%MODULE%/vcl/res/spinner-64-12.png
diff --git a/vcl/source/src/images.src b/vcl/source/src/images.src
deleted file mode 100644
index 10b0eb7bf292..000000000000
--- a/vcl/source/src/images.src
+++ /dev/null
@@ -1,437 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include <svids.hrc>
-
-Bitmap SV_RESID_BITMAP_CHECK1
-{
-    File = "check1.png";
-};
-
-Bitmap SV_RESID_BITMAP_CHECK2
-{
-    File = "check2.png";
-};
-
-Bitmap SV_RESID_BITMAP_CHECK3
-{
-    File = "check3.png";
-};
-
-Bitmap SV_RESID_BITMAP_CHECK4
-{
-    File = "check4.png";
-};
-
-Bitmap SV_RESID_BITMAP_CHECK5
-{
-    File = "check5.png";
-};
-
-Bitmap SV_RESID_BITMAP_CHECK6
-{
-    File = "check6.png";
-};
-
-Bitmap SV_RESID_BITMAP_CHECK7
-{
-    File = "check7.png";
-};
-
-Bitmap SV_RESID_BITMAP_CHECK8
-{
-    File = "check8.png";
-};
-
-Bitmap SV_RESID_BITMAP_CHECK9
-{
-    File = "check9.png";
-};
-
-Bitmap SV_RESID_BITMAP_CHECKMONO1
-{
-    File = "checkmono1.png";
-};
-
-Bitmap SV_RESID_BITMAP_CHECKMONO2
-{
-    File = "checkmono2.png";
-};
-
-Bitmap SV_RESID_BITMAP_CHECKMONO3
-{
-    File = "checkmono3.png";
-};
-
-Bitmap SV_RESID_BITMAP_CHECKMONO4
-{
-    File = "checkmono4.png";
-};
-
-Bitmap SV_RESID_BITMAP_CHECKMONO5
-{
-    File = "checkmono5.png";
-};
-
-Bitmap SV_RESID_BITMAP_CHECKMONO6
-{
-    File = "checkmono6.png";
-};
-
-Bitmap SV_RESID_BITMAP_CHECKMONO7
-{
-    File = "checkmono7.png";
-};
-
-Bitmap SV_RESID_BITMAP_CHECKMONO8
-{
-    File = "checkmono8.png";
-};
-
-Bitmap SV_RESID_BITMAP_CHECKMONO9
-{
-    File = "checkmono9.png";
-};
-
-Bitmap SV_RESID_BITMAP_SCROLLVH
-{
-    File = "scrollvh.png";
-};
-
-Bitmap SV_RESID_BITMAP_SCROLLV
-{
-    File = "scrollv.png";
-};
-
-Bitmap SV_RESID_BITMAP_SCROLLH
-{
-    File = "scrollh.png";
-};
-
-Bitmap SV_RESID_BITMAP_WHEELVH
-{
-    File = "wheelvh.png";
-};
-
-Bitmap SV_RESID_BITMAP_WHEELV
-{
-    File = "wheelv.png";
-};
-
-Bitmap SV_RESID_BITMAP_WHEELH
-{
-    File = "wheelh.png";
-};
-
-Bitmap SV_RESID_BITMAP_SCROLLMSK
-{
-    File = "scrmsk.png";
-};
-
-Bitmap SV_RESID_BITMAP_RADIO1
-{
-    File = "radio1.png";
-};
-
-Bitmap SV_RESID_BITMAP_RADIO2
-{
-    File = "radio2.png";
-};
-
-Bitmap SV_RESID_BITMAP_RADIO3
-{
-    File = "radio3.png";
-};
-
-Bitmap SV_RESID_BITMAP_RADIO4
-{
-    File = "radio4.png";
-};
-
-Bitmap SV_RESID_BITMAP_RADIO5
-{
-    File = "radio5.png";
-};
-
-Bitmap SV_RESID_BITMAP_RADIO6
-{
-    File = "radio6.png";
-};
-
-Bitmap SV_RESID_BITMAP_RADIOMONO1
-{
-    File = "radiomono1.png";
-};
-
-Bitmap SV_RESID_BITMAP_RADIOMONO2
-{
-    File = "radiomono2.png";
-};
-
-Bitmap SV_RESID_BITMAP_RADIOMONO3
-{
-    File = "radiomono3.png";
-};
-
-Bitmap SV_RESID_BITMAP_RADIOMONO4
-{
-    File = "radiomono4.png";
-};
-
-Bitmap SV_RESID_BITMAP_RADIOMONO5
-{
-    File = "radiomono5.png";
-};
-
-Bitmap SV_RESID_BITMAP_RADIOMONO6
-{
-    File = "radiomono6.png";
-};
-
-Bitmap SV_RESID_BITMAP_ERRORBOX
-{
-    File = "errorbox.png";
-};
-
-Bitmap SV_RESID_BITMAP_WARNINGBOX
-{
-    File = "warningbox.png";
-};
-
-Bitmap SV_RESID_BITMAP_QUERYBOX
-{
-    File = "querybox.png";
-};
-
-Bitmap SV_RESID_BITMAP_INFOBOX
-{
-    File = "infobox.png";
-};
-
-Bitmap SV_RESID_BITMAP_CLOSEDOC
-{
-    File = "closedoc.png";
-};
-
-Bitmap SV_RESID_BITMAP_INDEX
-{
-    File = "index.png";
-};
-
-Bitmap SV_RESID_BITMAP_REFRESH
-{
-    File = "reload.png";
-};
-
-Bitmap (SV_ICON_SIZE48_START)
-{
-    File = "mainapp_48_8.png" ;
-};
-
-Bitmap (SV_ICON_SIZE32_START)
-{
-    File = "mainapp_32_8.png" ;
-};
-
-Bitmap (SV_ICON_SIZE16_START)
-{
-    File = "mainapp_16_8.png" ;
-};
-
-Bitmap (SV_ICON_SIZE48_START + SV_ICON_ID_OFFICE)
-{
-    File = "mainapp_48_8.png" ;
-};
-
-Bitmap (SV_ICON_SIZE32_START + SV_ICON_ID_OFFICE)
-{
-    File = "mainapp_32_8.png" ;
-};
-
-Bitmap (SV_ICON_SIZE16_START + SV_ICON_ID_OFFICE)
-{
-    File = "mainapp_16_8.png" ;
-};
-
-Bitmap (SV_ICON_SIZE48_START + SV_ICON_ID_TEXT)
-{
-    File = "odt_48_8.png" ;
-};
-
-Bitmap (SV_ICON_SIZE32_START + SV_ICON_ID_TEXT)
-{
-    File = "odt_32_8.png" ;
-};
-
-Bitmap (SV_ICON_SIZE16_START + SV_ICON_ID_TEXT)
-{
-    File = "odt_16_8.png" ;
-};
-
-Bitmap (SV_ICON_SIZE48_START + SV_ICON_ID_TEXT_TEMPLATE)
-{
-    File = "ott_48_8.png" ;
-};
-
-Bitmap (SV_ICON_SIZE32_START + SV_ICON_ID_TEXT_TEMPLATE)
-{
-    File = "ott_32_8.png" ;
-};
-
-Bitmap (SV_ICON_SIZE16_START + SV_ICON_ID_TEXT_TEMPLATE)
-{
-    File = "ott_16_8.png" ;
-};
-
-Bitmap (SV_ICON_SIZE48_START + SV_ICON_ID_SPREADSHEET)
-{
-    File = "ods_48_8.png" ;
-};
-
-Bitmap (SV_ICON_SIZE32_START + SV_ICON_ID_SPREADSHEET)
-{
-    File = "ods_32_8.png" ;
-};
-
-Bitmap (SV_ICON_SIZE16_START + SV_ICON_ID_SPREADSHEET)
-{
-    File = "ods_16_8.png" ;
-};
-
-Bitmap (SV_ICON_SIZE48_START + SV_ICON_ID_SPREADSHEET_TEMPLATE)
-{
-    File = "ots_48_8.png" ;
-};
-
-Bitmap (SV_ICON_SIZE32_START + SV_ICON_ID_SPREADSHEET_TEMPLATE)
-{
-    File = "ots_32_8.png" ;
-};
-
-Bitmap (SV_ICON_SIZE16_START + SV_ICON_ID_SPREADSHEET_TEMPLATE)
-{
-    File = "ots_16_8.png" ;
-};
-
-Bitmap (SV_ICON_SIZE48_START + SV_ICON_ID_DRAWING)
-{
-    File = "odg_48_8.png" ;
-};
-
-Bitmap (SV_ICON_SIZE32_START + SV_ICON_ID_DRAWING)
-{
-    File = "odg_32_8.png" ;
-};
-
-Bitmap (SV_ICON_SIZE16_START + SV_ICON_ID_DRAWING)
-{
-    File = "odg_16_8.png" ;
-};
-
-Bitmap (SV_ICON_SIZE48_START + SV_ICON_ID_PRESENTATION)
-{
-    File = "odp_48_8.png" ;
-};
-
-Bitmap (SV_ICON_SIZE32_START + SV_ICON_ID_PRESENTATION)
-{
-    File = "odp_32_8.png" ;
-};
-
-Bitmap (SV_ICON_SIZE16_START + SV_ICON_ID_PRESENTATION)
-{
-    File = "odp_16_8.png" ;
-};
-
-Bitmap (SV_ICON_SIZE48_START + SV_ICON_ID_MASTER_DOCUMENT)
-{
-    File = "odm_48_8.png" ;
-};
-
-Bitmap (SV_ICON_SIZE32_START + SV_ICON_ID_MASTER_DOCUMENT)
-{
-    File = "odm_32_8.png" ;
-};
-
-Bitmap (SV_ICON_SIZE16_START + SV_ICON_ID_MASTER_DOCUMENT)
-{
-    File = "odm_16_8.png" ;
-};
-
-Bitmap (SV_ICON_SIZE48_START + SV_ICON_ID_DATABASE)
-{
-    File = "odb_48_8.png" ;
-};
-
-Bitmap (SV_ICON_SIZE32_START + SV_ICON_ID_DATABASE)
-{
-    File = "odb_32_8.png" ;
-};
-
-Bitmap (SV_ICON_SIZE16_START + SV_ICON_ID_DATABASE)
-{
-    File = "odb_16_8.png" ;
-};
-
-Bitmap (SV_ICON_SIZE48_START + SV_ICON_ID_FORMULA)
-{
-    File = "odf_48_8.png" ;
-};
-
-Bitmap (SV_ICON_SIZE32_START + SV_ICON_ID_FORMULA)
-{
-    File = "odf_32_8.png" ;
-};
-
-Bitmap (SV_ICON_SIZE16_START + SV_ICON_ID_FORMULA)
-{
-    File = "odf_16_8.png" ;
-};
-
-Bitmap (SV_ICON_SIZE48_START + SV_ICON_ID_TEMPLATE)
-{
-    File = "mainapp_48_8.png" ;
-};
-
-Bitmap (SV_ICON_SIZE32_START + SV_ICON_ID_TEMPLATE)
-{
-    File = "mainapp_32_8.png" ;
-};
-
-Bitmap (SV_ICON_SIZE16_START + SV_ICON_ID_TEMPLATE)
-{
-    File = "mainapp_16_8.png" ;
-};
-
-Bitmap SV_DISCLOSURE_PLUS
-{
-    File = "plus.png";
-};
-
-Bitmap SV_DISCLOSURE_MINUS
-{
-    File = "minus.png";
-};
-
-Bitmap SV_RESID_BITMAP_NOTEBOOKBAR
-{
-    File = "notebookbar.png";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/src/print.src b/vcl/source/src/print.src
index 13db4a38c68b..160602f6e72e 100644
--- a/vcl/source/src/print.src
+++ b/vcl/source/src/print.src
@@ -95,16 +95,6 @@ String SV_PRINT_PRINTPREVIEW_TXT
     Text [en-US] = "Print preview";
 };
 
-Bitmap SV_PRINT_COLLATE_BMP
-{
-    File = "collate.png" ;
-};
-
-Bitmap SV_PRINT_NOCOLLATE_BMP
-{
-    File = "ncollate.png" ;
-};
-
 String SV_PRINT_QUERYFAXNUMBER_TXT
 {
     Text [ en-US ] = "Please enter the fax number";
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 4e9901cc3bc4..d01f87e4a75e 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -38,6 +38,7 @@
 #include <vcl/slider.hxx>
 #include <vcl/commandinfoprovider.hxx>
 #include <svdata.hxx>
+#include <bitmaps.hlst>
 #include <svids.hrc>
 #include <window.h>
 #include <xmlreader/xmlreader.hxx>
@@ -48,14 +49,13 @@
 
 namespace
 {
-    sal_uInt16 mapStockToImageResource(const OString& sType)
+    OUString mapStockToImageResource(const OString& sType)
     {
-        sal_uInt16 nRet = 0;
         if (sType == "gtk-index")
-            nRet = SV_RESID_BITMAP_INDEX;
+            return OUString(SV_RESID_BITMAP_INDEX);
         else if (sType == "gtk-refresh")
-            nRet = SV_RESID_BITMAP_REFRESH;
-        return nRet;
+            return OUString(SV_RESID_BITMAP_REFRESH);
+        return OUString();
     }
 
     SymbolType mapStockToSymbol(const OString& sType)
@@ -87,7 +87,7 @@ namespace
             eRet = SymbolType::HELP;
         else if (sType == "gtk-close")
             eRet = SymbolType::CLOSE;
-        else if (mapStockToImageResource(sType))
+        else if (!mapStockToImageResource(sType).isEmpty())
             eRet = SymbolType::IMAGE;
         return eRet;
     }
@@ -422,7 +422,7 @@ VclBuilder::VclBuilder(vcl::Window *pParent, const OUString& sUIDir, const OUStr
                 SAL_WARN_IF(eType != SymbolType::IMAGE, "vcl.layout", "inimplemented symbol type for radiobuttons");
             if (eType == SymbolType::IMAGE)
             {
-                Bitmap aBitmap(VclResId(mapStockToImageResource(rImageInfo.m_sStock)));
+                BitmapEx aBitmap(mapStockToImageResource(rImageInfo.m_sStock));
                 Image const aImage(aBitmap);
                 if (!aI->m_bRadio)
                     pTargetButton->SetModeImage(aImage);
diff --git a/vcl/source/window/menubarwindow.cxx b/vcl/source/window/menubarwindow.cxx
index e1f50c0b5632..46c453edb737 100644
--- a/vcl/source/window/menubarwindow.cxx
+++ b/vcl/source/window/menubarwindow.cxx
@@ -29,6 +29,7 @@
 #include <salmenu.hxx>
 #include <svdata.hxx>
 #include <svids.hrc>
+#include <bitmaps.hlst>
 #include <window.h>
 
 // document closing button
@@ -58,12 +59,8 @@ void DecoToolBox::calcMinSize()
     ScopedVclPtrInstance<ToolBox> aTbx( GetParent() );
     if( GetItemCount() == 0 )
     {
-        ResMgr* pResMgr = ImplGetResMgr();
-
-        Bitmap aBitmap;
-        if( pResMgr )
-            aBitmap = Bitmap( ResId( SV_RESID_BITMAP_CLOSEDOC, *pResMgr ) );
-        aTbx->InsertItem( IID_DOCUMENTCLOSE, Image( aBitmap ) );
+        BitmapEx aBitmap(SV_RESID_BITMAP_CLOSEDOC);
+        aTbx->InsertItem(IID_DOCUMENTCLOSE, Image(aBitmap));
     }
     else
     {
@@ -132,7 +129,7 @@ MenuBarWindow::MenuBarWindow( vcl::Window* pParent ) :
 
     if(pResMgr)
     {
-        BitmapEx aBitmap(ResId(SV_RESID_BITMAP_CLOSEDOC, *pResMgr));
+        BitmapEx aBitmap(SV_RESID_BITMAP_CLOSEDOC);
         aCloseBtn->maImage = Image(aBitmap);
 
         aCloseBtn->SetOutStyle(TOOLBOX_STYLE_FLAT);
diff --git a/vcl/source/window/msgbox.cxx b/vcl/source/window/msgbox.cxx
index ef98a62246d1..ac5133506449 100644
--- a/vcl/source/window/msgbox.cxx
+++ b/vcl/source/window/msgbox.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <svids.hrc>
+#include <bitmaps.hlst>
 #include <svdata.hxx>
 #include <brdwin.hxx>
 #include <window.h>
@@ -38,14 +39,10 @@ static void ImplInitMsgBoxImageList()
     ImplSVData* pSVData = ImplGetSVData();
     if (pSVData->maWinData.maMsgBoxImgList.empty())
     {
-        ResMgr* pResMgr = ImplGetResMgr();
-        if (pResMgr)
-        {
-            pSVData->maWinData.maMsgBoxImgList.push_back(Image(BitmapEx(ResId(SV_RESID_BITMAP_ERRORBOX, *pResMgr))));
-            pSVData->maWinData.maMsgBoxImgList.push_back(Image(BitmapEx(ResId(SV_RESID_BITMAP_QUERYBOX, *pResMgr))));
-            pSVData->maWinData.maMsgBoxImgList.push_back(Image(BitmapEx(ResId(SV_RESID_BITMAP_WARNINGBOX, *pResMgr))));
-            pSVData->maWinData.maMsgBoxImgList.push_back(Image(BitmapEx(ResId(SV_RESID_BITMAP_INFOBOX, *pResMgr))));
-        }
+        pSVData->maWinData.maMsgBoxImgList.push_back(Image(BitmapEx(SV_RESID_BITMAP_ERRORBOX)));
+        pSVData->maWinData.maMsgBoxImgList.push_back(Image(BitmapEx(SV_RESID_BITMAP_QUERYBOX)));
+        pSVData->maWinData.maMsgBoxImgList.push_back(Image(BitmapEx(SV_RESID_BITMAP_WARNINGBOX)));
+        pSVData->maWinData.maMsgBoxImgList.push_back(Image(BitmapEx(SV_RESID_BITMAP_INFOBOX)));
     }
 }
 
diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx
index 0e70173de74c..f793b852e4da 100644
--- a/vcl/source/window/printdlg.cxx
+++ b/vcl/source/window/printdlg.cxx
@@ -20,6 +20,7 @@
 #include "printdlg.hxx"
 #include "svdata.hxx"
 #include "svids.hrc"
+#include "bitmaps.hlst"
 
 #include <vcl/print.hxx>
 #include <vcl/dialog.hxx>
@@ -475,8 +476,8 @@ void PrintDialog::NUpTabPage::initFromMultiPageSetup( const vcl::PrinterControll
 }
 
 PrintDialog::JobTabPage::JobTabPage( VclBuilder* pUIBuilder )
-    : maCollateBmp(VclResId(SV_PRINT_COLLATE_BMP))
-    , maNoCollateBmp(VclResId(SV_PRINT_NOCOLLATE_BMP))
+    : maCollateBmp(SV_PRINT_COLLATE_BMP)
+    , maNoCollateBmp(SV_PRINT_NOCOLLATE_BMP)
     , mnCollateUIMode(0)
 {
     pUIBuilder->get(mpPrinters, "printers");
diff --git a/vcl/source/window/scrwnd.cxx b/vcl/source/window/scrwnd.cxx
index a904064348f0..1d5f6f1dfcdd 100644
--- a/vcl/source/window/scrwnd.cxx
+++ b/vcl/source/window/scrwnd.cxx
@@ -22,6 +22,7 @@
 #include <tools/debug.hxx>
 
 #include <svids.hrc>
+#include <bitmaps.hlst>
 #include <svdata.hxx>
 #include <scrwnd.hxx>
 
@@ -59,11 +60,8 @@ ImplWheelWindow::ImplWheelWindow( vcl::Window* pParent ) :
     // create wheel window
     SetTitleType( FloatWinTitleType::NONE );
     ImplCreateImageList();
-    ResMgr* pResMgr = ImplGetResMgr();
-    Bitmap aBmp;
-    if( pResMgr )
-        aBmp = Bitmap( ResId( SV_RESID_BITMAP_SCROLLMSK, *pResMgr ) );
-    ImplSetRegion( aBmp );
+    BitmapEx aBmp(SV_RESID_BITMAP_SCROLLMSK);
+    ImplSetRegion(aBmp.GetBitmap());
 
     // set wheel mode
     if( bHorz && bVert )
@@ -121,16 +119,12 @@ void ImplWheelWindow::ImplSetRegion( const Bitmap& rRegionBmp )
 
 void ImplWheelWindow::ImplCreateImageList()
 {
-    ResMgr* pResMgr = ImplGetResMgr();
-    if (pResMgr)
-    {
-        maImgList.push_back(Image(BitmapEx(ResId(SV_RESID_BITMAP_SCROLLVH, *pResMgr))));
-        maImgList.push_back(Image(BitmapEx(ResId(SV_RESID_BITMAP_SCROLLV, *pResMgr))));
-        maImgList.push_back(Image(BitmapEx(ResId(SV_RESID_BITMAP_SCROLLH, *pResMgr))));
-        maImgList.push_back(Image(BitmapEx(ResId(SV_RESID_BITMAP_WHEELVH, *pResMgr))));
-        maImgList.push_back(Image(BitmapEx(ResId(SV_RESID_BITMAP_WHEELV, *pResMgr))));
-        maImgList.push_back(Image(BitmapEx(ResId(SV_RESID_BITMAP_WHEELH, *pResMgr))));
-    }
+    maImgList.push_back(Image(BitmapEx(SV_RESID_BITMAP_SCROLLVH)));
+    maImgList.push_back(Image(BitmapEx(SV_RESID_BITMAP_SCROLLV)));
+    maImgList.push_back(Image(BitmapEx(SV_RESID_BITMAP_SCROLLH)));
+    maImgList.push_back(Image(BitmapEx(SV_RESID_BITMAP_WHEELVH)));
+    maImgList.push_back(Image(BitmapEx(SV_RESID_BITMAP_WHEELV)));
+    maImgList.push_back(Image(BitmapEx(SV_RESID_BITMAP_WHEELH)));
 }
 
 void ImplWheelWindow::ImplSetWheelMode( WheelMode nWheelMode )