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>

22 files changed, 124 insertions, 354 deletions

diff --git a/cui/AllLangResTarget_cui.mk b/cui/AllLangResTarget_cui.mk
index f5e1a981189a..ac6db418161b 100644
--- a/cui/AllLangResTarget_cui.mk
+++ b/cui/AllLangResTarget_cui.mk
@@ -52,8 +52,4 @@ $(eval $(call gb_SrsTarget_add_files,cui/res,\
     cui/source/tabpages/strings.src \
 ))
 
-$(eval $(call gb_SrsTarget_add_nonlocalizable_files,cui/res,\
-    cui/source/tabpages/align.src \
-))
-
 # vim: set noet sw=4 ts=4:
diff --git a/cui/Library_cui.mk b/cui/Library_cui.mk
index 74fbc31f0c24..813bff0eba0c 100644
--- a/cui/Library_cui.mk
+++ b/cui/Library_cui.mk
@@ -13,6 +13,7 @@ $(eval $(call gb_Library_set_componentfile,cui,cui/util/cui))
 
 $(eval $(call gb_Library_set_include,cui,\
     $$(INCLUDE) \
+    -I$(SRCDIR)/cui/inc \
     -I$(SRCDIR)/cui/source/inc \
 ))
 
diff --git a/cui/inc/bitmaps.hlst b/cui/inc/bitmaps.hlst
new file mode 100644
index 000000000000..075e05e94d10
--- /dev/null
+++ b/cui/inc/bitmaps.hlst
@@ -0,0 +1,69 @@
+/* -*- 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_CUI_INC_BITMAPS_HRC
+#define INCLUDED_CUI_INC_BITMAPS_HRC
+
+#define RID_SVXBMP_CELL_NONE            "svx/res/pr01.png"
+#define RID_SVXBMP_CELL_ALL             "svx/res/pr02.png"
+#define RID_SVXBMP_CELL_LR              "svx/res/pr03.png"
+#define RID_SVXBMP_CELL_TB              "svx/res/pr04.png"
+#define RID_SVXBMP_CELL_L               "svx/res/pr05.png"
+#define RID_SVXBMP_CELL_DIAG            "svx/res/pr06.png"
+#define RID_SVXBMP_HOR_NONE             "svx/res/pr07.png"
+#define RID_SVXBMP_HOR_OUTER            "svx/res/pr08.png"
+#define RID_SVXBMP_HOR_HOR              "svx/res/pr09.png"
+#define RID_SVXBMP_HOR_ALL              "svx/res/pr010.png"
+#define RID_SVXBMP_HOR_OUTER2           "svx/res/pr011.png"
+#define RID_SVXBMP_VER_NONE             "svx/res/pr012.png"
+#define RID_SVXBMP_VER_OUTER            "svx/res/pr013.png"
+#define RID_SVXBMP_VER_VER              "svx/res/pr014.png"
+#define RID_SVXBMP_VER_ALL              "svx/res/pr015.png"
+#define RID_SVXBMP_VER_OUTER2           "svx/res/pr016.png"
+#define RID_SVXBMP_TABLE_NONE           "svx/res/pr017.png"
+#define RID_SVXBMP_TABLE_OUTER          "svx/res/pr018.png"
+#define RID_SVXBMP_TABLE_OUTERH         "svx/res/pr019.png"
+#define RID_SVXBMP_TABLE_ALL            "svx/res/pr020.png"
+#define RID_SVXBMP_TABLE_OUTER2         "svx/res/pr021.png"
+#define RID_SVXBMP_SHADOWNONE           "svx/res/sh01.png"
+#define RID_SVXBMP_SHADOW_BOT_RIGHT     "svx/res/sh02.png"
+#define RID_SVXBMP_SHADOW_BOT_LEFT      "svx/res/sh03.png"
+#define RID_SVXBMP_SHADOW_TOP_RIGHT     "svx/res/sh04.png"
+#define RID_SVXBMP_SHADOW_TOP_LEFT      "svx/res/sh05.png"
+
+#define RID_SVXBMP_BOTTOMLOCK           "svx/res/lo01.png"
+#define RID_SVXBMP_TOPLOCK              "svx/res/lo02.png"
+#define RID_SVXBMP_CELLLOCK             "svx/res/lo03.png"
+
+#define RID_SVXBMP_LOCK                 "res/lock.png"
+
+#define RID_SVXBMP_THEME_NORMAL_BIG     "svx/res/galnorl.png"
+#define RID_SVXBMP_THEME_READONLY_BIG   "svx/res/galrdol.png"
+#define RID_SVXBMP_THEME_DEFAULT_BIG    "svx/res/galdefl.png"
+
+#define RID_CUIBMP_HARDDISK             "res/harddisk_16.png"
+#define RID_CUIBMP_LIB                  "res/im30820.png"
+#define RID_CUIBMP_MACRO                "res/im30821.png"
+#define RID_CUIBMP_DOC                  "res/im30826.png"
+#define RID_CUIBMP_COLLAPSED            "res/plus.png"
+#define RID_CUIBMP_EXPANDED             "res/minus.png"
+
+#define RID_SVXBMP_HLINETTP             "res/hlinettp.png"
+#define RID_SVXBMP_HLMAILTP             "res/hlmailtp.png"
+#define RID_SVXBMP_HLDOCTP              "res/hldoctp.png"
+#define RID_SVXBMP_HLDOCNTP             "res/hldocntp.png"
+#define RID_SVXBMP_SCRIPT               "res/script.png"
+#define RID_SVXBMP_ADRESSBOOK           "res/adrbook.png"
+#define RID_SVXBMP_FILEOPEN             "res/fileopen.png"
+#define RID_SVXBMP_TARGET               "res/target.png"
+#define RID_SVXBMP_NEWDOC               "res/newdoc.png"
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx
index 8e47238ca3ee..8ca7a614b315 100644
--- a/cui/source/customize/cfgutil.cxx
+++ b/cui/source/customize/cfgutil.cxx
@@ -46,6 +46,7 @@
 #include <basic/basmgr.hxx>
 #include <tools/urlobj.hxx>
 #include "cuires.hrc"
+#include "bitmaps.hlst"
 #include <sfx2/app.hxx>
 #include <sfx2/minfitem.hxx>
 #include <comphelper/documentinfo.hxx>
@@ -354,17 +355,17 @@ struct SvxConfigGroupBoxResource_Impl
 };
 
 SvxConfigGroupBoxResource_Impl::SvxConfigGroupBoxResource_Impl() :
-    m_hdImage(BitmapEx(CUI_RES(RID_CUIBMP_HARDDISK))),
-    m_libImage(BitmapEx(CUI_RES(RID_CUIBMP_LIB))),
-    m_macImage(BitmapEx(CUI_RES(RID_CUIBMP_MACRO))),
-    m_docImage(BitmapEx(CUI_RES(RID_CUIBMP_DOC))),
+    m_hdImage(BitmapEx(RID_CUIBMP_HARDDISK)),
+    m_libImage(BitmapEx(RID_CUIBMP_LIB)),
+    m_macImage(BitmapEx(RID_CUIBMP_MACRO)),
+    m_docImage(BitmapEx(RID_CUIBMP_DOC)),
     m_sMyMacros(CUI_RESSTR(RID_SVXSTR_MYMACROS)),
     m_sProdMacros(CUI_RESSTR(RID_SVXSTR_PRODMACROS)),
     m_sMacros(CUI_RESSTR(RID_SVXSTR_BASICMACROS)),
     m_sDlgMacros(CUI_RESSTR(RID_SVXSTR_PRODMACROS)),
     m_aStrGroupStyles(CUI_RESSTR(RID_SVXSTR_GROUP_STYLES)),
-    m_collapsedImage(BitmapEx(CUI_RES(RID_CUIBMP_COLLAPSED))),
-    m_expandedImage(BitmapEx(CUI_RES(RID_CUIBMP_EXPANDED)))
+    m_collapsedImage(BitmapEx(RID_CUIBMP_COLLAPSED)),
+    m_expandedImage(BitmapEx(RID_CUIBMP_EXPANDED))
 {
 }
 
diff --git a/cui/source/customize/selector.cxx b/cui/source/customize/selector.cxx
index 1b3fd74c19a5..55635acd8449 100644
--- a/cui/source/customize/selector.cxx
+++ b/cui/source/customize/selector.cxx
@@ -29,6 +29,7 @@
 #include <svx/fmresids.hrc>
 #include <svx/dialmgr.hxx>
 #include <cuires.hrc>
+#include <bitmaps.hlst>
 #include <sfx2/app.hxx>
 #include <sfx2/msg.hxx>
 #include <sfx2/msgpool.hxx>
@@ -202,10 +203,10 @@ SvxConfigGroupListBox::SvxConfigGroupListBox(vcl::Window* pParent, WinBits nStyl
     , m_bShowSlots(false)
     , pFunctionListBox(nullptr)
     , m_pImageProvider(nullptr)
-    , m_hdImage(BitmapEx(CUI_RES(RID_CUIBMP_HARDDISK)))
-    , m_libImage(BitmapEx(CUI_RES(RID_CUIBMP_LIB)))
-    , m_macImage(BitmapEx(CUI_RES(RID_CUIBMP_MACRO)))
-    , m_docImage(BitmapEx(CUI_RES(RID_CUIBMP_DOC)))
+    , m_hdImage(BitmapEx(RID_CUIBMP_HARDDISK))
+    , m_libImage(BitmapEx(RID_CUIBMP_LIB))
+    , m_macImage(BitmapEx(RID_CUIBMP_MACRO))
+    , m_docImage(BitmapEx(RID_CUIBMP_DOC))
     , m_sMyMacros(CUI_RESSTR(RID_SVXSTR_MYMACROS))
     , m_sProdMacros(CUI_RESSTR(RID_SVXSTR_PRODMACROS))
 {
diff --git a/cui/source/dialogs/cuihyperdlg.cxx b/cui/source/dialogs/cuihyperdlg.cxx
index 3754d5c12645..8c023fde7861 100644
--- a/cui/source/dialogs/cuihyperdlg.cxx
+++ b/cui/source/dialogs/cuihyperdlg.cxx
@@ -24,6 +24,7 @@
 #include "hlmailtp.hxx"
 #include "hldoctp.hxx"
 #include "hldocntp.hxx"
+#include "bitmaps.hlst"
 #include <svx/svxids.hrc>
 #include <vector>
 
@@ -86,10 +87,10 @@ SvxHpLinkDlg::SvxHpLinkDlg (vcl::Window* pParent, SfxBindings* pBindings)
     std::vector<Image> imgVector;
     OUString aStrTitle;
     SvxIconChoiceCtrlEntry *pEntry;
-    imgVector.push_back(Image(BitmapEx(CUI_RES(RID_SVXBMP_HLINETTP))));
-    imgVector.push_back(Image(BitmapEx(CUI_RES(RID_SVXBMP_HLMAILTP))));
-    imgVector.push_back(Image(BitmapEx(CUI_RES(RID_SVXBMP_HLDOCTP))));
-    imgVector.push_back(Image(BitmapEx(CUI_RES(RID_SVXBMP_HLDOCNTP))));
+    imgVector.push_back(Image(BitmapEx(RID_SVXBMP_HLINETTP)));
+    imgVector.push_back(Image(BitmapEx(RID_SVXBMP_HLMAILTP)));
+    imgVector.push_back(Image(BitmapEx(RID_SVXBMP_HLDOCTP)));
+    imgVector.push_back(Image(BitmapEx(RID_SVXBMP_HLDOCNTP)));
 
     for(Image &aImage : imgVector )
     {
diff --git a/cui/source/dialogs/cuires.src b/cui/source/dialogs/cuires.src
index 4ac3bc264043..5e43e24a21e6 100644
--- a/cui/source/dialogs/cuires.src
+++ b/cui/source/dialogs/cuires.src
@@ -70,36 +70,6 @@ String RID_SVXSTR_EDIT_GRAPHIC
     Text [ en-US ] = "Link" ;
 };
 
-Bitmap RID_CUIBMP_HARDDISK
-{
-    File = "harddisk_16.png";
-};
-
-Bitmap RID_CUIBMP_LIB
-{
-    File = "im30820.png";
-};
-
-Bitmap RID_CUIBMP_MACRO
-{
-    File = "im30821.png";
-};
-
-Bitmap RID_CUIBMP_DOC
-{
-    File = "im30826.png";
-};
-
-Bitmap RID_CUIBMP_COLLAPSED
-{
-    File = "plus.bmp" ;
-};
-
-Bitmap RID_CUIBMP_EXPANDED
-{
-    File = "minus.bmp" ;
-};
-
 String RID_SVXSTR_LOADACCELCONFIG
 {
     Text [ en-US ] = "Load Keyboard Configuration" ;
diff --git a/cui/source/dialogs/gallery.src b/cui/source/dialogs/gallery.src
index 6c68a7c2025d..43d94175a970 100644
--- a/cui/source/dialogs/gallery.src
+++ b/cui/source/dialogs/gallery.src
@@ -43,19 +43,4 @@ String RID_SVXSTR_GALLERY_ID_EXISTS
     Text [ en-US ] = "This ID already exists..." ;
 };
 
-Bitmap RID_SVXBMP_THEME_NORMAL_BIG
-{
-    File = "galnorl.png" ;
-};
-
-Bitmap RID_SVXBMP_THEME_READONLY_BIG
-{
-    File = "galrdol.png" ;
-};
-
-Bitmap RID_SVXBMP_THEME_DEFAULT_BIG
-{
-    File = "galdefl.png" ;
-};
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/dialogs/hldocntp.cxx b/cui/source/dialogs/hldocntp.cxx
index efe4ccc75969..34ca087432b1 100644
--- a/cui/source/dialogs/hldocntp.cxx
+++ b/cui/source/dialogs/hldocntp.cxx
@@ -38,6 +38,8 @@
 #include <com/sun/star/ui/dialogs/FolderPicker.hpp>
 #include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp>
 
+#include "bitmaps.hlst"
+
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::ui::dialogs;
 using namespace ::com::sun::star::uno;
@@ -105,7 +107,7 @@ SvxHyperlinkNewDocTp::SvxHyperlinkNewDocTp ( vcl::Window *pParent, IconChoiceDia
     get(m_pCbbPath, "path");
     m_pCbbPath->SetSmartProtocol(INetProtocol::File);
     get(m_pBtCreate, "create");
-    BitmapEx aBitmap(CUI_RES(RID_SVXBMP_NEWDOC));
+    BitmapEx aBitmap(RID_SVXBMP_NEWDOC);
     aBitmap.Scale(GetDPIScaleFactor(),GetDPIScaleFactor(),BmpScaleFlag::BestQuality );
     m_pBtCreate->SetModeImage(Image(aBitmap));
     get(m_pLbDocTypes, "types");
diff --git a/cui/source/dialogs/hldoctp.cxx b/cui/source/dialogs/hldoctp.cxx
index 5d970fe6c465..1c002d1035fb 100644
--- a/cui/source/dialogs/hldoctp.cxx
+++ b/cui/source/dialogs/hldoctp.cxx
@@ -24,6 +24,7 @@
 
 #include "hldoctp.hxx"
 #include "hlmarkwn_def.hxx"
+#include "bitmaps.hlst"
 
 sal_Char const sHash[]          = "#";
 sal_Char const sFileScheme[]    = INET_FILE_SCHEME;
@@ -41,13 +42,13 @@ SvxHyperlinkDocTp::SvxHyperlinkDocTp ( vcl::Window *pParent, IconChoiceDialog* p
     get(m_pCbbPath, "path");
     m_pCbbPath->SetSmartProtocol(INetProtocol::File);
     get(m_pBtFileopen, "fileopen");
-    BitmapEx aBitmap(CUI_RES(RID_SVXBMP_FILEOPEN));
+    BitmapEx aBitmap(RID_SVXBMP_FILEOPEN);
     aBitmap.Scale(GetDPIScaleFactor(),GetDPIScaleFactor(),BmpScaleFlag::BestQuality);
     m_pBtFileopen->SetModeImage(Image(aBitmap));
     get(m_pEdTarget, "target");
     get(m_pFtFullURL, "url");
     get(m_pBtBrowse, "browse");
-    aBitmap = BitmapEx(CUI_RES(RID_SVXBMP_TARGET));
+    aBitmap = BitmapEx(RID_SVXBMP_TARGET);
     aBitmap.Scale(GetDPIScaleFactor(),GetDPIScaleFactor(),BmpScaleFlag::BestQuality );
     m_pBtBrowse->SetModeImage(Image(aBitmap));
 
diff --git a/cui/source/dialogs/hlmailtp.cxx b/cui/source/dialogs/hlmailtp.cxx
index 3b617bd6205e..1edb472dd525 100644
--- a/cui/source/dialogs/hlmailtp.cxx
+++ b/cui/source/dialogs/hlmailtp.cxx
@@ -28,6 +28,7 @@
 #include <unotools/moduleoptions.hxx>
 
 #include "hlmailtp.hxx"
+#include "bitmaps.hlst"
 
 using namespace ::com::sun::star;
 
@@ -44,7 +45,7 @@ SvxHyperlinkMailTp::SvxHyperlinkMailTp ( vcl::Window *pParent, IconChoiceDialog*
     get(m_pCbbReceiver, "receiver");
     m_pCbbReceiver->SetSmartProtocol(INetProtocol::Mailto);
     get(m_pBtAdrBook, "adressbook");
-    BitmapEx aBitmap(CUI_RES(RID_SVXBMP_ADRESSBOOK));
+    BitmapEx aBitmap(RID_SVXBMP_ADRESSBOOK);
     aBitmap.Scale(GetDPIScaleFactor(),GetDPIScaleFactor(),BmpScaleFlag::BestQuality );
     m_pBtAdrBook->SetModeImage(Image(aBitmap));
     get(m_pFtSubject, "subject_label");
diff --git a/cui/source/dialogs/hltpbase.cxx b/cui/source/dialogs/hltpbase.cxx
index f8370ef242e5..e85226c9c1e1 100644
--- a/cui/source/dialogs/hltpbase.cxx
+++ b/cui/source/dialogs/hltpbase.cxx
@@ -32,6 +32,7 @@
 #include "macroass.hxx"
 #include <svx/svxdlg.hxx>
 #include <cuires.hrc>
+#include <bitmaps.hlst>
 #include <vcl/builderfactory.hxx>
 
 using namespace ::ucbhelper;
@@ -173,7 +174,7 @@ void SvxHyperlinkTabPageBase::InitStdControls ()
         get(mpEdIndication, "indication");
         get(mpEdText, "name");
         get(mpBtScript, "script");
-        BitmapEx aBitmap(CUI_RES(RID_SVXBMP_SCRIPT));
+        BitmapEx aBitmap(RID_SVXBMP_SCRIPT);
         aBitmap.Scale(GetDPIScaleFactor(),GetDPIScaleFactor(),BmpScaleFlag::BestQuality );
         mpBtScript->SetModeImage(Image(aBitmap));
 
diff --git a/cui/source/dialogs/hyperdlg.src b/cui/source/dialogs/hyperdlg.src
index 0641d7c21dba..ff3bd695ada8 100644
--- a/cui/source/dialogs/hyperdlg.src
+++ b/cui/source/dialogs/hyperdlg.src
@@ -94,49 +94,4 @@ String RID_SVXSTR_HYPERDLG_QUERYOVERWRITE
     Text [ en-US ] = "The file already exists. Overwrite?" ;
 };
 
-Bitmap RID_SVXBMP_HLINETTP
-{
-    File = "hlinettp.png";
-};
-
-Bitmap RID_SVXBMP_HLMAILTP
-{
-    File = "hlmailtp.png";
-};
-
-Bitmap RID_SVXBMP_HLDOCTP
-{
-    File = "hldoctp.png";
-};
-
-Bitmap RID_SVXBMP_HLDOCNTP
-{
-    File = "hldocntp.png";
-};
-
-Bitmap RID_SVXBMP_SCRIPT
-{
-    File = "script.png";
-};
-
-Bitmap RID_SVXBMP_ADRESSBOOK
-{
-    File = "adrbook.png";
-};
-
-Bitmap RID_SVXBMP_FILEOPEN
-{
-    File = "fileopen.png";
-};
-
-Bitmap RID_SVXBMP_TARGET
-{
-    File = "target.png";
-};
-
-Bitmap RID_SVXBMP_NEWDOC
-{
-    File = "newdoc.png";
-};
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx
index ffe0f300e6ab..438c87b50957 100644
--- a/cui/source/dialogs/scriptdlg.cxx
+++ b/cui/source/dialogs/scriptdlg.cxx
@@ -28,6 +28,7 @@
 #include <osl/mutex.hxx>
 
 #include <cuires.hrc>
+#include <bitmaps.hlst>
 #include "scriptdlg.hxx"
 #include <dialmgr.hxx>
 #include "selector.hxx"
@@ -77,10 +78,10 @@ void ShowErrorDialog( const Any& aException )
 
 SFTreeListBox::SFTreeListBox(vcl::Window* pParent)
     : SvTreeListBox(pParent)
-    , m_hdImage(BitmapEx(CUI_RES(RID_CUIBMP_HARDDISK)))
-    , m_libImage(BitmapEx(CUI_RES(RID_CUIBMP_LIB)))
-    , m_macImage(BitmapEx(CUI_RES(RID_CUIBMP_MACRO)))
-    , m_docImage(BitmapEx(CUI_RES(RID_CUIBMP_DOC)))
+    , m_hdImage(BitmapEx(RID_CUIBMP_HARDDISK))
+    , m_libImage(BitmapEx(RID_CUIBMP_LIB))
+    , m_macImage(BitmapEx(RID_CUIBMP_MACRO))
+    , m_docImage(BitmapEx(RID_CUIBMP_DOC))
     , m_sMyMacros(CUI_RESSTR(RID_SVXSTR_MYMACROS))
     , m_sProdMacros(CUI_RESSTR(RID_SVXSTR_PRODMACROS))
 {
@@ -238,7 +239,7 @@ void SFTreeListBox::Init( const OUString& language  )
         Reference< browse::XBrowseNode > langEntries =
             getLangNodeFromRootNode( children[ n ], lang );
 
-        insertEntry( uiName, app ? RID_CUIBMP_HARDDISK : RID_CUIBMP_DOC,
+        insertEntry( uiName, app ? OUStringLiteral(RID_CUIBMP_HARDDISK) : OUStringLiteral(RID_CUIBMP_DOC),
             nullptr, true, o3tl::make_unique< SFEntry >( OBJTYPE_SFROOT, langEntries, xDocumentModel ), factoryURL );
     }
 
@@ -335,11 +336,11 @@ bool SFTreeListBox::ExpandingHdl()
 }
 
 SvTreeListEntry * SFTreeListBox::insertEntry(
-    OUString const & rText, sal_uInt16 nBitmap, SvTreeListEntry * pParent,
+    OUString const & rText, OUString const & rBitmap, SvTreeListEntry * pParent,
     bool bChildrenOnDemand, std::unique_ptr< SFEntry > && aUserData, const OUString& factoryURL )
 {
     SvTreeListEntry * p;
-    if( nBitmap == RID_CUIBMP_DOC && !factoryURL.isEmpty() )
+    if (rBitmap == RID_CUIBMP_DOC && !factoryURL.isEmpty())
     {
         Image aImage = SvFileInformationManager::GetFileImage( INetURLObject(factoryURL) );
         p = InsertEntry(
@@ -348,29 +349,29 @@ SvTreeListEntry * SFTreeListBox::insertEntry(
     }
     else
     {
-        p = insertEntry( rText, nBitmap, pParent, bChildrenOnDemand, std::move(aUserData) );
+        p = insertEntry(rText, rBitmap, pParent, bChildrenOnDemand, std::move(aUserData));
     }
     return p;
 }
 
 SvTreeListEntry * SFTreeListBox::insertEntry(
-    OUString const & rText, sal_uInt16 nBitmap, SvTreeListEntry * pParent,
+    OUString const & rText, const OUString &rBitmap, SvTreeListEntry * pParent,
     bool bChildrenOnDemand, std::unique_ptr< SFEntry > && aUserData )
 {
     Image aImage;
-    if( nBitmap == RID_CUIBMP_HARDDISK )
+    if (rBitmap == RID_CUIBMP_HARDDISK)
     {
         aImage = m_hdImage;
     }
-    else if( nBitmap == RID_CUIBMP_LIB )
+    else if (rBitmap == RID_CUIBMP_LIB)
     {
         aImage = m_libImage;
     }
-    else if( nBitmap == RID_CUIBMP_MACRO )
+    else if (rBitmap == RID_CUIBMP_MACRO)
     {
         aImage = m_macImage;
     }
-    else if( nBitmap == RID_CUIBMP_DOC )
+    else if (rBitmap == RID_CUIBMP_DOC)
     {
         aImage = m_docImage;
     }
diff --git a/cui/source/inc/cuires.hrc b/cui/source/inc/cuires.hrc
index 1ee2819e698b..4c75db05aa0f 100644
--- a/cui/source/inc/cuires.hrc
+++ b/cui/source/inc/cuires.hrc
@@ -28,13 +28,6 @@
 // RID_SVX_START + 0 unused
 #define RID_SVXSTR_OPTIONS_RESTART          (RID_SVX_START + 1)
 
-#define RID_CUIBMP_HARDDISK                 (RID_SVX_START + 4)
-#define RID_CUIBMP_LIB                      (RID_SVX_START + 5)
-#define RID_CUIBMP_MACRO                    (RID_SVX_START + 6)
-#define RID_CUIBMP_DOC                      (RID_SVX_START + 7)
-#define RID_CUIBMP_COLLAPSED                (RID_SVX_START + 8)
-#define RID_CUIBMP_EXPANDED                 (RID_SVX_START + 9)
-
 // Gallery
 #define RID_CUI_GALLERY_START               (RID_SVX_START + 360)
 //      RID_CUI_GALLERY_END                 (RID_SVX_START + 410)
@@ -130,7 +123,6 @@
 #define RID_SVXSTR_JRE_FAILED_VERSION       (RID_SVX_START + 257)
 #define RID_SVXSTR_JAVA_START_PARAM         (RID_SVX_START + 258)
 #define RID_SVXSTR_PATH_NAME_START          (RID_SVX_START + 1003)
-#define RID_SVXBMP_LOCK                     (RID_SVX_START + 118)
 #define RID_SVXPAGE_BASICIDE_OPTIONS        (RID_SVX_START + 209)
 #define RID_SVXSTR_KEY_AUTOCORRECT_DIR      (RID_SVX_START + 1004)  //?
 #define RID_SVXSTR_KEY_DICTIONARY_PATH      (RID_SVX_START + 1010)//?
@@ -161,44 +153,6 @@
 #define STR_MODIFY                          (RID_SVX_START + 336)//from optdict.src
 
 // hyperlink dialog
-#define RID_SVXBMP_SCRIPT                   (RID_SVX_START + 550)
-#define RID_SVXBMP_TARGET                   (RID_SVX_START + 551)
-#define RID_SVXBMP_FILEOPEN                 (RID_SVX_START + 552)
-#define RID_SVXBMP_NEWDOC                   (RID_SVX_START + 553)
-#define RID_SVXBMP_ADRESSBOOK               (RID_SVX_START + 555)
-#define RID_SVXBMP_HLINETTP                 (RID_SVX_START + 556)
-#define RID_SVXBMP_HLMAILTP                 (RID_SVX_START + 557)
-#define RID_SVXBMP_HLDOCTP                  (RID_SVX_START + 558)
-#define RID_SVXBMP_HLDOCNTP                 (RID_SVX_START + 559)
-#define RID_SVXBMP_BOTTOMLOCK               (RID_SVX_START + 560)
-#define RID_SVXBMP_TOPLOCK                  (RID_SVX_START + 561)
-#define RID_SVXBMP_CELLLOCK                 (RID_SVX_START + 562)
-#define RID_SVXBMP_SHADOWNONE               (RID_SVX_START + 563)
-#define RID_SVXBMP_SHADOW_BOT_RIGHT         (RID_SVX_START + 564)
-#define RID_SVXBMP_SHADOW_BOT_LEFT          (RID_SVX_START + 565)
-#define RID_SVXBMP_SHADOW_TOP_RIGHT         (RID_SVX_START + 566)
-#define RID_SVXBMP_SHADOW_TOP_LEFT          (RID_SVX_START + 567)
-#define RID_SVXBMP_CELL_NONE                (RID_SVX_START + 568)
-#define RID_SVXBMP_CELL_ALL                 (RID_SVX_START + 569)
-#define RID_SVXBMP_CELL_LR                  (RID_SVX_START + 570)
-#define RID_SVXBMP_CELL_TB                  (RID_SVX_START + 571)
-#define RID_SVXBMP_CELL_L                   (RID_SVX_START + 572)
-#define RID_SVXBMP_CELL_DIAG                (RID_SVX_START + 573)
-#define RID_SVXBMP_HOR_NONE                 (RID_SVX_START + 574)
-#define RID_SVXBMP_HOR_OUTER                (RID_SVX_START + 575)
-#define RID_SVXBMP_HOR_HOR                  (RID_SVX_START + 576)
-#define RID_SVXBMP_HOR_ALL                  (RID_SVX_START + 577)
-#define RID_SVXBMP_HOR_OUTER2               (RID_SVX_START + 578)
-#define RID_SVXBMP_VER_NONE                 (RID_SVX_START + 579)
-#define RID_SVXBMP_VER_OUTER                (RID_SVX_START + 580)
-#define RID_SVXBMP_VER_VER                  (RID_SVX_START + 581)
-#define RID_SVXBMP_VER_ALL                  (RID_SVX_START + 582)
-#define RID_SVXBMP_VER_OUTER2               (RID_SVX_START + 583)
-#define RID_SVXBMP_TABLE_NONE               (RID_SVX_START + 584)
-#define RID_SVXBMP_TABLE_OUTER              (RID_SVX_START + 585)
-#define RID_SVXBMP_TABLE_OUTERH             (RID_SVX_START + 586)
-#define RID_SVXBMP_TABLE_ALL                (RID_SVX_START + 587)
-#define RID_SVXBMP_TABLE_OUTER2             (RID_SVX_START + 588)
 #define RID_SVXPAGE_HYPERLINK_INTERNET      (RID_SVX_START + 228)
 #define RID_SVXPAGE_HYPERLINK_MAIL          (RID_SVX_START + 229)
 #define RID_SVXPAGE_HYPERLINK_DOCUMENT      (RID_SVX_START + 230)
diff --git a/cui/source/inc/scriptdlg.hxx b/cui/source/inc/scriptdlg.hxx
index e0281c5e774b..d07e44cf765e 100644
--- a/cui/source/inc/scriptdlg.hxx
+++ b/cui/source/inc/scriptdlg.hxx
@@ -73,12 +73,12 @@ public:
                     virtual ~SFTreeListBox() override;
     virtual void    dispose() override;
 
-    SvTreeListEntry *       insertEntry(OUString const & rText, sal_uInt16 nBitmap,
+    SvTreeListEntry *       insertEntry(OUString const & rText, OUString const & rBitmap,
                               SvTreeListEntry * pParent,
                               bool bChildrenOnDemand,
                               std::unique_ptr< SFEntry > && aUserData,
                               const OUString& factoryURL );
-    SvTreeListEntry *       insertEntry(OUString const & rText, sal_uInt16 nBitmap,
+    SvTreeListEntry *       insertEntry(OUString const & rText, OUString const & rBitmap,
                               SvTreeListEntry * pParent,
                               bool bChildrenOnDemand,
                               std::unique_ptr< SFEntry > && aUserData );
diff --git a/cui/source/options/dbregister.cxx b/cui/source/options/dbregister.cxx
index a0a4a504d389..082b74ee7b9d 100644
--- a/cui/source/options/dbregister.cxx
+++ b/cui/source/options/dbregister.cxx
@@ -25,6 +25,7 @@
 #include <svtools/editbrowsebox.hxx>
 #include "svtools/treelistentry.hxx"
 #include <cuires.hrc>
+#include <bitmaps.hlst>
 #include <vcl/field.hxx>
 #include <vcl/layout.hxx>
 #include <svl/eitem.hxx>
@@ -392,7 +393,7 @@ void DbRegistrationOptionsPage::insertNewEntry( const OUString& _sName,const OUS
     SvTreeListEntry* pEntry = nullptr;
     if ( _bReadOnly )
     {
-        Image aLocked(BitmapEx(CUI_RES(RID_SVXBMP_LOCK)));
+        Image aLocked(BitmapEx(RID_SVXBMP_LOCK));
         pEntry = m_pPathBox->InsertEntry( aStr, aLocked, aLocked );
     }
     else
diff --git a/cui/source/options/dbregister.src b/cui/source/options/dbregister.src
index e769b6582a69..7362be056d51 100644
--- a/cui/source/options/dbregister.src
+++ b/cui/source/options/dbregister.src
@@ -29,9 +29,4 @@ String RID_SVXSTR_PATH
     Text [ en-US ] = "Database file" ;
 };
 
-Bitmap RID_SVXBMP_LOCK
-{
-    File = "lock.png";
-};
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/tabpages/align.cxx b/cui/source/tabpages/align.cxx
index 49baf4c509c9..a4ee1d46facd 100644
--- a/cui/source/tabpages/align.cxx
+++ b/cui/source/tabpages/align.cxx
@@ -22,6 +22,7 @@
 #include <editeng/svxenum.hxx>
 #include <svx/dialogs.hrc>
 #include <cuires.hrc>
+#include <bitmaps.hlst>
 #include <svx/rotmodit.hxx>
 
 #include <svx/algitem.hxx>
@@ -340,9 +341,9 @@ void AlignmentTabPage::InitVsRefEgde()
     // remember selection - is deleted in call to ValueSet::Clear()
     sal_uInt16 nSel = m_pVsRefEdge->GetSelectItemId();
 
-    BitmapEx aBottomLock(ResId(RID_SVXBMP_BOTTOMLOCK, CUI_MGR()));
-    BitmapEx aTopLock(ResId(RID_SVXBMP_TOPLOCK, CUI_MGR()));
-    BitmapEx aCellLock(ResId(RID_SVXBMP_CELLLOCK, CUI_MGR()));
+    BitmapEx aBottomLock(RID_SVXBMP_BOTTOMLOCK);
+    BitmapEx aTopLock(RID_SVXBMP_TOPLOCK);
+    BitmapEx aCellLock(RID_SVXBMP_CELLLOCK);
 
     if( GetDPIScaleFactor() > 1 )
     {
diff --git a/cui/source/tabpages/align.src b/cui/source/tabpages/align.src
deleted file mode 100644
index e9c1fcfebeb1..000000000000
--- a/cui/source/tabpages/align.src
+++ /dev/null
@@ -1,37 +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 "cuires.hrc"
-
-Bitmap RID_SVXBMP_BOTTOMLOCK
-{
-    File = "lo01.png";
-};
-
-Bitmap RID_SVXBMP_TOPLOCK
-{
-    File = "lo02.png";
-};
-
-Bitmap RID_SVXBMP_CELLLOCK
-{
-    File = "lo03.png";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx
index 0f496ec233be..a4fbb998f0a2 100644
--- a/cui/source/tabpages/border.cxx
+++ b/cui/source/tabpages/border.cxx
@@ -24,6 +24,7 @@
 #include <svx/dialmgr.hxx>
 
 #include <cuires.hrc>
+#include <bitmaps.hlst>
 #include "helpid.hrc"
 
 #include <svx/xtable.hxx>
@@ -136,7 +137,7 @@ SvxBorderTabPage::SvxBorderTabPage(vcl::Window* pParent, const SfxItemSet& rCore
     get(m_pRemoveAdjcentCellBordersCB, "rmadjcellborders");
     get(m_pRemoveAdjcentCellBordersFT, "rmadjcellbordersft");
 
-    static const sal_uInt16 pnBorderImgIds[] =
+    static const OUStringLiteral pnBorderImgIds[] =
     {
         RID_SVXBMP_CELL_NONE,
         RID_SVXBMP_CELL_ALL,
@@ -162,9 +163,9 @@ SvxBorderTabPage::SvxBorderTabPage(vcl::Window* pParent, const SfxItemSet& rCore
     };
 
     for (size_t i = 0; i < SAL_N_ELEMENTS(pnBorderImgIds); ++i)
-        m_aBorderImgVec.push_back(BitmapEx(CUI_RES(pnBorderImgIds[i])));
+        m_aBorderImgVec.push_back(BitmapEx(pnBorderImgIds[i]));
 
-    static const sal_uInt16 pnShadowImgIds[SVX_BORDER_SHADOW_COUNT] =
+    static const OUStringLiteral pnShadowImgIds[SVX_BORDER_SHADOW_COUNT] =
     {
         RID_SVXBMP_SHADOWNONE,
         RID_SVXBMP_SHADOW_BOT_RIGHT,
@@ -174,7 +175,7 @@ SvxBorderTabPage::SvxBorderTabPage(vcl::Window* pParent, const SfxItemSet& rCore
     };
 
     for (size_t i = 0; i < SAL_N_ELEMENTS(pnShadowImgIds); ++i)
-        m_aShadowImgVec.push_back(BitmapEx(CUI_RES(pnShadowImgIds[i])));
+        m_aShadowImgVec.push_back(BitmapEx(pnShadowImgIds[i]));
     assert(m_aShadowImgVec.size() == SVX_BORDER_SHADOW_COUNT);
 
     if ( GetDPIScaleFactor() > 1 )
diff --git a/cui/source/tabpages/border.src b/cui/source/tabpages/border.src
index 9526575f3871..2dded5a4ded3 100644
--- a/cui/source/tabpages/border.src
+++ b/cui/source/tabpages/border.src
@@ -21,136 +21,6 @@
 #include <cuires.hrc>
 #include <svx/dialogs.hrc>
 
-Bitmap RID_SVXBMP_CELL_NONE
-{
-    File = "pr01.png";
-};
-
-Bitmap RID_SVXBMP_CELL_ALL
-{
-    File = "pr02.png";
-};
-
-Bitmap RID_SVXBMP_CELL_LR
-{
-    File = "pr03.png";
-};
-
-Bitmap RID_SVXBMP_CELL_TB
-{
-    File = "pr04.png";
-};
-
-Bitmap RID_SVXBMP_CELL_L
-{
-    File = "pr05.png";
-};
-
-Bitmap RID_SVXBMP_CELL_DIAG
-{
-    File = "pr06.png";
-};
-
-Bitmap RID_SVXBMP_HOR_NONE
-{
-    File = "pr07.png";
-};
-
-Bitmap RID_SVXBMP_HOR_OUTER
-{
-    File = "pr08.png";
-};
-
-Bitmap RID_SVXBMP_HOR_HOR
-{
-    File = "pr09.png";
-};
-
-Bitmap RID_SVXBMP_HOR_ALL
-{
-    File = "pr010.png";
-};
-
-Bitmap RID_SVXBMP_HOR_OUTER2
-{
-    File = "pr011.png";
-};
-
-Bitmap RID_SVXBMP_VER_NONE
-{
-    File = "pr012.png";
-};
-
-Bitmap RID_SVXBMP_VER_OUTER
-{
-    File = "pr013.png";
-};
-
-Bitmap RID_SVXBMP_VER_VER
-{
-    File = "pr014.png";
-};
-
-Bitmap RID_SVXBMP_VER_ALL
-{
-    File = "pr015.png";
-};
-
-Bitmap RID_SVXBMP_VER_OUTER2
-{
-    File = "pr016.png";
-};
-
-Bitmap RID_SVXBMP_TABLE_NONE
-{
-    File = "pr017.png";
-};
-
-Bitmap RID_SVXBMP_TABLE_OUTER
-{
-    File = "pr018.png";
-};
-
-Bitmap RID_SVXBMP_TABLE_OUTERH
-{
-    File = "pr019.png";
-};
-
-Bitmap RID_SVXBMP_TABLE_ALL
-{
-    File = "pr020.png";
-};
-
-Bitmap RID_SVXBMP_TABLE_OUTER2
-{
-    File = "pr021.png";
-};
-
-Bitmap RID_SVXBMP_SHADOWNONE
-{
-    File = "sh01.png";
-};
-
-Bitmap RID_SVXBMP_SHADOW_BOT_RIGHT
-{
-    File = "sh02.png";
-};
-
-Bitmap RID_SVXBMP_SHADOW_BOT_LEFT
-{
-    File = "sh03.png";
-};
-
-Bitmap RID_SVXBMP_SHADOW_TOP_RIGHT
-{
-    File = "sh04.png";
-};
-
-Bitmap RID_SVXBMP_SHADOW_TOP_LEFT
-{
-    File = "sh05.png";
-};
-
 String RID_SVXSTR_TABLE_PRESET_NONE
 {
     Text [ en-US ] = "Set No Borders" ;