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

[Noel Grandin]

 bin/find-unused-defines-in-hrc-files.py      |    3 +++
 reportdesign/inc/RptResId.hrc                |    4 ----
 reportdesign/inc/rptui_slotid.hrc            |    3 ---
 reportdesign/source/ui/dlg/GroupsSorting.src |    5 -----
 reportdesign/source/ui/report/report.src     |   15 ---------------
 5 files changed, 3 insertions(+), 27 deletions(-)

New commits:
commit c20dc4433546522a75d7b756162a65637e285887
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date:   Thu Mar 16 15:27:45 2017 +0200

    remove unused defines from HRC files in reportdesign
    
    Change-Id: If7d0b32742395e01bb979ffff9012161b0b7826d
    Reviewed-on: https://gerrit.libreoffice.org/35273
    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 011c62969286..7313152417c9 100755
--- a/bin/find-unused-defines-in-hrc-files.py
+++ b/bin/find-unused-defines-in-hrc-files.py
@@ -79,6 +79,7 @@ exclusionSet = set([
     "STR_UPDATE_INDEX",
     "STR_UPDATE_LINK",
     "BMP_PLACEHOLDER_",
+    "STR_RPT_HELP_"
     ])
 
 
@@ -134,6 +135,8 @@ with a.stdout as txt:
                 if "sd/source/ui/app/strings.src:" in line2 and idName.endswith("_TOOLBOX"): found_reason_to_exclude = True
                 # used via a macro that hides them from search
                 if "dbaccess/" in line2 and idName.startswith("PROPERTY_ID_"): found_reason_to_exclude = True
+                if "reportdesign/" in line2 and idName.startswith("HID_RPT_PROP_"): found_reason_to_exclude = True
+                if "reportdesign/" in line2 and idName.startswith("RID_STR_"): found_reason_to_exclude = True
 
         if not found_reason_to_exclude:
             sys.stdout.write(idName + '\n')
diff --git a/reportdesign/inc/RptResId.hrc b/reportdesign/inc/RptResId.hrc
index 154e0c36a506..a095b3b26c1a 100644
--- a/reportdesign/inc/RptResId.hrc
+++ b/reportdesign/inc/RptResId.hrc
@@ -66,10 +66,8 @@
 #define RID_STR_UNDO_ADDFUNCTION                ( RID_STRING_START +  28 )
 
 // other
-#define STR_RPT_TITLE                       ( RID_STRING_START +  32 )
 #define STR_RPT_LABEL                       ( RID_STRING_START +  33 )
 #define STR_RPT_EXPRESSION                  ( RID_STRING_START +  34 )
-#define STR_RPT_SORTING                     ( RID_STRING_START +  35 )
 #define STR_RPT_PN_PAGE                     ( RID_STRING_START +  36 )
 #define STR_RPT_PN_PAGE_OF                  ( RID_STRING_START +  37 )
 #define STR_RPT_PREFIXCHARS                 ( RID_STRING_START +  38 )
@@ -97,8 +95,6 @@
 #define RID_STR_BRWTITLE_PROPERTIES         ( RID_STRING_START +  60 )
 #define RID_STR_BRWTITLE_NO_PROPERTIES      ( RID_STRING_START +  61 )
 #define RID_STR_BRWTITLE_MULTISELECT        ( RID_STRING_START +  62 )
-#define STR_SHOW_RULER                      ( RID_STRING_START +  63 )
-#define STR_SHOW_GRID                       ( RID_STRING_START +  64 )
 
 #define RID_STR_FIELDSELECTION              ( RID_STRING_START +  69 )
 
diff --git a/reportdesign/inc/rptui_slotid.hrc b/reportdesign/inc/rptui_slotid.hrc
index 2c553c784e27..5023959c8ea1 100644
--- a/reportdesign/inc/rptui_slotid.hrc
+++ b/reportdesign/inc/rptui_slotid.hrc
@@ -175,8 +175,6 @@
 #define SID_ARRANGEMENU                         ( SID_RPTUI_START +  148 )
 #define SID_SELECTALL_IN_SECTION                ( SID_RPTUI_START +  149 )
 
-#define SID_ICON_DETAIL                         ( SID_RPTUI_START +  151 )
-
 #define SID_SECTION_ALIGN                       ( SID_RPTUI_START +  152 )
 #define SID_SECTION_ALIGN_LEFT                  ( SID_RPTUI_START +  153 )
 #define SID_SECTION_ALIGN_CENTER                ( SID_RPTUI_START +  154 )
@@ -194,7 +192,6 @@
 #define SID_SECTION_SHRINK                      ( SID_RPTUI_START +  163 )
 #define SID_SECTION_SHRINK_TOP                  ( SID_RPTUI_START +  164 )
 #define SID_SECTION_SHRINK_BOTTOM               ( SID_RPTUI_START +  165 )
-#define SID_SECTION_SHRINK_MENU                 ( SID_RPTUI_START +  166 )
 
 #define SID_COLLAPSE_SECTION                    ( SID_RPTUI_START +  167 )
 #define SID_EXPAND_SECTION                      ( SID_RPTUI_START +  168 )
diff --git a/reportdesign/source/ui/dlg/GroupsSorting.src b/reportdesign/source/ui/dlg/GroupsSorting.src
index 47c177df687f..687f6ba0bdb3 100644
--- a/reportdesign/source/ui/dlg/GroupsSorting.src
+++ b/reportdesign/source/ui/dlg/GroupsSorting.src
@@ -25,11 +25,6 @@ String STR_RPT_EXPRESSION
     Text [ en-US ] = "Field/Expression" ;
 };
 
-String STR_RPT_SORTING
-{
-    Text [ en-US ] = "Sort Order" ;
-};
-
 String STR_RPT_PREFIXCHARS
 {
     Text [ en-US ] = "Prefix Characters" ;
diff --git a/reportdesign/source/ui/report/report.src b/reportdesign/source/ui/report/report.src
index 5303dcf68167..f281af9e623b 100644
--- a/reportdesign/source/ui/report/report.src
+++ b/reportdesign/source/ui/report/report.src
@@ -102,16 +102,6 @@ Bitmap RID_BMP_TREENODE_EXPANDED
     File = "minus.png";
 };
 
-String STR_SHOW_RULER
-{
-    Text [ en-US ] = "Show ruler";
-};
-
-String STR_SHOW_GRID
-{
-    Text [ en-US ] = "Show grid";
-};
-
 String RID_STR_UNDO_CHANGEPOSITION
 {
     Text [ en-US ] = "Change Object";
@@ -164,11 +154,6 @@ String RID_STR_UNDO_ADDFUNCTION
     Text [ en-US ] = "Add function";
 };
 
-String STR_RPT_TITLE
-{
-    Text [ en-US ] = "Report #" ;
-};
-
 String STR_RPT_LABEL
 {
     Text [ en-US ] = "~Report name" ;