[Libreoffice-commits] core.git: avmedia/inc basic/inc basic/source bin/find-unused-defines-in-hrc-files.py formula/source framework/inc framework/source
Noel Grandin
noel.grandin at collabora.co.uk
Fri Mar 17 10:43:55 UTC 2017
avmedia/inc/helpids.hrc | 1 -
basic/inc/sb.hrc | 1 -
basic/source/classes/sb.src | 4 ----
bin/find-unused-defines-in-hrc-files.py | 1 +
formula/source/ui/dlg/formdlgs.hrc | 1 -
formula/source/ui/dlg/formdlgs.src | 10 ----------
formula/source/ui/inc/ForResId.hrc | 2 --
framework/inc/classes/resource.hrc | 3 ---
framework/source/classes/resource.src | 15 ---------------
9 files changed, 1 insertion(+), 37 deletions(-)
New commits:
commit c627f4b92824a7c1900e54e8a66773f45e3766dd
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Fri Mar 17 08:34:48 2017 +0200
remove unused defines from HRC files in various
Change-Id: Ia1ba313d2438f04a84bcfcbbbcf6fffea5c1921d
Reviewed-on: https://gerrit.libreoffice.org/35310
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/avmedia/inc/helpids.hrc b/avmedia/inc/helpids.hrc
index b472e77c60aa..f7152de0621f 100644
--- a/avmedia/inc/helpids.hrc
+++ b/avmedia/inc/helpids.hrc
@@ -28,7 +28,6 @@
#define HID_AVMEDIA_TOOLBOXITEM_OPEN "AVMEDIA_HID_AVMEDIA_TOOLBOXITEM_OPEN"
#define HID_AVMEDIA_TOOLBOXITEM_INSERT "AVMEDIA_HID_AVMEDIA_TOOLBOXITEM_INSERT"
#define HID_AVMEDIA_ZOOMLISTBOX "AVMEDIA_HID_AVMEDIA_ZOOMLISTBOX"
-#define HID_AVMEDIA_TIMESLIDER "AVMEDIA_HID_AVMEDIA_TIMESLIDER"
#define HID_AVMEDIA_TIMEEDIT "AVMEDIA_HID_AVMEDIA_TIMEEDIT"
#define HID_AVMEDIA_VOLUMESLIDER "AVMEDIA_HID_AVMEDIA_VOLUMESLIDER"
#define HID_AVMEDIA_PLAYERWINDOW "AVMEDIA_HID_AVMEDIA_PLAYERWINDOW"
diff --git a/basic/inc/sb.hrc b/basic/inc/sb.hrc
index d4191be23063..12469099cf88 100644
--- a/basic/inc/sb.hrc
+++ b/basic/inc/sb.hrc
@@ -27,7 +27,6 @@
#endif
#define IDS_SBERR_TERMINATED IDS_SBERR_START+2000
-#define IDS_SBERR_STOREREF IDS_SBERR_START+2001
#endif
diff --git a/basic/source/classes/sb.src b/basic/source/classes/sb.src
index 5b75b949d74c..d39e7b9bc228 100644
--- a/basic/source/classes/sb.src
+++ b/basic/source/classes/sb.src
@@ -162,10 +162,6 @@ String IDS_SBERR_TERMINATED
{
Text [ en-US ] = "The macro running has been interrupted" ;
};
-String IDS_SBERR_STOREREF
-{
- Text [ en-US ] = "Reference will not be saved: ";
-};
String ERRCODE_BASMGR_LIBLOAD & ERRCODE_RES_MASK
{
Text [ en-US ] = "Error loading library '$(ARG1)'." ;
diff --git a/bin/find-unused-defines-in-hrc-files.py b/bin/find-unused-defines-in-hrc-files.py
index 923de0fcbcfb..9350e3a721d7 100755
--- a/bin/find-unused-defines-in-hrc-files.py
+++ b/bin/find-unused-defines-in-hrc-files.py
@@ -142,6 +142,7 @@ with a.stdout as txt:
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 "forms/" in line2 and idName.startswith("PROPERTY_"): found_reason_to_exclude = True
# if we see more than 2 lines then it's probably one of the BASE/START/BEGIN things
cnt = cnt + 2
if cnt > 3: found_reason_to_exclude = True
diff --git a/formula/source/ui/dlg/formdlgs.hrc b/formula/source/ui/dlg/formdlgs.hrc
index c56104cff1be..57778a87a853 100644
--- a/formula/source/ui/dlg/formdlgs.hrc
+++ b/formula/source/ui/dlg/formdlgs.hrc
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#define BTN_HELP 6
#define BTN_CANCEL 7
#define BTN_END 10
#define ED_FORMULA 17
diff --git a/formula/source/ui/dlg/formdlgs.src b/formula/source/ui/dlg/formdlgs.src
index fc9e22834d3a..0df94d1bde6f 100644
--- a/formula/source/ui/dlg/formdlgs.src
+++ b/formula/source/ui/dlg/formdlgs.src
@@ -40,16 +40,6 @@ Bitmap BMP_STR_ERROR
File = "faperror.png";
};
-String STR_STRUCT_ERR1
-{
- Text [ en-US ] = "=?" ;
-};
-
-String STR_STRUCT_ERR2
-{
- Text [ en-US ] = "Error" ;
-};
-
String STR_TITLE1
{
Text [ en-US ] = "Function Wizard" ;
diff --git a/formula/source/ui/inc/ForResId.hrc b/formula/source/ui/inc/ForResId.hrc
index d0ad17fae809..a1b64a8c2960 100644
--- a/formula/source/ui/inc/ForResId.hrc
+++ b/formula/source/ui/inc/ForResId.hrc
@@ -41,8 +41,6 @@
// strings
#define RID_STR_SHRINK (RID_STRING_START + 0)
#define RID_STR_EXPAND (RID_STRING_START + 1)
-#define STR_STRUCT_ERR1 (RID_STRING_START + 2)
-#define STR_STRUCT_ERR2 (RID_STRING_START + 3)
#define STR_OPTIONAL (RID_STRING_START + 4)
#define STR_REQUIRED (RID_STRING_START + 5)
#define STR_END (RID_STRING_START + 6)
diff --git a/framework/inc/classes/resource.hrc b/framework/inc/classes/resource.hrc
index ad3d9849d039..6075d10293cb 100644
--- a/framework/inc/classes/resource.hrc
+++ b/framework/inc/classes/resource.hrc
@@ -25,7 +25,6 @@
#define RID_IMAGE_START 15000
#define STR_MENU_ADDONS (RID_STR_START+0)
-#define STR_MENU_ADDONHELP (RID_STR_START+1)
#define STR_MENU_HEADFOOTALL (RID_STR_START+2)
#define STR_UPDATEDOC (RID_STR_START+3)
#define STR_CLOSEDOC_ANDRETURN (RID_STR_START+4)
@@ -42,9 +41,7 @@
#define STR_LANGSTATUS_MULTIPLE_LANGUAGES (RID_STR_START+15)
#define STR_LANGSTATUS_NONE (RID_STR_START+16)
#define STR_LANGSTATUS_MORE (RID_STR_START+17)
-#define STR_SET_LANGUAGE_FOR_SELECTION (RID_STR_START+18)
#define STR_SET_LANGUAGE_FOR_PARAGRAPH (RID_STR_START+19)
-#define STR_SET_LANGUAGE_FOR_ALL_TEXT (RID_STR_START+20)
#define STR_UNTITLED_DOCUMENT (RID_STR_START+21)
#define STR_RESET_TO_DEFAULT_LANGUAGE (RID_STR_START+22)
#define STR_CLEAR_RECENT_FILES (RID_STR_START+23)
diff --git a/framework/source/classes/resource.src b/framework/source/classes/resource.src
index 0d3b02dd1f55..998d3721797c 100644
--- a/framework/source/classes/resource.src
+++ b/framework/source/classes/resource.src
@@ -24,11 +24,6 @@ String STR_MENU_ADDONS
Text [ en-US ] = "Add-Ons" ;
};
-String STR_MENU_ADDONHELP
-{
- Text [ en-US ] = "Add-~On Help" ;
-};
-
String STR_MENU_HEADFOOTALL
{
Text [ en-US ] = "All" ;
@@ -184,21 +179,11 @@ String STR_LANGSTATUS_MORE
Text [ en-US ] = "More..." ;
};
-String STR_SET_LANGUAGE_FOR_SELECTION
-{
- Text [ en-US ] = "Set Language for Selection" ;
-};
-
String STR_SET_LANGUAGE_FOR_PARAGRAPH
{
Text [ en-US ] = "Set Language for Paragraph" ;
};
-String STR_SET_LANGUAGE_FOR_ALL_TEXT
-{
- Text [ en-US ] = "Set Language for all Text" ;
-};
-
String STR_LANGSTATUS_HINT
{
Text [ en-US ] = "Text Language. Right-click to set character or paragraph language" ;
More information about the Libreoffice-commits
mailing list