[Libreoffice-commits] core.git: bin/find-unused-defines-in-hrc-files.py include/sfx2 sfx2/inc sfx2/source
Noel Grandin
noel.grandin at collabora.co.uk
Fri Mar 17 10:24:12 UTC 2017
bin/find-unused-defines-in-hrc-files.py | 1
include/sfx2/sfx.hrc | 6 --
sfx2/inc/app.hrc | 4 -
sfx2/inc/doc.hrc | 14 ------
sfx2/source/appl/app.src | 13 ------
sfx2/source/appl/newhelp.src | 15 -------
sfx2/source/appl/sfx.src | 5 --
sfx2/source/dialog/dialog.hrc | 3 -
sfx2/source/dialog/dialog.src | 9 ----
sfx2/source/doc/doc.src | 68 --------------------------------
sfx2/source/inc/helpid.hrc | 3 -
sfx2/source/view/view.hrc | 3 -
sfx2/source/view/view.src | 8 ---
13 files changed, 1 insertion(+), 151 deletions(-)
New commits:
commit 6bedab8bc353afe54e40aa88400f0cacd2002d6e
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Thu Mar 16 16:34:57 2017 +0200
remove unused defines from HRC files in sfx2
Change-Id: Iffe6508558795e059048acae2ca955a78d3e9d6d
Reviewed-on: https://gerrit.libreoffice.org/35279
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 024f7a5797ef..76d93c215df0 100755
--- a/bin/find-unused-defines-in-hrc-files.py
+++ b/bin/find-unused-defines-in-hrc-files.py
@@ -80,6 +80,7 @@ exclusionSet = set([
"STR_UPDATE_LINK",
"BMP_PLACEHOLDER_",
"STR_RPT_HELP_"
+ "STR_TEMPLATE_NAME"
])
diff --git a/include/sfx2/sfx.hrc b/include/sfx2/sfx.hrc
index 139a34f3e2bd..c104d4e12e0a 100644
--- a/include/sfx2/sfx.hrc
+++ b/include/sfx2/sfx.hrc
@@ -76,16 +76,11 @@
#define RID_DEFAULTABOUT (RID_SFX_START+0)
-#define STR_STYLE_FILTER_AUTO (RID_SFX_START+9)
-#define STR_STYLE_FILTER_USED (RID_SFX_START+10)
-#define STR_STYLE_FILTER_USERDEF (RID_SFX_START+11)
-#define STR_STYLE_FILTER_ALL (RID_SFX_START+12)
// +13 already used!
#define STR_STYLE_FILTER_HIERARCHICAL (RID_SFX_START+1200)
#define STR_NONAME (RID_SFX_START+100)
#define STR_NONE (RID_SFX_START+101)
-#define STR_CLOSE (RID_SFX_START+103)
#define STR_STANDARD (RID_SFX_START+104)
#define STR_READONLY (RID_SFX_START+105)
@@ -125,7 +120,6 @@
#define STR_SIGNATURE_NOTVALIDATED (RID_SFX_START+141)
#define STR_SIGNATURE_PARTIAL_OK (RID_SFX_START+142)
#define STR_SIGNATURE_OK (RID_SFX_START+143)
-#define STR_ACCTITLE_PRODUCTIVITYTOOLS (RID_SFX_START+157)
#define SFX_THUMBNAIL_TEXT (RID_SFX_START+158)
#define SFX_THUMBNAIL_SHEET (RID_SFX_START+159)
diff --git a/sfx2/inc/app.hrc b/sfx2/inc/app.hrc
index 90f2f70d36c5..e08c2ac5f268 100644
--- a/sfx2/inc/app.hrc
+++ b/sfx2/inc/app.hrc
@@ -23,7 +23,6 @@
#define STR_NO_WEBBROWSER_FOUND (RID_SFX_APP_START+7)
#define STR_NO_ABS_URI_REF (RID_SFX_APP_START+8)
-#define STR_ISMODIFIED (RID_SFX_APP_START+11)
#define RID_FULLSCREENTOOLBOX (RID_SFX_APP_START+42)
#define RID_ENVTOOLBOX (RID_SFX_APP_START+44)
@@ -62,8 +61,6 @@
#define STR_HELP_BUTTON_NEXT (RID_SFX_APP_START+129)
#define STR_HELP_BUTTON_PRINT (RID_SFX_APP_START+130)
#define STR_HELP_BUTTON_SOURCEVIEW (RID_SFX_APP_START+131)
-#define STR_HELP_FIRST_MESSAGE (RID_SFX_APP_START+132)
-#define STR_HELP_FIRST_HTML (RID_SFX_APP_START+133)
#define STR_QUICKSTART_EXIT (RID_SFX_APP_START+134)
#define STR_QUICKSTART_TIP (RID_SFX_APP_START+135)
@@ -91,7 +88,6 @@
#define BMP_HELP_TOOLBOX_L_PRINT (RID_SFX_APP_START+165)
#define BMP_HELP_TOOLBOX_L_BOOKMARKS (RID_SFX_APP_START+166)
#define BMP_HELP_TOOLBOX_L_SEARCHDIALOG (RID_SFX_APP_START+167)
-#define BMP_HELP_TOOLBOX_L_COPY (RID_SFX_APP_START+168)
#define RID_SECURITY_WARNING_TITLE (RID_SFX_APP_START + 181)
diff --git a/sfx2/inc/doc.hrc b/sfx2/inc/doc.hrc
index f5e0ac1b479f..1faf84e21c01 100644
--- a/sfx2/inc/doc.hrc
+++ b/sfx2/inc/doc.hrc
@@ -66,16 +66,12 @@
#define STR_HIDDENINFO_RECORDCHANGES (RID_SFX_DOC_START+111)
#define STR_HIDDENINFO_NOTES (RID_SFX_DOC_START+112)
#define STR_HIDDENINFO_DOCVERSIONS (RID_SFX_DOC_START+113)
-#define STR_HIDDENINFO_FIELDS (RID_SFX_DOC_START+114)
-#define STR_HIDDENINFO_LINKDATA (RID_SFX_DOC_START+115)
#define STR_HIDDENINFO_CONTINUE_SAVING (RID_SFX_DOC_START+116)
#define STR_HIDDENINFO_CONTINUE_PRINTING (RID_SFX_DOC_START+117)
#define STR_HIDDENINFO_CONTINUE_SIGNING (RID_SFX_DOC_START+118)
#define STR_HIDDENINFO_CONTINUE_CREATEPDF (RID_SFX_DOC_START+119)
#define STR_NEW_FILENAME_SAVE (RID_SFX_DOC_START+121)
-#define STR_ERROR_DELETE_TEMPLATE_DIR (RID_SFX_DOC_START+123)
-#define STR_DOCINFO_INFOFIELD (RID_SFX_DOC_START+124)
#define STR_XMLSEC_QUERY_SAVESIGNEDBEFORESIGN (RID_SFX_DOC_START+125)
#define STR_XMLSEC_ODF12_EXPECTED (RID_SFX_DOC_START+126)
@@ -84,26 +80,17 @@
#define STR_QRYTEMPL_UPDATE_BTN (RID_SFX_DOC_START+128)
#define STR_QRYTEMPL_KEEP_BTN (RID_SFX_DOC_START+129)
-#define STR_ACTION_SORT_NAME (RID_SFX_DOC_START+130)
#define STR_ACTION_REFRESH (RID_SFX_DOC_START+131)
#define STR_ACTION_DEFAULT (RID_SFX_DOC_START+132)
-#define STR_MOVE_NEW (RID_SFX_DOC_START+133)
#define STR_INPUT_NEW (RID_SFX_DOC_START+134)
-#define STR_REPOSITORY_LOCAL (RID_SFX_DOC_START+135)
-#define STR_REPOSITORY_NEW (RID_SFX_DOC_START+136)
#define STR_MSG_ERROR_LOCAL_MOVE (RID_SFX_DOC_START+137)
-#define STR_MSG_ERROR_REMOTE_MOVE (RID_SFX_DOC_START+138)
#define STR_MSG_ERROR_EXPORT (RID_SFX_DOC_START+139)
#define STR_MSG_ERROR_IMPORT (RID_SFX_DOC_START+140)
#define STR_MSG_ERROR_DELETE_TEMPLATE (RID_SFX_DOC_START+141)
#define STR_MSG_ERROR_DELETE_FOLDER (RID_SFX_DOC_START+142)
-#define STR_MSG_ERROR_REPOSITORY_NAME (RID_SFX_DOC_START+143)
-#define STR_MSG_ERROR_SELECT_FOLDER (RID_SFX_DOC_START+144)
-#define STR_INPUT_TEMPLATE_NEW (RID_SFX_DOC_START+145)
#define STR_QMSG_SEL_FOLDER_DELETE (RID_SFX_DOC_START+146)
#define STR_QMSG_TEMPLATE_OVERWRITE (RID_SFX_DOC_START+147)
#define STR_QMSG_SEL_TEMPLATE_DELETE (RID_SFX_DOC_START+148)
-#define BMP_ACTION_SORT (RID_SFX_DOC_START+149)
#define BMP_ACTION_REFRESH (RID_SFX_DOC_START+150)
#define STR_OPEN (RID_SFX_DOC_START+151)
@@ -111,7 +98,6 @@
#define STR_DEFAULT_TEMPLATE (RID_SFX_DOC_START+153)
#define STR_RENAME (RID_SFX_DOC_START+154)
#define STR_DELETE (RID_SFX_DOC_START+155)
-#define STR_PROPERTIES (RID_SFX_DOC_START+156)
#define STR_RENAME_TEMPLATE (RID_SFX_DOC_START+157)
#define STR_CATEGORY_NEW (RID_SFX_DOC_START+158)
diff --git a/sfx2/source/appl/app.src b/sfx2/source/appl/app.src
index 7d7f6d81c88b..6c3bb53d2330 100644
--- a/sfx2/source/appl/app.src
+++ b/sfx2/source/appl/app.src
@@ -25,14 +25,6 @@ String STR_NONAME
{
Text [ en-US ] = "Untitled" ;
};
-String STR_CLOSE
-{
- Text [ en-US ] = "Close" ;
-};
-String STR_STYLE_FILTER_AUTO
-{
- Text [ en-US ] = "Automatic" ;
-};
String STR_STANDARD_SHORTCUT
{
Text [ en-US ] = "Standard" ;
@@ -198,11 +190,6 @@ String GID_CONTROLS
Text [ en-US ] = "Controls" ;
};
-String STR_ISMODIFIED
-{
- Text [ en-US ] = "Do you want to save the changes to %1?" ;
-};
-
String STR_QUITAPP
{
Text [ en-US ] = "E~xit %PRODUCTNAME" ;
diff --git a/sfx2/source/appl/newhelp.src b/sfx2/source/appl/newhelp.src
index cf29f33c675b..2955f9052499 100644
--- a/sfx2/source/appl/newhelp.src
+++ b/sfx2/source/appl/newhelp.src
@@ -131,16 +131,6 @@ String STR_HELP_BUTTON_SOURCEVIEW
Text [ en-US ] = "HTML Source";
};
-String STR_HELP_FIRST_MESSAGE
-{
- Text [ en-US ] = "The Help is being started...";
-};
-
-String STR_HELP_FIRST_HTML
-{
- Text = "<html></head><body><center><br></br><br></br><p><tt>%1</tt></center></body></html>";
-};
-
String STR_HELP_MENU_TEXT_SELECTION_MODE
{
Text [ en-US ] = "Select Text";
@@ -230,11 +220,6 @@ Bitmap BMP_HELP_TOOLBOX_L_SEARCHDIALOG
File = "lc05961.png" ;
};
-Bitmap BMP_HELP_TOOLBOX_L_COPY
-{
- File = "lc05711.png" ;
-};
-
String RID_HELP_ONSTARTUP_TEXT
{
Text [ en-US ] = "~Display %PRODUCTNAME %MODULENAME Help at Startup";
diff --git a/sfx2/source/appl/sfx.src b/sfx2/source/appl/sfx.src
index 5ece515ab104..45f4e8d3522b 100644
--- a/sfx2/source/appl/sfx.src
+++ b/sfx2/source/appl/sfx.src
@@ -19,11 +19,6 @@
#include <sfx2/sfx.hrc>
-String STR_ACCTITLE_PRODUCTIVITYTOOLS
-{
- Text [ en-US ] = "%PRODUCTNAME";
-};
-
String STR_PASSWD_MIN_LEN
{
Text [ en-US ] = "(Minimum $(MINLEN) characters)" ;
diff --git a/sfx2/source/dialog/dialog.hrc b/sfx2/source/dialog/dialog.hrc
index 6864546c7819..e78b075bfae1 100644
--- a/sfx2/source/dialog/dialog.hrc
+++ b/sfx2/source/dialog/dialog.hrc
@@ -49,14 +49,11 @@
#define STR_ERROR_WRONG_CONFIRM ( RC_DIALOG_BEGIN + 76 )
-#define STR_APPLY ( RC_DIALOG_BEGIN + 87 )
-
// 100-106 in tbxcust.hrc
#define STR_MACRO_LOSS ( RC_DIALOG_BEGIN + 107 )
#define STR_CANCEL_RECORDING ( RC_DIALOG_BEGIN + 108 )
#define STR_PDF_EXPORT_SEND ( RC_DIALOG_BEGIN + 120 )
-#define BMP_INFO ( RC_DIALOG_BEGIN + 122 )
//free
#define SFX_ST_EDIT ( RC_DIALOG_BEGIN + 124 )
#define STR_STYLE_ELEMTLIST ( RC_DIALOG_BEGIN + 125 )
diff --git a/sfx2/source/dialog/dialog.src b/sfx2/source/dialog/dialog.src
index 6c1198b47afa..42cedfa0aee5 100644
--- a/sfx2/source/dialog/dialog.src
+++ b/sfx2/source/dialog/dialog.src
@@ -26,10 +26,6 @@ String STR_RESET
{
Text [ en-US ] = "~Reset" ;
};
-String STR_APPLY
-{
- Text [ en-US ] = "Apply";
-};
String STR_TABPAGE_INVALIDNAME
{
Text [ en-US ] = "This name is already in use." ;
@@ -108,11 +104,6 @@ String STR_PDF_EXPORT_SEND
Text [ en-US ] = "Send" ;
};
-Bitmap BMP_INFO
-{
- File = "info.png" ;
-};
-
String STR_FONT_TABPAGE
{
Text [ en-US ] = "Font" ;
diff --git a/sfx2/source/doc/doc.src b/sfx2/source/doc/doc.src
index a2240643d024..24f012757503 100644
--- a/sfx2/source/doc/doc.src
+++ b/sfx2/source/doc/doc.src
@@ -68,10 +68,6 @@ String STR_CATEGORY_RENAME
{
Text [ en-US ] = "Rename Category" ;
};
-String STR_PROPERTIES
-{
- Text [ en-US ] = "Properties" ;
-};
String STR_RENAME_TEMPLATE
{
Text [ en-US ] = "Enter New Name: " ;
@@ -150,14 +146,6 @@ String STR_HIDDENINFO_DOCVERSIONS
{
Text [ en-US ] = "Document versions" ;
};
-String STR_HIDDENINFO_FIELDS
-{
- Text [ en-US ] = "Fields" ;
-};
-String STR_HIDDENINFO_LINKDATA
-{
- Text [ en-US ] = "Linked data..." ;
-};
String STR_HIDDENINFO_CONTINUE_SAVING
{
Text [ en-US ] = "Do you want to continue saving the document?" ;
@@ -180,17 +168,6 @@ String STR_NEW_FILENAME_SAVE
Text [ en-US ] = "If you do not want to overwrite the original document, you should save your work under a new filename." ;
};
-String STR_ERROR_DELETE_TEMPLATE_DIR
-{
- Text [ en-US ] = "Some template files are protected and can not be deleted.";
-};
-
-String STR_DOCINFO_INFOFIELD
-{
- Text [ en-US ] = "Info %1";
- Text [ x-comment ] = "pb: %1 == a number [1-4]";
-};
-
String STR_SHARED
{
Text [ en-US ] = " (shared)";
@@ -222,11 +199,6 @@ String STR_QRYTEMPL_KEEP_BTN
Text [ en-US ] = "~Keep Old Styles";
};
-String STR_ACTION_SORT_NAME
-{
- Text [ en-US ] = "Sort by name";
-};
-
String STR_ACTION_REFRESH
{
Text [ en-US ] = "Refresh";
@@ -238,11 +210,6 @@ String STR_ACTION_DEFAULT
Text [ en-US ] = "Reset Default Template ";
};
-String STR_MOVE_NEW
-{
- Text [ en-US ] = "New folder";
-};
-
String STR_CATEGORY_NEW
{
Text [ en-US ] = "New Category";
@@ -283,26 +250,11 @@ String STR_INPUT_NEW
Text [ en-US ] = "Enter category name:";
};
-String STR_REPOSITORY_LOCAL
-{
- Text [ en-US ] = "Local";
-};
-
-String STR_REPOSITORY_NEW
-{
- Text [ en-US ] = "New Repository";
-};
-
String STR_MSG_ERROR_LOCAL_MOVE
{
Text [ en-US ] = "Error moving the following templates to $1.\n$2" ;
};
-String STR_MSG_ERROR_REMOTE_MOVE
-{
- Text [ en-US ] = "Error moving the following templates from repository $1 to folder $2.\n$3" ;
-};
-
String STR_MSG_ERROR_EXPORT
{
Text [ en-US ] = "Error exporting the following templates:\n$1";
@@ -323,21 +275,6 @@ String STR_MSG_ERROR_DELETE_FOLDER
Text [ en-US ] = "The following folders cannot be deleted:\n$1";
};
-String STR_MSG_ERROR_REPOSITORY_NAME
-{
- Text [ en-US ] = "Failed to create repository \"$1\".\nA repository with this name may already exist.";
-};
-
-String STR_MSG_ERROR_SELECT_FOLDER
-{
- Text [ en-US ] = "Select the destination folder(s) to save the template.";
-};
-
-String STR_INPUT_TEMPLATE_NEW
-{
- Text [ en-US ] = "Enter template name:";
-};
-
String STR_QMSG_SEL_FOLDER_DELETE
{
Text [ en-US ] = "Do you want to delete the selected folders?";
@@ -368,11 +305,6 @@ String STR_QMSG_ERROR_OPENING_FILE_CONTINUE
Text [ en-US ] = "\nProceeding with import may cause data loss or corruption, and application may become unstable or crash.\n\nDo you want to ignore the error and attempt to continue loading the file?";
};
-Bitmap BMP_ACTION_SORT
-{
- File = "sortascending.png";
-};
-
Bitmap BMP_ACTION_REFRESH
{
File = "reload.png";
diff --git a/sfx2/source/inc/helpid.hrc b/sfx2/source/inc/helpid.hrc
index b761cd140498..da1baf6fc394 100644
--- a/sfx2/source/inc/helpid.hrc
+++ b/sfx2/source/inc/helpid.hrc
@@ -30,9 +30,6 @@
#define HID_TABDLG_RESET_BTN "SFX2_HID_TABDLG_RESET_BTN"
#define HID_TABDLG_STANDARD_BTN "SFX2_HID_TABDLG_STANDARD_BTN"
#define HID_TEMPLDLG_TOOLBOX_LEFT "SFX2_HID_TEMPLDLG_TOOLBOX_LEFT"
-#define HID_TEMPLDLG_TOOLBOX_RIGHT "SFX2_HID_TEMPLDLG_TOOLBOX_RIGHT"
-#define HID_CONFIG_EVENT_OFFICE_BASED "SFX2_HID_CONFIG_EVENT_OFFICE_BASED"
-#define HID_CONFIG_EVENT_DOCUMENT_BASED "SFX2_HID_CONFIG_EVENT_DOCUMENT_BASED"
#define HID_STYLIST_NEW "SFX2_HID_STYLIST_NEW"
#define HID_STYLIST_EDIT "SFX2_HID_STYLIST_EDIT"
#define HID_STYLIST_DELETE "SFX2_HID_STYLIST_DELETE"
diff --git a/sfx2/source/view/view.hrc b/sfx2/source/view/view.hrc
index 548c43592561..7980bfb75e56 100644
--- a/sfx2/source/view/view.hrc
+++ b/sfx2/source/view/view.hrc
@@ -26,15 +26,12 @@
#define STR_NOSTARTPRINTER (RID_SFX_VIEW_START+ 2)
#define STR_PAGE (RID_SFX_VIEW_START+20)
-#define STR_ERROR_PRINT (RID_SFX_VIEW_START+21)
#define STR_PRINT_NEWORI (RID_SFX_VIEW_START+22)
#define STR_PRINT_NEWSIZE (RID_SFX_VIEW_START+23)
#define STR_PRINT_NEWORISIZE (RID_SFX_VIEW_START+24)
#define STR_ERROR_SEND_MAIL (RID_SFX_VIEW_START+31)
-#define STR_ERROR_SAVE_TEMPLATE (RID_SFX_VIEW_START+33)
-
#define STR_QUERY_OPENASTEMPLATE (RID_SFX_VIEW_START+41)
#define STR_CANT_CLOSE (RID_SFX_VIEW_START+42)
diff --git a/sfx2/source/view/view.src b/sfx2/source/view/view.src
index ad83dfe5719b..307e21415784 100644
--- a/sfx2/source/view/view.src
+++ b/sfx2/source/view/view.src
@@ -34,18 +34,10 @@ String STR_ERROR_PRINTER_BUSY
{
Text [ en-US ] = "Printer busy" ;
};
-String STR_ERROR_PRINT
-{
- Text [ en-US ] = "Error while printing" ;
-};
String STR_PAGE
{
Text [ en-US ] = "Page " ;
};
-String STR_ERROR_SAVE_TEMPLATE
-{
- Text [ en-US ] = "Error saving template " ;
-};
String STR_READONLY
{
Text [ en-US ] = " (read-only)" ;
More information about the Libreoffice-commits
mailing list