remove extensions bitmaps from .src files

resulting in the removal of a updchk .res file

Change-Id: I7a6f3601f25763253ba34590a1970ca8a042db23

21 files changed, 103 insertions, 386 deletions

diff --git a/Repository.mk b/Repository.mk
index 057c9b1fb7ad..c80ee8d75828 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -1100,7 +1100,6 @@ $(eval $(call gb_Helper_register_resources,\
 	t602filter \
 	tpl \
 	upd \
-	$(if $(ENABLE_ONLINE_UPDATE),updchk) \
 	uui \
 	vcl \
 	writerperfect \
diff --git a/extensions/AllLangResTarget_bib.mk b/extensions/AllLangResTarget_bib.mk
index 0b535edeea76..68ed52e6f9ad 100644
--- a/extensions/AllLangResTarget_bib.mk
+++ b/extensions/AllLangResTarget_bib.mk
@@ -23,7 +23,6 @@ $(eval $(call gb_SrsTarget_set_include,bib/res,\
 $(eval $(call gb_SrsTarget_add_files,bib/res,\
 	extensions/source/bibliography/bib.src \
 	extensions/source/bibliography/sections.src \
-	extensions/source/bibliography/toolbar.src \
 ))
 
 # vim:set noet sw=4 ts=4:
diff --git a/extensions/AllLangResTarget_updchk.mk b/extensions/AllLangResTarget_updchk.mk
deleted file mode 100644
index 48669eb43391..000000000000
--- a/extensions/AllLangResTarget_updchk.mk
+++ /dev/null
@@ -1,26 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-#
-# 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/.
-#
-#
-
-$(eval $(call gb_AllLangResTarget_AllLangResTarget,updchk))
-
-$(eval $(call gb_AllLangResTarget_set_reslocation,updchk,extensions/source/update/ui))
-
-$(eval $(call gb_AllLangResTarget_add_srs,updchk,\
-	updchk/res \
-))
-
-$(eval $(call gb_SrsTarget_SrsTarget,updchk/res))
-
-$(eval $(call gb_SrsTarget_add_nonlocalizable_files,updchk/res,\
-	extensions/source/update/ui/updatecheckui.src \
-))
-
-# vim:set noet sw=4 ts=4:
diff --git a/extensions/Library_updatecheckui.mk b/extensions/Library_updatecheckui.mk
index 2b987942ee85..a98cf964645b 100644
--- a/extensions/Library_updatecheckui.mk
+++ b/extensions/Library_updatecheckui.mk
@@ -9,6 +9,11 @@
 
 $(eval $(call gb_Library_Library,updatecheckui))
 
+$(eval $(call gb_Library_set_include,updatecheckui,\
+       -I$(SRCDIR)/extensions/inc \
+       $$(INCLUDE) \
+))
+
 $(eval $(call gb_Library_set_componentfile,updatecheckui,extensions/source/update/ui/updchk))
 
 $(eval $(call gb_Library_use_external,updatecheckui,boost_headers))
diff --git a/extensions/Module_extensions.mk b/extensions/Module_extensions.mk
index ba962b810372..6c4e877dad64 100644
--- a/extensions/Module_extensions.mk
+++ b/extensions/Module_extensions.mk
@@ -56,9 +56,6 @@ $(eval $(call gb_Module_add_targets,extensions,\
 	Library_updatecheckui \
 	Library_updchk \
 ))
-$(eval $(call gb_Module_add_l10n_targets,extensions,\
-	AllLangResTarget_updchk \
-))
 
 $(eval $(call gb_Module_add_check_targets,extensions,\
     CppunitTest_extensions_test_update \
diff --git a/extensions/inc/bitmaps.hlst b/extensions/inc/bitmaps.hlst
new file mode 100644
index 000000000000..a73053a5e327
--- /dev/null
+++ b/extensions/inc/bitmaps.hlst
@@ -0,0 +1,54 @@
+/* -*- 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_EXTENSIONS_INC_BITMAPS_HRC
+#define INCLUDED_EXTENSIONS_INC_BITMAPS_HRC
+
+#define RID_EXTBMP_CONTROL                  "res/sx10144.png"
+#define RID_EXTBMP_BUTTON                   "res/sx10594.png"
+#define RID_EXTBMP_RADIOBUTTON              "res/sx10595.png"
+#define RID_EXTBMP_CHECKBOX                 "res/sx10596.png"
+#define RID_EXTBMP_FIXEDTEXT                "res/sx10597.png"
+#define RID_EXTBMP_GROUPBOX                 "res/sx10598.png"
+#define RID_EXTBMP_EDITBOX                  "res/sx10599.png"
+#define RID_EXTBMP_LISTBOX                  "res/sx10600.png"
+#define RID_EXTBMP_COMBOBOX                 "res/sx10601.png"
+#define RID_EXTBMP_GRID                     "res/sx10603.png"
+#define RID_EXTBMP_IMAGEBUTTON              "res/sx10604.png"
+#define RID_EXTBMP_FILECONTROL              "res/sx10605.png"
+#define RID_EXTBMP_DATEFIELD                "res/sx10704.png"
+#define RID_EXTBMP_TIMEFIELD                "res/sx10705.png"
+#define RID_EXTBMP_NUMERICFIELD             "res/sx10706.png"
+#define RID_EXTBMP_CURRENCYFIELD            "res/sx10707.png"
+#define RID_EXTBMP_PATTERNFIELD             "res/sx10708.png"
+#define RID_EXTBMP_IMAGECONTROL             "res/sx10710.png"
+#define RID_EXTBMP_HIDDEN                   "res/sx18022.png"
+#define RID_EXTBMP_FORMATTEDFIELD           "res/sx10728.png"
+#define RID_EXTBMP_FILTER                   "res/sx10715.png"
+#define RID_EXTBMP_FORMS                    "res/sx18013.png"
+#define RID_EXTBMP_FORM                     "res/sx10593.png"
+#define RID_EXTBMP_COLLAPSEDNODE            "res/sx18002.png"
+#define RID_EXTBMP_EXPANDEDNODE             "res/sx18003.png"
+#define RID_EXTBMP_SCROLLBAR                "res/sx10768.png"
+#define RID_EXTBMP_SPINBUTTON               "res/sx10769.png"
+#define RID_EXTBMP_NAVIGATIONBAR            "res/sx10607.png"
+#define RID_UPDATE_AVAILABLE_16             "extensions/source/update/ui/onlineupdate_16.png"
+#define RID_UPDATE_AVAILABLE_26             "extensions/source/update/ui/onlineupdate_26.png"
+#define BMP_TABLE                           "res/sx03188.png"
+#define BMP_QUERY                           "res/sx03202.png"
+#define RID_EXTBMP_AUTOFILTER_SC            "res/sc10716.png"
+#define RID_EXTBMP_FILTERCRIT_SC            "res/sc10715.png"
+#define RID_EXTBMP_REMOVE_FILTER_SORT_SC    "res/sc10711.png"
+#define RID_EXTBMP_AUTOFILTER_LC            "res/lc10716.png"
+#define RID_EXTBMP_FILTERCRIT_LC            "res/lc10715.png"
+#define RID_EXTBMP_REMOVE_FILTER_SORT_LC    "res/lc10711.png"
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/extensions/source/bibliography/bib.hrc b/extensions/source/bibliography/bib.hrc
index dbf34695e781..78f54a95524b 100644
--- a/extensions/source/bibliography/bib.hrc
+++ b/extensions/source/bibliography/bib.hrc
@@ -25,15 +25,6 @@
 #define RID_BIB_START                   RID_EXTENSIONS_START
 #endif
 
-//Bitmaps(100)
-#define RID_BIB_IMAGES                   (RID_BIB_START + 100)
-#define RID_EXTBMP_AUTOFILTER_SC         (RID_BIB_IMAGES + 1)
-#define RID_EXTBMP_FILTERCRIT_SC         (RID_BIB_IMAGES + 2)
-#define RID_EXTBMP_REMOVE_FILTER_SORT_SC (RID_BIB_IMAGES + 3)
-#define RID_EXTBMP_AUTOFILTER_LC         (RID_BIB_IMAGES + 4)
-#define RID_EXTBMP_FILTERCRIT_LC         (RID_BIB_IMAGES + 5)
-#define RID_EXTBMP_REMOVE_FILTER_SORT_LC (RID_BIB_IMAGES + 6)
-
 // Strings (500)
 #define RID_BIB_STRING              (RID_BIB_START + 200)
 #define RID_BIB_STR_NONE            (RID_BIB_STRING +  1)
diff --git a/extensions/source/bibliography/toolbar.cxx b/extensions/source/bibliography/toolbar.cxx
index fec960f37465..f5037f9d4612 100644
--- a/extensions/source/bibliography/toolbar.cxx
+++ b/extensions/source/bibliography/toolbar.cxx
@@ -35,6 +35,7 @@
 #include "bibview.hxx"
 #include "bibresid.hxx"
 #include "bib.hrc"
+#include "bitmaps.hlst"
 
 #include "bibtools.hxx"
 #include <osl/mutex.hxx>
@@ -573,9 +574,9 @@ void BibToolBar::RebuildToolbar()
 
 void BibToolBar::ApplyImageList()
 {
-    SetItemImage(nTBC_BT_AUTOFILTER, Image(BitmapEx(BibResId(nSymbolsSize == SFX_SYMBOLS_SIZE_SMALL ? RID_EXTBMP_AUTOFILTER_SC : RID_EXTBMP_AUTOFILTER_LC))));
-    SetItemImage(nTBC_BT_FILTERCRIT, Image(BitmapEx(BibResId(nSymbolsSize == SFX_SYMBOLS_SIZE_SMALL ? RID_EXTBMP_FILTERCRIT_SC : RID_EXTBMP_FILTERCRIT_LC))));
-    SetItemImage(nTBC_BT_REMOVEFILTER, Image(BitmapEx(BibResId(nSymbolsSize == SFX_SYMBOLS_SIZE_SMALL ? RID_EXTBMP_REMOVE_FILTER_SORT_SC : RID_EXTBMP_REMOVE_FILTER_SORT_LC))));
+    SetItemImage(nTBC_BT_AUTOFILTER, Image(BitmapEx(nSymbolsSize == SFX_SYMBOLS_SIZE_SMALL ? OUStringLiteral(RID_EXTBMP_AUTOFILTER_SC) : OUStringLiteral(RID_EXTBMP_AUTOFILTER_LC))));
+    SetItemImage(nTBC_BT_FILTERCRIT, Image(BitmapEx(nSymbolsSize == SFX_SYMBOLS_SIZE_SMALL ? OUStringLiteral(RID_EXTBMP_FILTERCRIT_SC) : OUStringLiteral(RID_EXTBMP_FILTERCRIT_LC))));
+    SetItemImage(nTBC_BT_REMOVEFILTER, Image(BitmapEx(nSymbolsSize == SFX_SYMBOLS_SIZE_SMALL ? OUStringLiteral(RID_EXTBMP_REMOVE_FILTER_SORT_SC) : OUStringLiteral(RID_EXTBMP_REMOVE_FILTER_SORT_LC))));
     AdjustToolBox();
 }
 
diff --git a/extensions/source/bibliography/toolbar.src b/extensions/source/bibliography/toolbar.src
deleted file mode 100644
index 24a6dc796cd8..000000000000
--- a/extensions/source/bibliography/toolbar.src
+++ /dev/null
@@ -1,54 +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 <svx/svxids.hrc>
-#include "bibliography.hrc"
-#include "svx/svxcommands.h"
-#include "bib.hrc"
-
-Bitmap RID_EXTBMP_AUTOFILTER_SC
-{
-    File = "sc10716.png";
-};
-
-Bitmap RID_EXTBMP_FILTERCRIT_SC
-{
-    File = "sc10715.png";
-};
-
-Bitmap RID_EXTBMP_REMOVE_FILTER_SORT_SC
-{
-    File = "sc10711.png";
-};
-
-Bitmap RID_EXTBMP_AUTOFILTER_LC
-{
-    File = "lc10716.png";
-};
-
-Bitmap RID_EXTBMP_FILTERCRIT_LC
-{
-    File = "lc10715.png";
-};
-
-Bitmap RID_EXTBMP_REMOVE_FILTER_SORT_LC
-{
-    File = "lc10711.png";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/dbpilots/commonpagesdbp.cxx b/extensions/source/dbpilots/commonpagesdbp.cxx
index 968a95354184..dd6cdb007dda 100644
--- a/extensions/source/dbpilots/commonpagesdbp.cxx
+++ b/extensions/source/dbpilots/commonpagesdbp.cxx
@@ -19,6 +19,7 @@
 
 #include "commonpagesdbp.hxx"
 #include "dbpresid.hrc"
+#include "bitmaps.hlst"
 #include "componentmodule.hxx"
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/sdb/XCompletedConnection.hpp>
@@ -361,8 +362,8 @@ namespace dbp
             return;
         }
 
-        Image aTableImage(BitmapEx(ModuleRes(BMP_TABLE)));
-        Image aQueryImage(BitmapEx(ModuleRes(BMP_QUERY)));
+        Image aTableImage(BitmapEx(BMP_TABLE));
+        Image aQueryImage(BitmapEx(BMP_QUERY));
 
         lcl_fillEntries( *m_pTable, aTableNames, aTableImage, CommandType::TABLE );
         lcl_fillEntries( *m_pTable, aQueryNames, aQueryImage, CommandType::QUERY );
diff --git a/extensions/source/dbpilots/commonpagesdbp.src b/extensions/source/dbpilots/commonpagesdbp.src
index 8e332f439dd7..723e972684c6 100644
--- a/extensions/source/dbpilots/commonpagesdbp.src
+++ b/extensions/source/dbpilots/commonpagesdbp.src
@@ -19,16 +19,6 @@
 
 #include "dbpresid.hrc"
 
-Bitmap BMP_TABLE
-{
-    File = "sx03188.png";
-};
-
-Bitmap BMP_QUERY
-{
-    File = "sx03202.png";
-};
-
 String RID_STR_OPTION_DB_FIELD_TITLE
 {
     Text [ en-US ] = "Database Field";
diff --git a/extensions/source/dbpilots/dbpresid.hrc b/extensions/source/dbpilots/dbpresid.hrc
index 44af26f42da3..3cdc47cd1430 100644
--- a/extensions/source/dbpilots/dbpresid.hrc
+++ b/extensions/source/dbpilots/dbpresid.hrc
@@ -62,13 +62,6 @@
     #error "please adjust the resource id ranges!!"
 #endif
 
-// local ids
-
-// Image
-
-#define BMP_TABLE                   ( RID_DIALOG_START + 1 )
-#define BMP_QUERY                   ( RID_DIALOG_START + 2 )
-
 #define WINDOW_SIZE_X       260
 #define WINDOW_SIZE_Y       185
 
diff --git a/extensions/source/propctrlr/formresid.hrc b/extensions/source/propctrlr/formresid.hrc
index c4b0862e5724..893dedf84c3b 100644
--- a/extensions/source/propctrlr/formresid.hrc
+++ b/extensions/source/propctrlr/formresid.hrc
@@ -309,34 +309,6 @@
 #define RID_RSC_ENUM_WHEEL_BEHAVIOR         ( RID_PROPCONTROLLER_START + 30 )
 #define RID_RSC_ENUM_TEXT_ANCHOR_TYPE       ( RID_PROPCONTROLLER_START + 31 )
 #define RID_RSC_ENUM_SHEET_ANCHOR_TYPE      ( RID_PROPCONTROLLER_START + 32 )
-#define RID_EXTBMP_CONTROL                  ( RID_PROPCONTROLLER_START + 33 )
-#define RID_EXTBMP_BUTTON                   ( RID_PROPCONTROLLER_START + 34 )
-#define RID_EXTBMP_RADIOBUTTON              ( RID_PROPCONTROLLER_START + 35 )
-#define RID_EXTBMP_CHECKBOX                 ( RID_PROPCONTROLLER_START + 36 )
-#define RID_EXTBMP_FIXEDTEXT                ( RID_PROPCONTROLLER_START + 37 )
-#define RID_EXTBMP_GROUPBOX                 ( RID_PROPCONTROLLER_START + 38 )
-#define RID_EXTBMP_EDITBOX                  ( RID_PROPCONTROLLER_START + 39 )
-#define RID_EXTBMP_LISTBOX                  ( RID_PROPCONTROLLER_START + 40 )
-#define RID_EXTBMP_COMBOBOX                 ( RID_PROPCONTROLLER_START + 41 )
-#define RID_EXTBMP_GRID                     ( RID_PROPCONTROLLER_START + 42 )
-#define RID_EXTBMP_IMAGEBUTTON              ( RID_PROPCONTROLLER_START + 43 )
-#define RID_EXTBMP_FILECONTROL              ( RID_PROPCONTROLLER_START + 44 )
-#define RID_EXTBMP_DATEFIELD                ( RID_PROPCONTROLLER_START + 45 )
-#define RID_EXTBMP_TIMEFIELD                ( RID_PROPCONTROLLER_START + 46 )
-#define RID_EXTBMP_NUMERICFIELD             ( RID_PROPCONTROLLER_START + 47 )
-#define RID_EXTBMP_CURRENCYFIELD            ( RID_PROPCONTROLLER_START + 48 )
-#define RID_EXTBMP_PATTERNFIELD             ( RID_PROPCONTROLLER_START + 49 )
-#define RID_EXTBMP_IMAGECONTROL             ( RID_PROPCONTROLLER_START + 50 )
-#define RID_EXTBMP_HIDDEN                   ( RID_PROPCONTROLLER_START + 51 )
-#define RID_EXTBMP_FORMATTEDFIELD           ( RID_PROPCONTROLLER_START + 52 )
-#define RID_EXTBMP_FILTER                   ( RID_PROPCONTROLLER_START + 53 )
-#define RID_EXTBMP_FORMS                    ( RID_PROPCONTROLLER_START + 54 )
-#define RID_EXTBMP_FORM                     ( RID_PROPCONTROLLER_START + 55 )
-#define RID_EXTBMP_COLLAPSEDNODE            ( RID_PROPCONTROLLER_START + 56 )
-#define RID_EXTBMP_EXPANDEDNODE             ( RID_PROPCONTROLLER_START + 57 )
-#define RID_EXTBMP_SCROLLBAR                ( RID_PROPCONTROLLER_START + 58 )
-#define RID_EXTBMP_SPINBUTTON               ( RID_PROPCONTROLLER_START + 59 )
-#define RID_EXTBMP_NAVIGATIONBAR            ( RID_PROPCONTROLLER_START + 60 )
 
 #endif
 
diff --git a/extensions/source/propctrlr/pcrmiscres.src b/extensions/source/propctrlr/pcrmiscres.src
index b587bb78cd15..a37b6783d1ff 100644
--- a/extensions/source/propctrlr/pcrmiscres.src
+++ b/extensions/source/propctrlr/pcrmiscres.src
@@ -24,147 +24,6 @@ String RID_STR_CONFIRM_DELETE_DATA_TYPE
     Text [ en-US ] = "Do you want to delete the data type '#type#' from the model?\n"
              "Please note that this will affect all controls which are bound to this data type.";
 };
-
-Bitmap RID_EXTBMP_CONTROL
-{
-    File = "sx10144.png";
-};
-
-Bitmap RID_EXTBMP_BUTTON
-{
-    File = "sx10594.png";
-};
-
-Bitmap RID_EXTBMP_RADIOBUTTON
-{
-    File = "sx10595.png";
-};
-
-Bitmap RID_EXTBMP_CHECKBOX
-{
-    File = "sx10596.png";
-};
-
-Bitmap RID_EXTBMP_FIXEDTEXT
-{
-    File = "sx10597.png";
-};
-
-Bitmap RID_EXTBMP_GROUPBOX
-{
-    File = "sx10598.png";
-};
-
-Bitmap RID_EXTBMP_EDITBOX
-{
-    File = "sx10599.png";
-};
-
-Bitmap RID_EXTBMP_LISTBOX
-{
-    File = "sx10600.png";
-};
-
-Bitmap RID_EXTBMP_COMBOBOX
-{
-    File = "sx10601.png";
-};
-
-Bitmap RID_EXTBMP_GRID
-{
-    File = "sx10603.png";
-};
-
-Bitmap RID_EXTBMP_IMAGEBUTTON
-{
-    File = "sx10604.png";
-};
-
-Bitmap RID_EXTBMP_FILECONTROL
-{
-    File = "sx10605.png";
-};
-
-Bitmap RID_EXTBMP_DATEFIELD
-{
-    File = "sx10704.png";
-};
-
-Bitmap RID_EXTBMP_TIMEFIELD
-{
-    File = "sx10705.png";
-};
-
-Bitmap RID_EXTBMP_NUMERICFIELD
-{
-    File = "sx10706.png";
-};
-
-Bitmap RID_EXTBMP_CURRENCYFIELD
-{
-    File = "sx10707.png";
-};
-
-Bitmap RID_EXTBMP_PATTERNFIELD
-{
-    File = "sx10708.png";
-};
-
-Bitmap RID_EXTBMP_IMAGECONTROL
-{
-    File = "sx10710.png";
-};
-
-Bitmap RID_EXTBMP_HIDDEN
-{
-    File = "sx18022.png";
-};
-
-Bitmap RID_EXTBMP_FORMATTEDFIELD
-{
-    File = "sx10728.png";
-};
-
-Bitmap RID_EXTBMP_FILTER
-{
-    File = "sx10715.png";
-};
-
-Bitmap RID_EXTBMP_FORMS
-{
-    File = "sx18013.png";
-};
-
-Bitmap RID_EXTBMP_FORM
-{
-    File = "sx10593.png";
-};
-
-Bitmap RID_EXTBMP_COLLAPSEDNODE
-{
-    File = "sx18002.png";
-};
-
-Bitmap RID_EXTBMP_EXPANDEDNODE
-{
-    File = "sx18003.png";
-};
-
-Bitmap RID_EXTBMP_SCROLLBAR
-{
-    File = "sx10768.png";
-};
-
-Bitmap RID_EXTBMP_SPINBUTTON
-{
-    File = "sx10769.png";
-};
-
-Bitmap RID_EXTBMP_NAVIGATIONBAR
-{
-    File = "sx10607.png";
-};
-
 String RID_STR_PROPTITLE_PUSHBUTTON
 {
     Text [ en-US ] = "Button" ;
diff --git a/extensions/source/propctrlr/selectlabeldialog.cxx b/extensions/source/propctrlr/selectlabeldialog.cxx
index 8849c8e838ef..ffec0db1ca00 100644
--- a/extensions/source/propctrlr/selectlabeldialog.cxx
+++ b/extensions/source/propctrlr/selectlabeldialog.cxx
@@ -19,6 +19,7 @@
 
 #include "selectlabeldialog.hxx"
 #include "formresid.hrc"
+#include "bitmaps.hlst"
 #include "formbrowsertools.hxx"
 #include "formstrings.hxx"
 #include <com/sun/star/form/FormComponentType.hpp>
@@ -64,8 +65,8 @@ namespace pcr
         m_pControlTree->EnableInplaceEditing( false );
         m_pControlTree->SetStyle(m_pControlTree->GetStyle() | WB_BORDER | WB_HASLINES | WB_HASLINESATROOT | WB_HASBUTTONS | WB_HASBUTTONSATROOT | WB_HSCROLL);
 
-        m_pControlTree->SetNodeBitmaps(Image(BitmapEx(PcrRes(RID_EXTBMP_COLLAPSEDNODE))),
-                                       Image(BitmapEx(PcrRes(RID_EXTBMP_EXPANDEDNODE))));
+        m_pControlTree->SetNodeBitmaps(Image(BitmapEx(RID_EXTBMP_COLLAPSEDNODE)),
+                                       Image(BitmapEx(RID_EXTBMP_EXPANDEDNODE)));
         m_pControlTree->SetSelectHdl(LINK(this, OSelectLabelDialog, OnEntrySelected));
         m_pControlTree->SetDeselectHdl(LINK(this, OSelectLabelDialog, OnEntrySelected));
 
@@ -99,7 +100,7 @@ namespace pcr
             sal_Int16 nClassId = 0;
             try { nClassId = ::comphelper::getINT16(m_xControlModel->getPropertyValue(PROPERTY_CLASSID)); } catch(...) { }
             m_sRequiredService = (FormComponentType::RADIOBUTTON == nClassId) ? OUString(SERVICE_COMPONENT_GROUPBOX) : OUString(SERVICE_COMPONENT_FIXEDTEXT);
-            m_aRequiredControlImage = Image(BitmapEx(PcrRes(FormComponentType::RADIOBUTTON == nClassId ? RID_EXTBMP_GROUPBOX : RID_EXTBMP_FIXEDTEXT)));
+            m_aRequiredControlImage = Image(BitmapEx(FormComponentType::RADIOBUTTON == nClassId ? OUStringLiteral(RID_EXTBMP_GROUPBOX) : OUStringLiteral(RID_EXTBMP_FIXEDTEXT)));
 
             // calc the currently set label control (so InsertEntries can calc m_pInitialSelection)
             Any aCurrentLabelControl( m_xControlModel->getPropertyValue(PROPERTY_CONTROLLABEL) );
@@ -110,7 +111,7 @@ namespace pcr
                 aCurrentLabelControl >>= m_xInitialLabelControl;
 
             // insert the root
-            Image aRootImage(BitmapEx(PcrRes(RID_EXTBMP_FORMS)));
+            Image aRootImage(BitmapEx(RID_EXTBMP_FORMS));
             SvTreeListEntry* pRoot = m_pControlTree->InsertEntry(PcrRes(RID_STR_FORMS).toString(), aRootImage, aRootImage);
 
             // build the tree
@@ -198,7 +199,7 @@ namespace pcr
                 Reference< XIndexAccess >  xCont(xAsSet, UNO_QUERY);
                 if (xCont.is() && xCont->getCount())
                 {   // yes -> step down
-                    Image aFormImage(BitmapEx(PcrRes(RID_EXTBMP_FORM)));
+                    Image aFormImage(BitmapEx(RID_EXTBMP_FORM));
                     SvTreeListEntry* pCont = m_pControlTree->InsertEntry(sName, aFormImage, aFormImage, pContainerEntry);
                     sal_Int32 nContChildren = InsertEntries(xCont, pCont);
                     if (nContChildren)
diff --git a/extensions/source/propctrlr/taborder.cxx b/extensions/source/propctrlr/taborder.cxx
index faae6af08fcf..580ffca78cb2 100644
--- a/extensions/source/propctrlr/taborder.cxx
+++ b/extensions/source/propctrlr/taborder.cxx
@@ -21,6 +21,7 @@
 
 #include "modulepcr.hxx"
 #include "formresid.hrc"
+#include "bitmaps.hlst"
 #include "formstrings.hxx"
 #include <comphelper/types.hxx>
 #include <comphelper/property.hxx>
@@ -44,39 +45,39 @@ namespace pcr
 
     Image GetImage( const Reference< XPropertySet >& _rxSet )
     {
-        sal_uInt16 nImageId = RID_EXTBMP_CONTROL;
+        OUString sImageId = RID_EXTBMP_CONTROL;
         // TODO: classify controls also in Basic propbrw
         if ( _rxSet.is() && ::comphelper::hasProperty( PROPERTY_CLASSID, _rxSet ) )
         {
             switch( ::comphelper::getINT16( _rxSet->getPropertyValue( PROPERTY_CLASSID ) ) )
             {
-            case FormComponentType::COMMANDBUTTON:  nImageId = RID_EXTBMP_BUTTON; break;
-            case FormComponentType::FIXEDTEXT:      nImageId = RID_EXTBMP_FIXEDTEXT; break;
-            case FormComponentType::TEXTFIELD:      nImageId = RID_EXTBMP_EDITBOX; break;
-            case FormComponentType::RADIOBUTTON:    nImageId = RID_EXTBMP_RADIOBUTTON; break;
-            case FormComponentType::CHECKBOX:       nImageId = RID_EXTBMP_CHECKBOX; break;
-            case FormComponentType::LISTBOX:        nImageId = RID_EXTBMP_LISTBOX; break;
-            case FormComponentType::COMBOBOX:       nImageId = RID_EXTBMP_COMBOBOX; break;
-            case FormComponentType::GROUPBOX:       nImageId = RID_EXTBMP_GROUPBOX; break;
-            case FormComponentType::IMAGEBUTTON:    nImageId = RID_EXTBMP_IMAGEBUTTON; break;
-            case FormComponentType::FILECONTROL:    nImageId = RID_EXTBMP_FILECONTROL; break;
-            case FormComponentType::HIDDENCONTROL:  nImageId = RID_EXTBMP_HIDDEN; break;
-            case FormComponentType::DATEFIELD:      nImageId = RID_EXTBMP_DATEFIELD; break;
-            case FormComponentType::TIMEFIELD:      nImageId = RID_EXTBMP_TIMEFIELD; break;
-            case FormComponentType::NUMERICFIELD:   nImageId = RID_EXTBMP_NUMERICFIELD; break;
-            case FormComponentType::CURRENCYFIELD:  nImageId = RID_EXTBMP_CURRENCYFIELD; break;
-            case FormComponentType::PATTERNFIELD:   nImageId = RID_EXTBMP_PATTERNFIELD; break;
-            case FormComponentType::IMAGECONTROL:   nImageId = RID_EXTBMP_IMAGECONTROL; break;
-            case FormComponentType::GRIDCONTROL:    nImageId = RID_EXTBMP_GRID; break;
-            case FormComponentType::SCROLLBAR:      nImageId = RID_EXTBMP_SCROLLBAR; break;
-            case FormComponentType::SPINBUTTON:     nImageId = RID_EXTBMP_SPINBUTTON; break;
-            case FormComponentType::NAVIGATIONBAR:  nImageId = RID_EXTBMP_NAVIGATIONBAR; break;
+            case FormComponentType::COMMANDBUTTON:  sImageId = RID_EXTBMP_BUTTON; break;
+            case FormComponentType::FIXEDTEXT:      sImageId = RID_EXTBMP_FIXEDTEXT; break;
+            case FormComponentType::TEXTFIELD:      sImageId = RID_EXTBMP_EDITBOX; break;
+            case FormComponentType::RADIOBUTTON:    sImageId = RID_EXTBMP_RADIOBUTTON; break;
+            case FormComponentType::CHECKBOX:       sImageId = RID_EXTBMP_CHECKBOX; break;
+            case FormComponentType::LISTBOX:        sImageId = RID_EXTBMP_LISTBOX; break;
+            case FormComponentType::COMBOBOX:       sImageId = RID_EXTBMP_COMBOBOX; break;
+            case FormComponentType::GROUPBOX:       sImageId = RID_EXTBMP_GROUPBOX; break;
+            case FormComponentType::IMAGEBUTTON:    sImageId = RID_EXTBMP_IMAGEBUTTON; break;
+            case FormComponentType::FILECONTROL:    sImageId = RID_EXTBMP_FILECONTROL; break;
+            case FormComponentType::HIDDENCONTROL:  sImageId = RID_EXTBMP_HIDDEN; break;
+            case FormComponentType::DATEFIELD:      sImageId = RID_EXTBMP_DATEFIELD; break;
+            case FormComponentType::TIMEFIELD:      sImageId = RID_EXTBMP_TIMEFIELD; break;
+            case FormComponentType::NUMERICFIELD:   sImageId = RID_EXTBMP_NUMERICFIELD; break;
+            case FormComponentType::CURRENCYFIELD:  sImageId = RID_EXTBMP_CURRENCYFIELD; break;
+            case FormComponentType::PATTERNFIELD:   sImageId = RID_EXTBMP_PATTERNFIELD; break;
+            case FormComponentType::IMAGECONTROL:   sImageId = RID_EXTBMP_IMAGECONTROL; break;
+            case FormComponentType::GRIDCONTROL:    sImageId = RID_EXTBMP_GRID; break;
+            case FormComponentType::SCROLLBAR:      sImageId = RID_EXTBMP_SCROLLBAR; break;
+            case FormComponentType::SPINBUTTON:     sImageId = RID_EXTBMP_SPINBUTTON; break;
+            case FormComponentType::NAVIGATIONBAR:  sImageId = RID_EXTBMP_NAVIGATIONBAR; break;
             default:
                 OSL_FAIL( "TabOrderDialog::GetImage: unknown control type" );
             }
         }
 
-        return Image(BitmapEx(PcrRes(nImageId)));;
+        return Image(BitmapEx(sImageId));;
     }
 
     }
diff --git a/extensions/source/update/ui/updatecheckui.cxx b/extensions/source/update/ui/updatecheckui.cxx
index 710e4256965e..99bbcaf349b5 100644
--- a/extensions/source/update/ui/updatecheckui.cxx
+++ b/extensions/source/update/ui/updatecheckui.cxx
@@ -52,7 +52,7 @@
 #include <sfx2/sfx.hrc>
 #include "rtl/ustrbuf.hxx"
 
-#include "updatecheckui.hrc"
+#include "bitmaps.hlst"
 
 #define STR_NO_WEBBROWSER_FOUND  (RID_SFX_APP_START + 7)
 
@@ -126,7 +126,6 @@ class UpdateCheckUI : public ::cppu::WeakImplHelper
     VclPtr<BubbleWindow> mpBubbleWin;
     VclPtr<SystemWindow> mpIconSysWin;
     VclPtr<MenuBar>     mpIconMBar;
-    ResMgr*             mpUpdResMgr;
     ResMgr*             mpSfxResMgr;
     Idle                maWaitIdle;
     Timer               maTimeoutTimer;
@@ -179,7 +178,6 @@ public:
                                                        const uno::Reference< beans::XVetoableChangeListener > & aListener) override;
 };
 
-
 UpdateCheckUI::UpdateCheckUI(const uno::Reference<uno::XComponentContext>& xContext) :
       m_xContext(xContext)
     , mpIconMBar( nullptr )
@@ -188,7 +186,6 @@ UpdateCheckUI::UpdateCheckUI(const uno::Reference<uno::XComponentContext>& xCont
     , mbBubbleChanged( false )
     , mnIconID( 0 )
 {
-    mpUpdResMgr = ResMgr::CreateResMgr( "updchk" );
     mpSfxResMgr = ResMgr::CreateResMgr( "sfx" );
 
     maBubbleImage = GetBubbleImage( maBubbleImageURL );
@@ -207,16 +204,13 @@ UpdateCheckUI::UpdateCheckUI(const uno::Reference<uno::XComponentContext>& xCont
     Application::AddEventListener( maApplicationEventHdl );
 }
 
-
 UpdateCheckUI::~UpdateCheckUI()
 {
     Application::RemoveEventListener( maApplicationEventHdl );
     RemoveBubbleWindow( true );
-    delete mpUpdResMgr;
     delete mpSfxResMgr;
 }
 
-
 OUString SAL_CALL
 UpdateCheckUI::getImplementationName()
 {
@@ -237,19 +231,19 @@ UpdateCheckUI::supportsService( OUString const & serviceName )
 
 Image UpdateCheckUI::GetMenuBarIcon( MenuBar* pMBar )
 {
-    sal_uInt32 nResID;
+    OUString sResID;
     vcl::Window *pMBarWin = pMBar->GetWindow();
     sal_uInt32 nMBarHeight = 20;
 
     if ( pMBarWin )
         nMBarHeight = pMBarWin->GetOutputSizePixel().getHeight();
 
-    if ( nMBarHeight >= 35 )
-        nResID = RID_UPDATE_AVAILABLE_26;
+    if (nMBarHeight >= 35)
+        sResID = RID_UPDATE_AVAILABLE_26;
     else
-        nResID = RID_UPDATE_AVAILABLE_16;
+        sResID = RID_UPDATE_AVAILABLE_16;
 
-    return Image(BitmapEx(ResId(nResID, *mpUpdResMgr)));
+    return Image(BitmapEx(sResID));
 }
 
 Image UpdateCheckUI::GetBubbleImage( OUString &rURL )
diff --git a/extensions/source/update/ui/updatecheckui.hrc b/extensions/source/update/ui/updatecheckui.hrc
deleted file mode 100644
index df30389f3407..000000000000
--- a/extensions/source/update/ui/updatecheckui.hrc
+++ /dev/null
@@ -1,25 +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 .
- */
-
- #define RID_UPDATECHECKUI_START            1100
-
- #define RID_UPDATE_AVAILABLE_16            RID_UPDATECHECKUI_START + 1
- #define RID_UPDATE_AVAILABLE_26            RID_UPDATECHECKUI_START + 2
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/update/ui/updatecheckui.src b/extensions/source/update/ui/updatecheckui.src
deleted file mode 100644
index ec57e5c2d9e9..000000000000
--- a/extensions/source/update/ui/updatecheckui.src
+++ /dev/null
@@ -1,32 +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 "updatecheckui.hrc"
-
-Bitmap RID_UPDATE_AVAILABLE_16
-{
-    File = "onlineupdate_16.png";
-};
-
-Bitmap RID_UPDATE_AVAILABLE_26
-{
-    File = "onlineupdate_26.png";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/postprocess/CustomTarget_images.mk b/postprocess/CustomTarget_images.mk
index fc4ddc10b93e..01c229fb2c1f 100644
--- a/postprocess/CustomTarget_images.mk
+++ b/postprocess/CustomTarget_images.mk
@@ -55,6 +55,7 @@ $(packimages_DIR)/sourceimagelist.ilst : \
 		$(SRCDIR)/chart2/inc/bitmaps.hlst \
 		$(SRCDIR)/dbaccess/inc/bitmaps.hlst \
 		$(SRCDIR)/desktop/inc/bitmaps.hlst \
+		$(SRCDIR)/extensions/inc/bitmaps.hlst \
 		$(SRCDIR)/sfx2/inc/bitmaps.hlst \
 		$(SRCDIR)/vcl/inc/bitmaps.hlst
 	grep res $^ | cut -d'"' -f2 | sed "s/^/%MODULE%\//" | sed "s/%MODULE%.res/%GLOBALRES%/g" > $@
diff --git a/scp2/source/ooo/file_resource_ooo.scp b/scp2/source/ooo/file_resource_ooo.scp
index 4c81a7a5f9cb..c3884cbe1260 100644
--- a/scp2/source/ooo/file_resource_ooo.scp
+++ b/scp2/source/ooo/file_resource_ooo.scp
@@ -101,10 +101,6 @@ STD_RES_FILE( gid_File_Res_AVMedia, avmedia )
 
 STD_RES_FILE( gid_File_Res_XMLSecurity, xmlsec )
 
-#if defined ENABLE_ONLINE_UPDATE
-STD_RES_FILE( gid_File_Res_UpdChk, updchk )
-#endif
-
 STD_RES_FILE( gid_File_Res_Upd, upd )
 
 STD_RES_FILE( gid_File_Res_T602Filter, t602filter )