[Libreoffice-commits] core.git: bin/find-unused-defines-in-hrc-files.py sc/inc sc/source
Noel Grandin
noel.grandin at collabora.co.uk
Fri Mar 17 11:02:08 UTC 2017
bin/find-unused-defines-in-hrc-files.py | 2
sc/inc/globstr.hrc | 51 ---------
sc/source/ui/src/globstr.src | 166 --------------------------------
3 files changed, 2 insertions(+), 217 deletions(-)
New commits:
commit 707f59b224fda6a0377960476fe35bab32fa4bc1
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Fri Mar 17 09:08:15 2017 +0200
remove unused defines from HRC files in sc(1)
Change-Id: I7803a0564b2f7a2308bd7d009dbd300bec8a755f
Reviewed-on: https://gerrit.libreoffice.org/35316
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 9350e3a721d7..724e1b358b48 100755
--- a/bin/find-unused-defines-in-hrc-files.py
+++ b/bin/find-unused-defines-in-hrc-files.py
@@ -84,6 +84,8 @@ exclusionSet = set([
"UID_BRWEVT_",
"HID_EVT_",
"HID_PROP_",
+ "STR_VOBJ_MODE_",
+ "STR_COND_",
])
diff --git a/sc/inc/globstr.hrc b/sc/inc/globstr.hrc
index 21b1436a9347..793b59c9e24b 100644
--- a/sc/inc/globstr.hrc
+++ b/sc/inc/globstr.hrc
@@ -84,7 +84,6 @@
#define STR_MSSG_MAKEOUTLINE_0 45
#define STR_MSSG_REMOVEOUTLINE_0 46
#define STR_MSSG_PASTEFROMCLIP_0 47
-#define STR_MSSG_PASTEFROMCLIP_1 48
#define STR_MSSG_MOVEBLOCKTO_0 49
#define STR_MSSG_INSERTCELLS_0 50
#define STR_MSSG_DELETECELLS_0 51
@@ -103,21 +102,16 @@
#define STR_UNDO_INSERTCELLS 63
#define STR_TABLE_DEF 64
#define STR_MOVE_TO_END 65
-#define STR_BOX_YNI 66
#define STR_NO_REF_TABLE 67
#define STR_PIVOT_TOTAL 68
#define STR_PIVOT_DATA 69
-#define STR_PIVOT_INVALID_DBAREA 70 // tabvwsh3.cxx
-
-#define STR_TABLE 71
#define STR_COLUMN 72
#define STR_ROW 73
#define STR_LOAD_DOC 74
#define STR_SAVE_DOC 75
-#define STR_ERR_INVALID_TABREF 76
#define STR_AREA_ALREADY_INSERTED 77
#define STR_INVALID_TABREF 78
#define STR_INVALID_QUERYAREA 79
@@ -126,10 +120,6 @@
#define STR_NOMULTISELECT 81
#define STR_FILL_SERIES_PROGRESS 82 // documen3.cxx
-#define STR_UNKNOWN_FILTER 83
-
-#define STR_DATABASE_NOTFOUND 84
-
#define STR_COND_AND 85
#define STR_UNDO_PRINTRANGES 86
@@ -212,13 +202,11 @@
#define STR_LONG_ERR_NV 151
#define STR_GRIDCOLOR 152
-#define STR_MERGE_NOTEMPTY 153
#define STR_CELL_FILTER 154
#define STR_TARGETNOTFOUND 155
#define STR_INVALID_EPS 156
-#define STR_TABLE_OP 157 // documen4.cxx
#define STR_UNDO_TABOP 158
#define STR_INVALID_AFNAME 159
@@ -233,11 +221,8 @@
#define STR_INVALID_AFAREA 167
-#define STR_CASCADE 168 // function auto pilot
#define STR_OPTIONAL 169
#define STR_REQUIRED 170
-#define STR_EDITFUNCTION 171
-#define STR_INVALID 172
#define STR_NOTES 173
#define STR_QUERY_DELTAB 174
@@ -248,9 +233,6 @@
#define STR_UNDO_HIDENOTE 177
#define STR_UNDO_DRAGDROP 178
-#define STR_EXPORT_ASCII_WARNING 179
-#define STR_IMPORT_ERROR 180
-#define STR_IMPORT_ASCII 181
#define STR_IMPORT_LOTUS 182
#define STR_IMPORT_DBF 183
#define STR_EXPORT_ASCII 184
@@ -261,18 +243,13 @@
#define STR_STYLENAME_HEADLINE 188
#define STR_STYLENAME_HEADLINE1 189
#define STR_STYLENAME_REPORT 190
-#define STR_STYLENAME_REPORT1 191
#define STR_PIVOT_ERROR 192
-#define STR_PIVOT_PROGRESS 193
-#define STR_IMPORT_EXCEL_WARNING 194
#define STR_SPELLING_STOP_OK 195
#define STR_THESAURUS_NO_STRING 196
#define STR_SPELLING_BEGIN_TAB 197
#define STR_SPELLING_NO_LANG 198 // can be removed later
-#define STR_UNDO_GRAFEDIT 199
-
// empty
#define STR_UNDO_INSERT_TAB 201
@@ -282,12 +259,6 @@
#define STR_UNDO_COPY_TAB 205
#define STR_UNDO_APPEND_TAB 206
-#define STR_CHART_MAINTITLE 207
-#define STR_CHART_SUBTITLE 208
-#define STR_CHART_XTITLE 209
-#define STR_CHART_YTITLE 210
-#define STR_CHART_ZTITLE 211
-
#define STR_ABSREFLOST 212
#define STR_NAMECONFLICT 213
@@ -352,19 +323,12 @@
#define STR_OVERVIEW 259
#define STR_DOC_INFO 260
-#define STR_DOC_CREATED 261
-#define STR_DOC_MODIFIED 262
#define STR_DOC_PRINTED 263
-#define STR_DOC_THEME 264
-#define STR_DOC_KEYWORDS 265
-#define STR_DOC_COMMENT 266
#define STR_BY 267
#define STR_ON 268
#define STR_RELOAD_TABLES 269
-#define STR_FILTER_TOOMANY 270
-
#define STR_UNDO_ENTERMATRIX 271
#define STR_INSERT_FULL 272
@@ -392,7 +356,6 @@
#define STR_DETINVALID_OVERFLOW 287
#define STR_GRAPHICNAME 288
#define STR_INVALIDNAME 289
-#define STR_ERR_LINKOVERLAP 290
#define STR_VALID_MACRONOTFOUND 291
#define STR_VALID_DEFERROR 292
@@ -438,13 +401,8 @@
#define STR_QUICKHELP_REF 321
-#define STR_PIVOT_OVERLAP 322
#define STR_PIVOT_NOTEMPTY 323
-#define STR_QUERY_NOTFOUND 324
-
-#define STR_ERR_INSERTOBJ 325
-
#define STR_PROGRESS_COMPARING 326
#define STR_CHANGED_BLANK 327
@@ -456,7 +414,6 @@
#define STR_QUERY_DELSCENARIO 332
#define STR_UNDO_EDITSCENARIO 333
-#define STR_END_REDLINING_TITLE 334
#define STR_END_REDLINING 335
#define STR_UNDO_EDITNOTE 336
@@ -471,8 +428,6 @@
#define STR_PASTE_BIGGER 343
-#define STR_MACRO_WARNING 344
-
#define STR_EXPORT_DBF 345
#define STR_UNDO_APPLYPAGESTYLE 346
@@ -520,8 +475,6 @@
#define STR_RECALC_MANUAL 378
#define STR_RECALC_AUTO 379
-#define STR_UNDO_TAB_R1C1 380
-
#define STR_ERR_LONG_NESTED_ARRAY 381
#define STR_UNDO_TEXTTOCOLUMNS 382
@@ -534,7 +487,6 @@
#define STR_FILE_LOCKED_TRY_LATER 389
#define STR_FILE_LOCKED_SAVE_LATER 390
#define STR_UNKNOWN_USER 391
-#define STR_LONG_ERR_NULL 392
#define STR_UNDO_INSERTNOTE 393
#define STR_UNDO_DELETENOTE 394
@@ -542,8 +494,6 @@
#define STR_STYLE_FAMILY_PAGE 396
#define STR_ERR_DATAPILOTSOURCE 397
-#define STR_PIVOT_FIRSTROWEMPTYERR 398
-#define STR_PIVOT_ONLYONEROWERR 399
#define STR_UNDO_SET_TAB_BG_COLOR 400
#define STR_UNDO_SET_MULTI_TAB_BG_COLOR 401
@@ -555,7 +505,6 @@
#define STR_SHAPE_RECTANGLE 406
#define STR_SHAPE_LINE 407
#define STR_SHAPE_OVAL 408
-#define STR_SHAPE_TEXTBOX 409
#define STR_FORM_BUTTON 410
#define STR_FORM_CHECKBOX 411
diff --git a/sc/source/ui/src/globstr.src b/sc/source/ui/src/globstr.src
index 9fa14e578ccf..985354ec0f08 100644
--- a/sc/source/ui/src/globstr.src
+++ b/sc/source/ui/src/globstr.src
@@ -179,10 +179,6 @@ String STR_UNDO_REPEATDB+RID_GLOBSTR_OFFSET
{
Text [ en-US ] = "Refresh range" ;
};
-String STR_UNDO_GRAFEDIT+RID_GLOBSTR_OFFSET
-{
- Text [ en-US ] = "Edit Image" ;
-};
String STR_UNDO_LISTNAMES+RID_GLOBSTR_OFFSET
{
Text [ en-US ] = "List names" ;
@@ -383,14 +379,6 @@ String STR_MSSG_IMPORTDATA_0+RID_GLOBSTR_OFFSET
{
Text [ en-US ] = "Error while importing data!" ;
};
-String STR_DATABASE_NOTFOUND+RID_GLOBSTR_OFFSET
-{
- Text [ en-US ] = "The database '#' could not be opened." ;
-};
-String STR_QUERY_NOTFOUND+RID_GLOBSTR_OFFSET
-{
- Text [ en-US ] = "The query '#' could not be opened." ;
-};
String STR_PROGRESS_IMPORT+RID_GLOBSTR_OFFSET
{
Text [ en-US ] = "# records imported..." ;
@@ -407,10 +395,6 @@ String STR_MSSG_PASTEFROMCLIP_0+RID_GLOBSTR_OFFSET
{
Text [ en-US ] = "Insert into multiple selection not possible" ;
};
-String STR_MSSG_PASTEFROMCLIP_1+RID_GLOBSTR_OFFSET
-{
- Text [ en-US ] = "Cell merge not possible if cells already merged!" ;
-};
String STR_MSSG_MOVEBLOCKTO_0+RID_GLOBSTR_OFFSET
{
Text [ en-US ] = "Cell merge not possible if cells already merged!" ;
@@ -479,18 +463,10 @@ String STR_MOVE_TO_END+RID_GLOBSTR_OFFSET
{
Text [ en-US ] = "- move to end position -" ;
};
-String STR_BOX_YNI+RID_GLOBSTR_OFFSET
-{
- Text [ en-US ] = "Not implemented in this build." ;
-};
String STR_NO_REF_TABLE+RID_GLOBSTR_OFFSET
{
Text [ en-US ] = "#REF!" ;
};
-String STR_PIVOT_INVALID_DBAREA+RID_GLOBSTR_OFFSET
-{
- Text [ en-US ] = "The data range must contain at least one row." ;
-};
String STR_PIVOT_NODATA+RID_GLOBSTR_OFFSET
{
Text [ en-US ] = "The pivot table must contain at least one entry." ;
@@ -503,10 +479,6 @@ String STR_PIVOT_ERROR+RID_GLOBSTR_OFFSET
{
Text [ en-US ] = "Error creating the pivot table." ;
};
-String STR_PIVOT_OVERLAP+RID_GLOBSTR_OFFSET
-{
- Text [ en-US ] = "Pivot tables can not overlap." ;
-};
String STR_PIVOT_NOTEMPTY+RID_GLOBSTR_OFFSET
{
Text [ en-US ] = "The destination range is not empty. Overwrite existing contents?" ;
@@ -515,10 +487,6 @@ String STR_DATAPILOT_SUBTOTAL+RID_GLOBSTR_OFFSET
{
Text [ en-US ] = "The source range contains subtotals which may distort the results. Use it anyway?";
};
-String STR_PIVOT_PROGRESS+RID_GLOBSTR_OFFSET
-{
- Text [ en-US ] = "Create Pivot Table" ;
-};
String STR_PIVOT_TOTAL+RID_GLOBSTR_OFFSET
{
Text [ en-US ] = "Total" ;
@@ -531,10 +499,6 @@ String STR_PIVOT_GROUP+RID_GLOBSTR_OFFSET
{
Text [ en-US ] = "Group" ;
};
-String STR_TABLE+RID_GLOBSTR_OFFSET
-{
- Text [ en-US ] = "Sheet" ;
-};
String STR_ROWCOL_SELCOUNT+RID_GLOBSTR_OFFSET
{
Text [ en-US ] = "$1 rows, $2 columns selected";
@@ -567,10 +531,6 @@ String STR_SAVE_DOC+RID_GLOBSTR_OFFSET
{
Text [ en-US ] = "Save document" ;
};
-String STR_ERR_INVALID_TABREF+RID_GLOBSTR_OFFSET
-{
- Text [ en-US ] = "<unknown table reference>" ;
-};
String STR_AREA_ALREADY_INSERTED+RID_GLOBSTR_OFFSET
{
Text [ en-US ] = "This range has already been inserted." ;
@@ -595,10 +555,6 @@ String STR_FILL_SERIES_PROGRESS+RID_GLOBSTR_OFFSET
{
Text [ en-US ] = "Fill Row..." ;
};
-String STR_UNKNOWN_FILTER+RID_GLOBSTR_OFFSET
-{
- Text [ en-US ] = "Unknown filter: " ;
-};
String STR_UNDO_THESAURUS+RID_GLOBSTR_OFFSET
{
Text [ en-US ] = "Thesaurus" ;
@@ -768,11 +724,6 @@ String STR_ERROR_STR+RID_GLOBSTR_OFFSET
Text [ en-US ] = "Err:" ;
};
/* BEGIN defined ERROR.TYPE() values. */
-/* ERROR.TYPE( #NULL! ) == 1 */
-String STR_LONG_ERR_NULL+RID_GLOBSTR_OFFSET
-{
- Text [ en-US ] = "Error: Ranges do not intersect" ;
-};
/* ERROR.TYPE( #DIV/0! ) == 2 */
String STR_LONG_ERR_DIV_ZERO+RID_GLOBSTR_OFFSET
{
@@ -879,10 +830,6 @@ String STR_GRIDCOLOR+RID_GLOBSTR_OFFSET
{
Text [ en-US ] = "Grid color" ;
};
-String STR_MERGE_NOTEMPTY+RID_GLOBSTR_OFFSET
-{
- Text [ en-US ] = "Should the contents of the hidden cells be moved into the first cell?" ;
-};
String STR_CELL_FILTER+RID_GLOBSTR_OFFSET
{
Text [ en-US ] = "Filter" ;
@@ -895,10 +842,6 @@ String STR_INVALID_EPS+RID_GLOBSTR_OFFSET
{
Text [ en-US ] = "Invalid increment" ;
};
-String STR_TABLE_OP+RID_GLOBSTR_OFFSET
-{
- Text [ en-US ] = "MULTIPLE.OPERATIONS" ;
-};
String STR_UNDO_TABOP+RID_GLOBSTR_OFFSET
{
Text [ en-US ] = "Multiple operations" ;
@@ -939,10 +882,6 @@ String STR_INVALID_AFAREA+RID_GLOBSTR_OFFSET
{
Text [ en-US ] = "To apply an AutoFormat,\na table range of at least\n3x3 cells must be selected." ;
};
-String STR_CASCADE+RID_GLOBSTR_OFFSET
-{
- Text [ en-US ] = "(nested)" ;
-};
String STR_OPTIONAL+RID_GLOBSTR_OFFSET
{
Text [ en-US ] = "(optional)" ;
@@ -951,14 +890,6 @@ String STR_REQUIRED+RID_GLOBSTR_OFFSET
{
Text [ en-US ] = "(required)" ;
};
-String STR_INVALID+RID_GLOBSTR_OFFSET
-{
- Text [ en-US ] = "invalid" ;
-};
-String STR_EDITFUNCTION+RID_GLOBSTR_OFFSET
-{
- Text [ en-US ] = "Edit Function" ;
-};
String STR_NOTES+RID_GLOBSTR_OFFSET
{
Text [ en-US ] = "Comments" ;
@@ -971,18 +902,6 @@ String STR_QUERY_DELSCENARIO+RID_GLOBSTR_OFFSET
{
Text [ en-US ] = "Are you sure you want to delete the selected scenario?" ;
};
-String STR_EXPORT_ASCII_WARNING+RID_GLOBSTR_OFFSET
-{
- Text [ en-US ] = "Thesaurus is not available" ;
-};
-String STR_IMPORT_ERROR+RID_GLOBSTR_OFFSET
-{
- Text [ en-US ] = "Spellcheck not available" ;
-};
-String STR_IMPORT_ASCII+RID_GLOBSTR_OFFSET
-{
- Text [ en-US ] = "Import text files" ;
-};
String STR_EXPORT_ASCII+RID_GLOBSTR_OFFSET
{
Text [ en-US ] = "Export Text File" ;
@@ -1031,14 +950,6 @@ String STR_STYLENAME_REPORT+RID_GLOBSTR_OFFSET
{
Text [ en-US ] = "Report" ;
};
-String STR_STYLENAME_REPORT1+RID_GLOBSTR_OFFSET
-{
- Text [ en-US ] = "Report1" ;
-};
-String STR_IMPORT_EXCEL_WARNING+RID_GLOBSTR_OFFSET
-{
- Text [ en-US ] = "is not available for spellchecking\nPlease check your installation and install \nthe desired language if necessary" ;
-};
String STR_THESAURUS_NO_STRING+RID_GLOBSTR_OFFSET
{
Text [ en-US ] = "Thesaurus can only be used in text cells!" ;
@@ -1107,30 +1018,6 @@ String STR_UNDO_TAB_RTL+RID_GLOBSTR_OFFSET
{
Text [ en-US ] = "Flip sheet" ;
};
-String STR_UNDO_TAB_R1C1+RID_GLOBSTR_OFFSET
-{
- Text [ en-US ] = "Toggle the use of R1C1 notation" ;
-};
-String STR_CHART_MAINTITLE+RID_GLOBSTR_OFFSET
-{
- Text [ en-US ] = "Main Title" ;
-};
-String STR_CHART_SUBTITLE+RID_GLOBSTR_OFFSET
-{
- Text [ en-US ] = "Subtitle" ;
-};
-String STR_CHART_XTITLE+RID_GLOBSTR_OFFSET
-{
- Text [ en-US ] = "X axis title" ;
-};
-String STR_CHART_YTITLE+RID_GLOBSTR_OFFSET
-{
- Text [ en-US ] = "Y axis title" ;
-};
-String STR_CHART_ZTITLE+RID_GLOBSTR_OFFSET
-{
- Text [ en-US ] = "Z axis title" ;
-};
String STR_ABSREFLOST+RID_GLOBSTR_OFFSET
{
Text [ en-US ] = "The new table contains absolute references to other tables which may be incorrect!" ;
@@ -1271,30 +1158,10 @@ String STR_DOC_INFO+RID_GLOBSTR_OFFSET
{
Text [ en-US ] = "Doc.Information" ;
};
-String STR_DOC_CREATED+RID_GLOBSTR_OFFSET
-{
- Text [ en-US ] = "Created" ;
-};
-String STR_DOC_MODIFIED+RID_GLOBSTR_OFFSET
-{
- Text [ en-US ] = "Modified" ;
-};
String STR_DOC_PRINTED+RID_GLOBSTR_OFFSET
{
Text [ en-US ] = "Printed" ;
};
-String STR_DOC_THEME+RID_GLOBSTR_OFFSET
-{
- Text [ en-US ] = "Subject" ;
-};
-String STR_DOC_KEYWORDS+RID_GLOBSTR_OFFSET
-{
- Text [ en-US ] = "Key words" ;
-};
-String STR_DOC_COMMENT+RID_GLOBSTR_OFFSET
-{
- Text [ en-US ] = "Comments" ;
-};
String STR_BY+RID_GLOBSTR_OFFSET
{
Text [ en-US ] = "by" ;
@@ -1311,10 +1178,6 @@ String STR_REIMPORT_AFTER_LOAD+RID_GLOBSTR_OFFSET
{
Text [ en-US ] = "This file contains queries. The results of these queries were not saved.\nDo you want these queries to be repeated?" ;
};
-String STR_FILTER_TOOMANY+RID_GLOBSTR_OFFSET
-{
- Text [ en-US ] = "Too many conditions" ;
-};
String STR_INSERT_FULL+RID_GLOBSTR_OFFSET
{
Text [ en-US ] = "Filled cells cannot be shifted\nbeyond the sheet." ;
@@ -1343,10 +1206,6 @@ String STR_ERR_NOREF+RID_GLOBSTR_OFFSET
{
Text [ en-US ] = "No cell references are found in the selected cells." ;
};
-String STR_ERR_LINKOVERLAP+RID_GLOBSTR_OFFSET
-{
- Text [ en-US ] = "Source and destination must not overlap." ;
-};
String STR_GRAPHICNAME+RID_GLOBSTR_OFFSET
{
Text [ en-US ] = "Image" ;
@@ -1456,10 +1315,6 @@ String STR_TIP_HIDE+RID_GLOBSTR_OFFSET
{
Text [ en-US ] = "Hide" ;
};
-String STR_ERR_INSERTOBJ+RID_GLOBSTR_OFFSET
-{
- Text [ en-US ] = "The object could not be inserted." ;
-};
String STR_CHANGED_BLANK+RID_GLOBSTR_OFFSET
{
Text [ en-US ] = "<empty>" ;
@@ -1480,10 +1335,6 @@ String STR_CHANGED_MOVE+RID_GLOBSTR_OFFSET
{
Text [ en-US ] = "Range moved from #1 to #2" ;
};
-String STR_END_REDLINING_TITLE+RID_GLOBSTR_OFFSET
-{
- Text [ en-US ] = "Exit Recording" ;
-};
String STR_END_REDLINING
{
Text [ en-US ] = "This action will exit the change recording mode.\nAny information about changes will be lost.\n\nExit change recording mode?\n\n" ;
@@ -1500,10 +1351,6 @@ String STR_TIP_RESIZEMATRIX+RID_GLOBSTR_OFFSET
{
Text [ en-US ] = "Array formula %1 R x %2 C";
};
-String STR_MACRO_WARNING+RID_GLOBSTR_OFFSET
-{
- Text [ en-US ] = "This document contains macro function calls.\nDo you want to run them?";
-};
String STR_UNDO_HANGULHANJA+RID_GLOBSTR_OFFSET
{
@@ -1636,11 +1483,6 @@ String STR_SHAPE_OVAL+RID_GLOBSTR_OFFSET
Text [ en-US ] = "Oval";
};
-String STR_SHAPE_TEXTBOX+RID_GLOBSTR_OFFSET
-{
- Text [ en-US ] = "Text Box";
-};
-
String STR_FORM_BUTTON+RID_GLOBSTR_OFFSET
{
Text [ en-US ] = "Button";
@@ -1698,14 +1540,6 @@ String STR_ERR_DATAPILOTSOURCE+RID_GLOBSTR_OFFSET
{
Text [ en-US ] = "Pivot table source data is invalid.";
};
-String STR_PIVOT_FIRSTROWEMPTYERR+RID_GLOBSTR_OFFSET
-{
- Text [ en-US ] = "One or more fields appear to have an empty name. Check the first row of the data source to ensure there are no empty cells." ;
-};
-String STR_PIVOT_ONLYONEROWERR+RID_GLOBSTR_OFFSET
-{
- Text [ en-US ] = "Pivot table needs at least two rows of data to create or refresh." ;
-};
String STR_OPTIONS_WARN_SEPARATORS+RID_GLOBSTR_OFFSET
{
Text [ en-US ] = "Because the current formula separator settings conflict with the locale, the formula separators have been reset to their default values.";
More information about the Libreoffice-commits
mailing list