[Libreoffice-commits] core.git: bin/find-unused-defines-in-hrc-files.py extensions/inc extensions/source

[Noel Grandin]

 bin/find-unused-defines-in-hrc-files.py          |    7 +++++--
 extensions/inc/bibliography.hrc                  |    1 -
 extensions/inc/propctrlr.hrc                     |    1 -
 extensions/source/abpilot/abpresid.hrc           |   11 -----------
 extensions/source/abpilot/abspilot.src           |    5 -----
 extensions/source/dbpilots/dbpresid.hrc          |    3 ---
 extensions/source/propctrlr/listselectiondlg.hrc |    2 --
 7 files changed, 5 insertions(+), 25 deletions(-)

New commits:
commit a9bbc74f1d9053cb3b950e0c14e0fae18f1b0257
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date:   Fri Mar 17 08:13:42 2017 +0200

    remove unused defines from HRC files in extensions
    
    Change-Id: Idc98097d32c64c095bb735c8cb91b0ab368c8fa9
    Reviewed-on: https://gerrit.libreoffice.org/35309
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/bin/find-unused-defines-in-hrc-files.py b/bin/find-unused-defines-in-hrc-files.py
index 76d93c215df0..923de0fcbcfb 100755
--- a/bin/find-unused-defines-in-hrc-files.py
+++ b/bin/find-unused-defines-in-hrc-files.py
@@ -79,8 +79,11 @@ exclusionSet = set([
     "STR_UPDATE_INDEX",
     "STR_UPDATE_LINK",
     "BMP_PLACEHOLDER_",
-    "STR_RPT_HELP_"
-    "STR_TEMPLATE_NAME"
+    "STR_RPT_HELP_",
+    "STR_TEMPLATE_NAME",
+    "UID_BRWEVT_",
+    "HID_EVT_",
+    "HID_PROP_",
     ])
 
 
diff --git a/extensions/inc/bibliography.hrc b/extensions/inc/bibliography.hrc
index 5b30a2605c51..9316e19073c1 100644
--- a/extensions/inc/bibliography.hrc
+++ b/extensions/inc/bibliography.hrc
@@ -51,7 +51,6 @@
 #define HID_BIB_CUSTOM3_POS                             "EXTENSIONS_HID_BIB_CUSTOM3_POS"
 #define HID_BIB_CUSTOM4_POS                             "EXTENSIONS_HID_BIB_CUSTOM4_POS"
 #define HID_BIB_CUSTOM5_POS                             "EXTENSIONS_HID_BIB_CUSTOM5_POS"
-#define HID_BIB_CONTROL_PARENT                          "EXTENSIONS_HID_BIB_CONTROL_PARENT"
 #define HID_BIB_DB_GRIDCTRL                             "EXTENSIONS_HID_BIB_DB_GRIDCTRL"
 
 #endif // EXTENSIONS_BIBLIOGRAPHY_HRC
diff --git a/extensions/inc/propctrlr.hrc b/extensions/inc/propctrlr.hrc
index 0886ecfbae2f..2af190270a16 100644
--- a/extensions/inc/propctrlr.hrc
+++ b/extensions/inc/propctrlr.hrc
@@ -243,7 +243,6 @@
 #define HID_PROP_XSD_MIN_EXCLUSIVE                      "EXTENSIONS_HID_PROP_XSD_MIN_EXCLUSIVE"
 #define HID_PROP_UNCHECKEDREFVALUE                      "EXTENSIONS_HID_PROP_UNCHECKEDREFVALUE"
 #define HID_PROP_SUBMISSION_ID                          "EXTENSIONS_HID_PROP_SUBMISSION_ID"
-#define UID_EVT_MACRODLG                                "EXTENSIONS_UID_EVT_MACRODLG"
 #define HID_PROP_XML_DATA_MODEL                         "EXTENSIONS_HID_PROP_XML_DATA_MODEL"
 #define HID_PROP_BIND_EXPRESSION                        "EXTENSIONS_HID_PROP_BIND_EXPRESSION"
 #define HID_PROP_XSD_REQUIRED                           "EXTENSIONS_HID_PROP_XSD_REQUIRED"
diff --git a/extensions/source/abpilot/abpresid.hrc b/extensions/source/abpilot/abpresid.hrc
index 2cd1f8132b4c..7657b47fdc7c 100644
--- a/extensions/source/abpilot/abpresid.hrc
+++ b/extensions/source/abpilot/abpresid.hrc
@@ -27,7 +27,6 @@
 
 #define RID_PAGE_START                  RID_ABP_START
 #define RID_STRING_START                RID_ABP_START
-#define RID_BITMAP_START                RID_ABP_START
 
 // strings
 
@@ -50,21 +49,11 @@
 
 #define RID_STRING_END                  RID_STR_QRY_NOTABLES
 
-// bitmaps
-
-#define BMP_HEADERIMAGE                 ( RID_BITMAP_START +  0 )
-// please adjust RID_BITMAP_END (below) when adding new bitmaps
-
-#define RID_BITMAP_END                  BMP_HEADERIMAGE
-
 // range checks
 
 #if RID_STRING_END > RID_ABP_END
     #error "please adjust the resource id ranges!!"
 #endif
-#if RID_BITMAP_END > RID_ABP_END
-    #error "please adjust the resource id ranges!!"
-#endif
 
 // some defines
 #define WINDOW_SIZE_X   240
diff --git a/extensions/source/abpilot/abspilot.src b/extensions/source/abpilot/abspilot.src
index bb8ac22156dd..457e0e993f15 100644
--- a/extensions/source/abpilot/abspilot.src
+++ b/extensions/source/abpilot/abspilot.src
@@ -94,9 +94,4 @@ String RID_STR_NOFIELDSASSIGNED
     Text [ en-US ] = "There are no fields assigned at this time.\nYou can either assign fields now or do so later by first choosing:\n\"File - Template - Address Book Source...\"";
 };
 
-Bitmap BMP_HEADERIMAGE
-{
-    file = "addresspilot.bmp";
-};
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/dbpilots/dbpresid.hrc b/extensions/source/dbpilots/dbpresid.hrc
index d634b1b3cf50..44af26f42da3 100644
--- a/extensions/source/dbpilots/dbpresid.hrc
+++ b/extensions/source/dbpilots/dbpresid.hrc
@@ -64,9 +64,6 @@
 
 // local ids
 
-// FixedLine
-#define FL_FRAME                    6
-
 // Image
 
 #define BMP_TABLE                   ( RID_DIALOG_START + 1 )
diff --git a/extensions/source/propctrlr/listselectiondlg.hrc b/extensions/source/propctrlr/listselectiondlg.hrc
index 67683648da9b..ee62daa5fd5c 100644
--- a/extensions/source/propctrlr/listselectiondlg.hrc
+++ b/extensions/source/propctrlr/listselectiondlg.hrc
@@ -20,8 +20,6 @@
 #ifndef EXTENSIONS_SOURCE_PROPCTRLR_LISTSELECTIONDLG_HRC
 #define EXTENSIONS_SOURCE_PROPCTRLR_LISTSELECTIONDLG_HRC
 
-#define LB_ENTRIES  1
-
 #define PB_OK       1
 #define PB_CANCEL   2
 #define PB_HELP     3