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>

3 files changed, 116 insertions, 65 deletions

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: */