[Libreoffice-commits] core.git: bin/find-unused-defines-in-hrc-files.py sc/inc sc/source
Noel Grandin
noel.grandin at collabora.co.uk
Mon Mar 20 06:53:15 UTC 2017
bin/find-unused-defines-in-hrc-files.py | 1
sc/inc/sc.hrc | 3
sc/inc/scres.hrc | 74 --------
sc/source/ui/dbgui/asciiopt.hrc | 1
sc/source/ui/dbgui/pvfundlg.hrc | 1
sc/source/ui/miscdlgs/retypepassdlg.src | 5
sc/source/ui/src/scstring.src | 282 --------------------------------
7 files changed, 2 insertions(+), 365 deletions(-)
New commits:
commit a386915e51c54901d2e6cb77b615de33f3c9fa18
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Fri Mar 17 12:25:00 2017 +0200
remove unused defines from HRC files in sc(2)
Change-Id: I368abd0c39151c65ac8f0d56cbb6f2c498131534
Reviewed-on: https://gerrit.libreoffice.org/35322
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 724e1b358b48..b945266351b6 100755
--- a/bin/find-unused-defines-in-hrc-files.py
+++ b/bin/find-unused-defines-in-hrc-files.py
@@ -86,6 +86,7 @@ exclusionSet = set([
"HID_PROP_",
"STR_VOBJ_MODE_",
"STR_COND_",
+ "SCSTR_CONTENT_",
])
diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
index c93bbfd81156..768ed088c2fa 100644
--- a/sc/inc/sc.hrc
+++ b/sc/inc/sc.hrc
@@ -55,10 +55,7 @@
// help IDs for templates
#define HID_SC_SHEET_CELL_STD (HID_SC_SHEET_START +0 )
-#define HID_SC_SHEET_CELL_ERG (HID_SC_SHEET_START +1 )
#define HID_SC_SHEET_CELL_ERG1 (HID_SC_SHEET_START +2 )
-#define HID_SC_SHEET_CELL_UEB (HID_SC_SHEET_START +3 )
-#define HID_SC_SHEET_CELL_UEB1 (HID_SC_SHEET_START +4 )
#define HID_SC_SHEET_PAGE_STD (HID_SC_SHEET_START +10 )
#define HID_SC_SHEET_PAGE_REP (HID_SC_SHEET_START +11 )
diff --git a/sc/inc/scres.hrc b/sc/inc/scres.hrc
index f34b4456a27b..2aaa38f13860 100644
--- a/sc/inc/scres.hrc
+++ b/sc/inc/scres.hrc
@@ -24,14 +24,6 @@
#include "formula/compiler.hrc"
#define STR_START (SC_RESOURCE_START+100)
-#define STR_ROWHEIGHT (STR_START)
-#define STR_ROWHEIGHT_TITLE (STR_START + 1)
-#define STR_OPT_ROWHEIGHT (STR_START + 2)
-#define STR_OPT_ROWHEIGHT_TITLE (STR_START + 3)
-#define STR_COLWIDTH (STR_START + 4)
-#define STR_COLWIDTH_TITLE (STR_START + 5)
-#define STR_OPT_COLWIDTH (STR_START + 6)
-#define STR_OPT_COLWIDTH_TITLE (STR_START + 7)
#define SCSTR_UNDEFINED (STR_START + 8)
#define SCSTR_NONAME (STR_START + 9)
#define SCSTR_NONE (STR_START + 10)
@@ -39,64 +31,34 @@
#define SCSTR_FILTER_NOTEMPTY (STR_START + 12)
#define SCSTR_COLUMN (STR_START + 13)
#define SCSTR_ROW (STR_START + 14)
-#define SCSTR_NEW (STR_START + 15)
-
-#define SCSTR_REMOVE (STR_START + 17)
-#define SCSTR_CANCEL (STR_START + 18)
-
-#define SCSTR_SHOWTABLE (STR_START + 20)
-#define SCSTR_HIDDENTABLES (STR_START + 21)
#define SCSTR_TABLE (STR_START + 24)
#define SCSTR_NAME (STR_START + 25)
-#define SCSTR_INSTABLE (STR_START + 26)
#define SCSTR_APDTABLE (STR_START + 27)
#define SCSTR_RENAMETAB (STR_START + 28)
#define STR_INSERTGRAPHIC (STR_START + 29)
-#define SCSTR_NEWTABLE (STR_START + 37)
-
#define SCSTR_PROTECTDOC (STR_START + 39)
#define SCSTR_UNPROTECTDOC (STR_START + 40)
-#define SCSTR_PROTECTTAB (STR_START + 41)
#define SCSTR_UNPROTECTTAB (STR_START + 42)
#define SCSTR_PASSWORD (STR_START + 43)
#define SCSTR_PASSWORDOPT (STR_START + 44)
#define SCSTR_WRONGPASSWORD (STR_START + 45)
#define SCSTR_END (STR_START + 47)
-#define SCSTR_STAT_PRINT (STR_START + 48)
#define SCSTR_UNKNOWN (STR_START + 49)
-#define SCSTR_CHAR_ATTRS (STR_START + 50)
#define SCSTR_ALL (STR_START + 51)
#define SCSTR_STDFILTER (STR_START + 52)
-// Cfg-Item-names
-#define SCSTR_CFG_APP (STR_START + 53)
-#define SCSTR_CFG_DOC (STR_START + 54)
-#define SCSTR_CFG_VIEW (STR_START + 55)
-#define SCSTR_CFG_SPELLCHECK (STR_START + 56)
-#define SCSTR_CFG_PRINT (STR_START + 57)
-
#define SCSTR_CHARSET_USER (STR_START + 59)
#define SCSTR_COLUMN_USER (STR_START + 60)
#define SCSTR_FIELDSEP (STR_START + 61)
#define SCSTR_TEXTSEP (STR_START + 62)
#define SCSTR_MULTIPLE (STR_START + 63)
-#define SCSTR_CFG_INPUT (STR_START + 65)
-
#define SCSTR_TOP10FILTER (STR_START + 66)
-#define SCSTR_CFG_NAVIPI (STR_START + 67)
-
-#define SCSTR_GRFILTER_OPENERROR (STR_START + 77)
-#define SCSTR_GRFILTER_IOERROR (STR_START + 78)
-#define SCSTR_GRFILTER_FORMATERROR (STR_START + 79)
-#define SCSTR_GRFILTER_VERSIONERROR (STR_START + 80)
-#define SCSTR_GRFILTER_FILTERERROR (STR_START + 81)
-#define SCSTR_GRFILTER_TOOBIG (STR_START + 82)
#define SCSTR_UNDO_GRAFFILTER (STR_START + 83)
#define SCSTR_COL_LABEL (STR_START + 84)
@@ -115,25 +77,7 @@
#define STR_REPLCELLSWARN (STR_START + 91)
#define SCSTR_DPFUNCLISTBOX (STR_START + 92)
-#define SCSTR_ALLFILTER (STR_START + 94)
-#define SCSTR_MOREBTN_MOREOPTIONS (STR_START + 95)
-#define SCSTR_MOREBTN_FEWEROPTIONS (STR_START + 96)
-
-// items
-
-#define SCSTR_HOR_JUSTIFY_LEFT (STR_START + 100)
-#define SCSTR_HOR_JUSTIFY_CENTER (STR_START + 101)
-#define SCSTR_HOR_JUSTIFY_RIGHT (STR_START + 102)
-#define SCSTR_HOR_JUSTIFY_BLOCK (STR_START + 103)
-#define SCSTR_HOR_JUSTIFY_REPEAT (STR_START + 104)
-#define SCSTR_HOR_JUSTIFY_STANDARD (STR_START + 105)
-#define SCSTR_VER_JUSTIFY_TOP (STR_START + 106)
-#define SCSTR_VER_JUSTIFY_CENTER (STR_START + 107)
-#define SCSTR_VER_JUSTIFY_BOTTOM (STR_START + 108)
-#define SCSTR_VER_JUSTIFY_STANDARD (STR_START + 109)
-#define SCSTR_ORIENTATION_TOPBOTTOM (STR_START + 110)
-#define SCSTR_ORIENTATION_BOTTOMTOP (STR_START + 111)
-#define SCSTR_ORIENTATION_STANDARD (STR_START + 112)
+
//free
#define SCSTR_UNIT (STR_START + 114)
@@ -185,17 +129,6 @@
#define STR_ACC_EDITLINE_NAME (STR_START + 174)
#define STR_ACC_EDITLINE_DESCR (STR_START + 175)
-// EditCell
-#define STR_ACC_EDITCELL_NAME (STR_START + 176)
-#define STR_ACC_EDITCELL_DESCR (STR_START + 177)
-
-// DataPilot
-#define STR_ACC_DATAPILOT_ROW_DESCR (STR_START + 178)
-#define STR_ACC_DATAPILOT_COL_DESCR (STR_START + 179)
-#define STR_ACC_DATAPILOT_DATA_DESCR (STR_START + 180)
-#define STR_ACC_DATAPILOT_SEL_DESCR (STR_START + 181)
-#define STR_ACC_DATAPILOT_PAGE_DESCR (STR_START + 182)
-
#define STR_ACC_TOOLBAR_FORMULA (STR_START + 184)
#define STR_ACC_DOC_SPREADSHEET (STR_START + 185)
#define STR_ACC_DOC_PREVIEW_SUFFIX (STR_START + 186)
@@ -204,8 +137,6 @@
#define SCSTR_SHORT_SCDOC_NAME (STR_START + 211)
#define SCSTR_LONG_SCDOC_NAME (STR_START + 212)
-#define SCSTR_CLPBRD_CLEAR (STR_START + 213)
-
#define SCSTR_FORMULA_AUTOCORRECTION (STR_START + 214)
#define SCSTR_RENAMEOBJECT (STR_START + 215)
@@ -260,8 +191,6 @@
#define SCSTR_VALID_RANGE (STR_START + 317)
#define SCSTR_VALID_LIST (STR_START + 318)
-#define SCSTR_SELECT (STR_START + 319)
-
// media shell
#define SCSTR_MEDIASHELL (STR_START + 401)
@@ -307,7 +236,6 @@
#define STR_NOT_PASS_PROTECTED (STR_START + 436)
#define STR_HASH_BAD (STR_START + 437)
#define STR_HASH_GOOD (STR_START + 438)
-#define STR_HASH_REGENERATED (STR_START + 439)
#define STR_RETYPE (STR_START + 440)
#define STR_TITLE_CONFLICT (STR_START + 441)
diff --git a/sc/source/ui/dbgui/asciiopt.hrc b/sc/source/ui/dbgui/asciiopt.hrc
index 6bedf55b28bf..91eb70e3ae33 100644
--- a/sc/source/ui/dbgui/asciiopt.hrc
+++ b/sc/source/ui/dbgui/asciiopt.hrc
@@ -20,6 +20,5 @@
#define BTN_OK 1
#define BTN_CANCEL 2
-#define BTN_HELP 3
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/dbgui/pvfundlg.hrc b/sc/source/ui/dbgui/pvfundlg.hrc
index 135f569de5c0..c922eddd4d7f 100644
--- a/sc/source/ui/dbgui/pvfundlg.hrc
+++ b/sc/source/ui/dbgui/pvfundlg.hrc
@@ -21,7 +21,6 @@
#define BTN_OK 1
#define BTN_CANCEL 2
-#define BTN_HELP 3
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/miscdlgs/retypepassdlg.src b/sc/source/ui/miscdlgs/retypepassdlg.src
index aee944045918..a2cc62ee2bc1 100644
--- a/sc/source/ui/miscdlgs/retypepassdlg.src
+++ b/sc/source/ui/miscdlgs/retypepassdlg.src
@@ -39,11 +39,6 @@ String STR_HASH_GOOD
Text [ en-US ] = "Hash compatible" ;
};
-String STR_HASH_REGENERATED
-{
- Text [ en-US ] = "Hash re-generated" ;
-};
-
String STR_RETYPE
{
Text [ en-US ] = "Re-type" ;
diff --git a/sc/source/ui/src/scstring.src b/sc/source/ui/src/scstring.src
index 0781a7a4cce4..57c9f2cccdcd 100644
--- a/sc/source/ui/src/scstring.src
+++ b/sc/source/ui/src/scstring.src
@@ -31,46 +31,6 @@ String SCSTR_SHORT_SCDOC_NAME
Text [ en-US ] = "Spreadsheet" ;
};
-String STR_ROWHEIGHT
-{
- Text [ en-US ] = "Height" ;
-};
-
-String STR_OPT_ROWHEIGHT
-{
- Text [ en-US ] = "Add" ;
-};
-
-String STR_ROWHEIGHT_TITLE
-{
- Text [ en-US ] = "Row Height" ;
-};
-
-String STR_OPT_ROWHEIGHT_TITLE
-{
- Text [ en-US ] = "Optimal Row Height" ;
-};
-
-String STR_COLWIDTH
-{
- Text [ en-US ] = "Width" ;
-};
-
-String STR_OPT_COLWIDTH
-{
- Text [ en-US ] = "Add" ;
-};
-
-String STR_COLWIDTH_TITLE
-{
- Text [ en-US ] = "Column Width" ;
-};
-
-String STR_OPT_COLWIDTH_TITLE
-{
- Text [ en-US ] = "Optimal Column Width" ;
-};
-
String SCSTR_UNDEFINED
{
Text [ en-US ] = "- undefined -" ;
@@ -81,11 +41,6 @@ String SCSTR_NONE
Text [ en-US ] = "- none -" ;
};
-String SCSTR_NEWTABLE
-{
- Text [ en-US ] = "- new sheet -" ;
-};
-
String SCSTR_ALL
{
Text [ en-US ] = "- all -" ;
@@ -133,31 +88,6 @@ String SCSTR_ROW
Text [ en-US ] = "Row %1" ;
};
-String SCSTR_NEW
-{
- Text [ en-US ] = "~New" ;
-};
-
-String SCSTR_REMOVE
-{
- Text [ en-US ] = "~Delete" ;
-};
-
-String SCSTR_CANCEL
-{
- Text [ en-US ] = "Cance~l" ;
-};
-
-String SCSTR_SHOWTABLE
-{
- Text [ en-US ] = "Show Sheet" ;
-};
-
-String SCSTR_HIDDENTABLES
-{
- Text [ en-US ] = "Hidden Sheets" ;
-};
-
String SCSTR_TABLE
{
Text [ en-US ] = "Sheet" ;
@@ -168,11 +98,6 @@ String SCSTR_NAME
Text [ en-US ] = "Name" ;
};
-String SCSTR_INSTABLE
-{
- Text [ en-US ] = "Insert Sheet" ;
-};
-
String SCSTR_APDTABLE
{
Text [ en-US ] = "Append Sheet" ;
@@ -205,71 +130,6 @@ String STR_INSERTGRAPHIC
// Attribute
-String SCSTR_HOR_JUSTIFY_LEFT
-{
- Text [ en-US ] = "Align left" ;
-};
-
-String SCSTR_HOR_JUSTIFY_CENTER
-{
- Text [ en-US ] = "Centered horizontally" ;
-};
-
-String SCSTR_HOR_JUSTIFY_RIGHT
-{
- Text [ en-US ] = "Align right" ;
-};
-
-String SCSTR_HOR_JUSTIFY_BLOCK
-{
- Text [ en-US ] = "Justify" ;
-};
-
-String SCSTR_HOR_JUSTIFY_REPEAT
-{
- Text [ en-US ] = "Repeat alignment" ;
-};
-
-String SCSTR_HOR_JUSTIFY_STANDARD
-{
- Text [ en-US ] = "Horizontal alignment default" ;
-};
-
-String SCSTR_VER_JUSTIFY_TOP
-{
- Text [ en-US ] = "Align to top" ;
-};
-
-String SCSTR_VER_JUSTIFY_CENTER
-{
- Text [ en-US ] = "Centered vertically" ;
-};
-
-String SCSTR_VER_JUSTIFY_BOTTOM
-{
- Text [ en-US ] = "Align to bottom" ;
-};
-
-String SCSTR_VER_JUSTIFY_STANDARD
-{
- Text [ en-US ] = "Vertical alignment default" ;
-};
-
-String SCSTR_ORIENTATION_TOPBOTTOM
-{
- Text [ en-US ] = "Top to bottom" ;
-};
-
-String SCSTR_ORIENTATION_BOTTOMTOP
-{
- Text [ en-US ] = "Bottom to Top" ;
-};
-
-String SCSTR_ORIENTATION_STANDARD
-{
- Text [ en-US ] = "Default orientation" ;
-};
-
String SCSTR_PROTECTDOC
{
Text [ en-US ] = "Protect Document" ;
@@ -280,11 +140,6 @@ String SCSTR_UNPROTECTDOC
Text [ en-US ] = "Unprotect document" ;
};
-String SCSTR_PROTECTTAB
-{
- Text [ en-US ] = "Protect Sheet" ;
-};
-
String SCSTR_UNPROTECTTAB
{
Text [ en-US ] = "Unprotect sheet" ;
@@ -320,61 +175,11 @@ String SCSTR_END
Text [ en-US ] = "~End" ;
};
-String SCSTR_STAT_PRINT
-{
- Text [ en-US ] = "Printing..." ;
-};
-
String SCSTR_UNKNOWN
{
Text [ en-US ] = "Unknown" ;
};
-String SCSTR_CHAR_ATTRS
-{
- Text [ en-US ] = "Font Attributes" ;
-};
-
-String SCSTR_CLPBRD_CLEAR
-{
- Text [ en-US ] = "You have a large amount of data saved in the clipboard.\nDo you want the clipboard contents to be available in other applications?" ;
-};
-
-String SCSTR_CFG_APP
-{
- Text [ en-US ] = "System Options" ;
-};
-
-String SCSTR_CFG_DOC
-{
- Text [ en-US ] = "Document Options" ;
-};
-
-String SCSTR_CFG_VIEW
-{
- Text [ en-US ] = "View Options" ;
-};
-
-String SCSTR_CFG_INPUT
-{
- Text [ en-US ] = "Input Options" ;
-};
-
-String SCSTR_CFG_SPELLCHECK
-{
- Text [ en-US ] = "Spelling Options" ;
-};
-
-String SCSTR_CFG_PRINT
-{
- Text [ en-US ] = "Print Options" ;
-};
-
-String SCSTR_CFG_NAVIPI
-{
- Text [ en-US ] = "Navigator Settings" ;
-};
-
String SCSTR_VALID_MINIMUM
{
Text [ en-US ] = "~Minimum" ;
@@ -437,38 +242,6 @@ String SCSTR_FORMULA_AUTOCORRECTION
Text [ en-US ] = "%PRODUCTNAME Calc found an error in the formula entered.\nDo you want to accept the correction proposed below?\n\n" ;
};
-//! the graphics filter error strings should be moved to svx or offapp!
-
-String SCSTR_GRFILTER_OPENERROR
-{
- Text [ en-US ] = "Image file can not be opened" ;
-};
-
-String SCSTR_GRFILTER_IOERROR
-{
- Text [ en-US ] = "Image file can not be read" ;
-};
-
-String SCSTR_GRFILTER_FORMATERROR
-{
- Text [ en-US ] = "Unknown image format" ;
-};
-
-String SCSTR_GRFILTER_VERSIONERROR
-{
- Text [ en-US ] = "This image file version is not supported" ;
-};
-
-String SCSTR_GRFILTER_FILTERERROR
-{
- Text [ en-US ] = "Image filter not found" ;
-};
-
-String SCSTR_GRFILTER_TOOBIG
-{
- Text [ en-US ] = "Not enough memory available to insert image." ;
-};
-
String SCSTR_UNDO_GRAFFILTER
{
Text [ en-US ] = "Image Filter" ;
@@ -496,11 +269,6 @@ String STR_REPLCELLSWARN
Text [ en-US ] = "You are pasting data into cells that already contain data.\nDo you really want to overwrite the existing data?";
};
-String SCSTR_ALLFILTER
-{
- Text [ en-US ] = "~All";
-};
-
String STR_ACC_CSVRULER_NAME
{
Text [ en-US ] = "Ruler";
@@ -631,41 +399,6 @@ String STR_ACC_EDITLINE_DESCR
Text [ en-US ] = "This is where you enter or edit text, numbers and formulas.";
};
-String STR_ACC_EDITCELL_NAME
-{
- Text [ en-US ] = "Cell %1";
-};
-
-String STR_ACC_EDITCELL_DESCR
-{
- Text = "";
-};
-
-String STR_ACC_DATAPILOT_ROW_DESCR
-{
- Text [ en-US ] = "Fields that you drop here will be displayed as rows in the final pivot table.";
-};
-
-String STR_ACC_DATAPILOT_COL_DESCR
-{
- Text [ en-US ] = "Fields that you drop here will be displayed as columns in the final pivot table.";
-};
-
-String STR_ACC_DATAPILOT_DATA_DESCR
-{
- Text [ en-US ] = "Fields that you drop here will be used for calculations in the final pivot table.";
-};
-
-String STR_ACC_DATAPILOT_SEL_DESCR
-{
- Text [ en-US ] = "Lists the fields that you can drag to one of the other three areas.";
-};
-
-String STR_ACC_DATAPILOT_PAGE_DESCR
-{
- Text [ en-US ] = "Fields that you drop here will be available as filter lists at the top of the final pivot table.";
-};
-
String SCSTR_MEDIASHELL
{
Text [ en-US ] = "Media Playback";
@@ -693,16 +426,6 @@ String STR_ACC_DOC_PREVIEW_SUFFIX
Text [ en-US ] = "(Preview mode)";
};
-String SCSTR_MOREBTN_MOREOPTIONS
-{
- Text [ en-US ] = "More ~Options";
-};
-
-String SCSTR_MOREBTN_FEWEROPTIONS
-{
- Text [ en-US ] = "Fewer ~Options";
-};
-
String SCSTR_PRINTOPT_PAGES
{
Text [ en-US ] = "Pages";
@@ -819,11 +542,6 @@ String SCSTR_VALERR
Text [ en-US ] = "Invalid value" ;
};
-String SCSTR_SELECT
-{
- Text [ en-US ] = "Selection area";
-};
-
String STR_NOFORMULASPECIFIED
{
Text [ en-US ] = "No formula specified." ;
More information about the Libreoffice-commits
mailing list