[Libreoffice-commits] core.git: bin/find-unused-defines-in-hrc-files.py sw/inc sw/source
Noel Grandin
noel.grandin at collabora.co.uk
Thu Mar 16 06:10:46 UTC 2017
bin/find-unused-defines-in-hrc-files.py | 52 +++++++++++++++++----
sw/inc/access.hrc | 2
sw/inc/chrdlg.hrc | 1
sw/inc/comcore.hrc | 4 -
sw/inc/dbui.hrc | 8 ---
sw/inc/dialog.hrc | 8 ---
sw/inc/envelp.hrc | 8 ---
sw/inc/fldui.hrc | 9 ---
sw/inc/globals.hrc | 4 -
sw/inc/index.hrc | 1
sw/inc/rcid.hrc | 2
sw/inc/statstr.hrc | 4 -
sw/source/core/inc/pagefrm.hrc | 1
sw/source/core/layout/pagefrm.src | 5 --
sw/source/core/undo/undo.src | 8 ---
sw/source/ui/app/app.src | 60 -------------------------
sw/source/ui/chrdlg/chrdlg.src | 4 -
sw/source/ui/dbui/dbui.src | 30 ------------
sw/source/ui/dialog/dialog.src | 9 ---
sw/source/ui/docvw/access.src | 8 ---
sw/source/ui/docvw/annotation.src | 10 ----
sw/source/ui/envelp/envelp.src | 16 ------
sw/source/ui/fldui/fldui.src | 30 ------------
sw/source/ui/frmdlg/frmui.src | 26 ----------
sw/source/ui/globdoc/globdoc.src | 9 ---
sw/source/ui/shells/shells.src | 10 ----
sw/source/ui/utlui/utlui.src | 17 -------
sw/source/ui/web/web.src | 8 ---
sw/source/uibase/dbui/mailmergechildwindow.src | 10 ----
sw/source/uibase/dialog/regionsw.hrc | 4 -
sw/source/uibase/dialog/regionsw.src | 10 ----
sw/source/uibase/docvw/annotation.hrc | 3 -
sw/source/uibase/docvw/docvw.hrc | 7 --
sw/source/uibase/docvw/docvw.src | 28 -----------
sw/source/uibase/inc/app.hrc | 6 --
sw/source/uibase/inc/frmui.hrc | 21 +-------
sw/source/uibase/inc/globdoc.hrc | 6 --
sw/source/uibase/inc/misc.hrc | 2
sw/source/uibase/inc/ribbar.hrc | 4 -
sw/source/uibase/inc/shells.hrc | 2
sw/source/uibase/inc/utlui.hrc | 7 --
sw/source/uibase/inc/web.hrc | 2
sw/source/uibase/lingu/olmenu.hrc | 3 -
sw/source/uibase/lingu/olmenu.src | 12 -----
sw/source/uibase/uiview/view.hrc | 7 --
sw/source/uibase/uiview/view.src | 20 --------
sw/source/uibase/utlui/attrdesc.hrc | 3 -
sw/source/uibase/utlui/attrdesc.src | 12 -----
sw/source/uibase/utlui/content.cxx | 1
sw/source/uibase/utlui/glbltree.cxx | 1
sw/source/uibase/utlui/initui.src | 12 -----
sw/source/uibase/utlui/navipi.cxx | 1
sw/source/uibase/utlui/navipi.hrc | 24 ----------
sw/source/uibase/utlui/navipi.src | 9 ---
sw/source/uibase/wrtsh/wrtsh.hrc | 9 ---
sw/source/uibase/wrtsh/wrtsh.src | 25 ----------
56 files changed, 51 insertions(+), 554 deletions(-)
New commits:
commit 6742500ccb2ff6d39f527760152d2b08fd9cfe17
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Wed Mar 15 13:16:37 2017 +0200
remove unused defines from HRC files in sw/
Change-Id: I74fb244b2440ddf7682362444c20730ac0e58cea
Reviewed-on: https://gerrit.libreoffice.org/35212
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 f24e1a6..59d917a 100755
--- a/bin/find-unused-defines-in-hrc-files.py
+++ b/bin/find-unused-defines-in-hrc-files.py
@@ -57,7 +57,27 @@ exclusionSet = set([
# other places doing calculations
"RID_SVXSTR_DEPTH",
"RID_SUBSETSTR_",
- "ANALYSIS_"
+ "ANALYSIS_",
+ "FLD_DOCINFO_CHANGE",
+ "FLD_EU_",
+ "FLD_INPUT_",
+ "FLD_PAGEREF_",
+ "FLD_STAT_",
+ "FMT_AUTHOR_",
+ "FMT_CHAPTER_",
+ "FMT_DBFLD_",
+ "FMT_FF_",
+ "FMT_GETVAR_",
+ "FMT_MARK_",
+ "FMT_REF_",
+ "FMT_SETVAR_",
+ "STR_AUTH_FIELD_ADDRESS_",
+ "STR_AUTH_TYPE_",
+ "STR_AUTOFMTREDL_",
+ "STR_CONTENT_TYPE_",
+ "STR_UPDATE_ALL",
+ "STR_UPDATE_INDEX",
+ "STR_UPDATE_LINK",
])
@@ -73,7 +93,7 @@ with a.stdout as txt:
for line in txt:
idx1 = line.find("#define ")
idx2 = line.find(" ", idx1 + 9)
- idName = line[idx1+8 : idx2]
+ idName = line[idx1+8 : idx2].strip()
# the various _START and _END constants are normally unused outside of the .hrc and .src files, and that's fine
if idName.endswith("_START"): continue
if idName.endswith("_BEGIN"): continue
@@ -83,23 +103,33 @@ with a.stdout as txt:
if idName == "RID_SVX_FIRSTFREE": continue
if in_exclusion_set(idName): continue
# search for the constant
- b = subprocess.Popen(["git", "grep", "-wl", idName], stdout=subprocess.PIPE)
+ b = subprocess.Popen(["git", "grep", "-w", idName], stdout=subprocess.PIPE)
found_reason_to_exclude = False
with b.stdout as txt2:
for line2 in txt2:
line2 = line2.strip() # otherwise the comparisons below will not work
# check if we found one in actual code
- if not line2.endswith(".hrc") and not line2.endswith(".src"): found_reason_to_exclude = True
+ if not ".hrc:" in line2 and not ".src:" in line2: found_reason_to_exclude = True
if idName.startswith("RID_"):
- # check that the constant is not being used as an identifier by entries in .src files
- if line2.endswith(".src") and line2.find("Identifier = ") != -1: found_reason_to_exclude = True
- # check that the constant is not being used by the property controller extension or reportdesigner inspection,
+ # is the constant being used as an identifier by entries in .src files?
+ if ".src:" in line2 and "Identifier = " in line2: found_reason_to_exclude = True
+ # is the constant being used by the property controller extension or reportdesigner inspection,
# which use macros to declare constants, hiding them from a search
- if line2.find("extensions/source/propctrlr") != -1: found_reason_to_exclude = True
- if line2.find("reportdesign/source/ui/inspection/inspection.src") != -1: found_reason_to_exclude = True
+ if "extensions/source/propctrlr" in line2: found_reason_to_exclude = True
+ if "reportdesign/source/ui/inspection/inspection.src" in line2: found_reason_to_exclude = True
if idName.startswith("HID_"):
- # check that the constant is not being used as an identifier by entries in .src files
- if line2.endswith(".src") and line2.find("HelpId = ") != -1: found_reason_to_exclude = True
+ # is the constant being used as an identifier by entries in .src files
+ if ".src:" in line2 and "HelpId = " in line2: found_reason_to_exclude = True
+ # is it being used as a constant in an ItemList in .src files?
+ if ".src:" in line2 and ";> ;" in line2: found_reason_to_exclude = True
+ # these are used in calculations in other .hrc files
+ if "sw/inc/rcid.hrc:" in line2: found_reason_to_exclude = True
+ # calculations
+ if "sw/source/uibase/inc/ribbar.hrc:" in line2 and "ST_" in line2: found_reason_to_exclude = True
+ if "sw/source/uibase/inc/ribbar.hrc:" in line2 and "STR_IMGBTN_" in line2: found_reason_to_exclude = True
+ if "sw/source/core/undo/undo.hrc:" in line2: found_reason_to_exclude = True
+ if "sw/inc/poolfmt.hrc:" in line2: found_reason_to_exclude = True
+
if not found_reason_to_exclude:
sys.stdout.write(idName + '\n')
# otherwise the previous line of output will be incorrectly mixed into the below git output, because of buffering
diff --git a/sw/inc/access.hrc b/sw/inc/access.hrc
index 37cdc61..def80d4 100644
--- a/sw/inc/access.hrc
+++ b/sw/inc/access.hrc
@@ -24,7 +24,6 @@
#define STR_ACCESS_DOC_NAME (RC_ACCESS_BEGIN + 1)
#define STR_ACCESS_DOC_DESC (RC_ACCESS_BEGIN + 2)
-#define STR_ACCESS_HEADING_WITH_NUM_DESC (RC_ACCESS_BEGIN + 3)
#define STR_ACCESS_HEADER_NAME (RC_ACCESS_BEGIN + 4)
#define STR_ACCESS_HEADER_DESC (RC_ACCESS_BEGIN + 5)
#define STR_ACCESS_FOOTER_NAME (RC_ACCESS_BEGIN + 6)
@@ -44,7 +43,6 @@
#define STR_ACCESS_PREVIEW_DOC_NAME (RC_ACCESS_BEGIN + 22)
#define STR_ACCESS_PREVIEW_DOC_SUFFIX (RC_ACCESS_BEGIN + 24)
#define STR_ACCESS_DOC_WORDPROCESSING (RC_ACCESS_BEGIN + 25)
-#define STR_ACCESS_DOC_WORDPROCESSING_READONLY (RC_ACCESS_BEGIN + 26)
#define STR_ACCESS_COLUMN_WIDTH (RC_ACCESS_BEGIN + 27)
#define STR_ACCESS_PAGESETUP_SPACING (RC_ACCESS_BEGIN + 28)
diff --git a/sw/inc/chrdlg.hrc b/sw/inc/chrdlg.hrc
index d66c656..370801d 100644
--- a/sw/inc/chrdlg.hrc
+++ b/sw/inc/chrdlg.hrc
@@ -24,7 +24,6 @@
#define STR_ILLEGAL_PAGENUM (RC_CHRDLG_BEGIN + 1)
#define STR_TEXTCOLL_HEADER (RC_CHRDLG_BEGIN + 2)
-#define STR_PAGEFMT_HEADER (RC_CHRDLG_BEGIN + 4)
#define DLG_SWDROPCAPS (RC_CHRDLG_BEGIN + 11)
diff --git a/sw/inc/comcore.hrc b/sw/inc/comcore.hrc
index 4b7abea..075b079 100644
--- a/sw/inc/comcore.hrc
+++ b/sw/inc/comcore.hrc
@@ -36,8 +36,6 @@
#define STR_EMPTYPAGE (RC_COMCORE_BEGIN + 11)
#define RID_SHELLRES_AUTOFMTSTRS (RC_COMCORE_BEGIN + 12)
#define STR_MULT_INTERACT_HYPH_WARN (RC_COMCORE_BEGIN + 13)
-#define STR_MULT_INTERACT_SPELL_WARN (RC_COMCORE_BEGIN + 14)
-#define STR_SPELL_TITLE (RC_COMCORE_BEGIN + 15)
#define STR_HYPH_TITLE (RC_COMCORE_BEGIN + 16)
#define STR_SHAPE_DEFNAME (RC_COMCORE_BEGIN + 17)
@@ -46,14 +44,12 @@
#define STR_REDLINE_FORMAT (RC_COMCORE_BEGIN + 21)
#define STR_REDLINE_TABLE (RC_COMCORE_BEGIN + 22)
#define STR_REDLINE_FMTCOLL (RC_COMCORE_BEGIN + 23)
-#define STR_CLIPBOARD (RC_COMCORE_BEGIN + 24)
#define STR_START_QUOTE (RC_COMCORE_BEGIN + 25)
#define STR_END_QUOTE (RC_COMCORE_BEGIN + 26)
#define STR_LDOTS (RC_COMCORE_BEGIN + 27)
#define STR_YIELDS (RC_COMCORE_BEGIN + 28)
#define STR_PARAGRAPHS (RC_COMCORE_BEGIN + 29)
#define STR_MULTISEL (RC_COMCORE_BEGIN + 30)
-#define STR_REDLINE_MULTIPLE (RC_COMCORE_BEGIN + 31)
#define STR_N_REDLINES (RC_COMCORE_BEGIN + 32)
#define STR_FIELD (RC_COMCORE_BEGIN + 33)
diff --git a/sw/inc/dbui.hrc b/sw/inc/dbui.hrc
index 28c12f5..51d1a2a 100644
--- a/sw/inc/dbui.hrc
+++ b/sw/inc/dbui.hrc
@@ -48,12 +48,6 @@
#define ST_REMOVESALUTATIONFIELD (RC_DBUI_BEGIN + 23)
#define ST_DRAGSALUTATION (RC_DBUI_BEGIN + 24)
#define ST_TITLE_EDIT (RC_DBUI_BEGIN + 25)
-#define ST_SAVESTART (RC_DBUI_BEGIN + 26)
-#define ST_SAVEMERGED (RC_DBUI_BEGIN + 27)
-#define ST_PRINT (RC_DBUI_BEGIN + 28)
-#define ST_SENDMAIL (RC_DBUI_BEGIN + 29)
-#define ST_DEFAULTATTACHMENT (RC_DBUI_BEGIN + 30)
-#define ST_NOSUBJECT (RC_DBUI_BEGIN + 31)
#define ST_CONFIGUREMAIL (RC_DBUI_BEGIN + 32)
#define ST_FILTERNAME (RC_DBUI_BEGIN + 33)
#define ST_TYPE (RC_DBUI_BEGIN + 34)
@@ -69,11 +63,9 @@
#define ST_CONTINUE (RC_DBUI_BEGIN + 44)
#define ST_TASK (RC_DBUI_BEGIN + 45)
#define ST_STATUS (RC_DBUI_BEGIN + 46)
-#define ST_SEND (RC_DBUI_BEGIN + 47)
#define ST_SENDINGTO (RC_DBUI_BEGIN + 48)
#define ST_COMPLETED (RC_DBUI_BEGIN + 49)
#define ST_FAILED (RC_DBUI_BEGIN + 50)
-#define ST_TERMINATEQUERY (RC_DBUI_BEGIN + 51)
#define ST_STARTING (RC_DBUI_BEGIN + 52)
#define ST_DOCUMENTTYPE (RC_DBUI_BEGIN + 53)
#define ST_ADDRESSBLOCK (RC_DBUI_BEGIN + 54)
diff --git a/sw/inc/dialog.hrc b/sw/inc/dialog.hrc
index be48ffc..8304950 100644
--- a/sw/inc/dialog.hrc
+++ b/sw/inc/dialog.hrc
@@ -29,10 +29,7 @@
// Strings ******************************************************************
-#define STR_LINKEDIT_TEXT (RC_DIALOG_BEGIN + 1)
-
#define STR_CLOSELINKMSG (RC_DIALOG_BEGIN + 3)
-#define STR_PATH_NOT_FOUND (RC_DIALOG_BEGIN + 4)
// Bereiche *****************************************************************
@@ -42,12 +39,9 @@
#define RC_MACASSGN_END (RC_DIALOG_BEGIN + 89)
// RC_MACASSGN_END (RC_DIALOG_BEGIN + 89)
-#define RC_DLG_ADDR (RC_DIALOG_BEGIN + 90)
+#define RC_DLG_ADDR (RC_DIALOG_BEGIN + 90)
#define RC_SWDLG_BACKGROUND (RC_DIALOG_BEGIN + 91)
#define RC_DLG_SWNUMFMTDLG (RC_DIALOG_BEGIN + 92)
-#define RC_DLG_SWBORDERDLG (RC_DIALOG_BEGIN + 93)
-#define RC_DLG_SWWRAPDLG (RC_DIALOG_BEGIN + 94)
-#define RC_DLG_SWFLDEDITDLG (RC_DIALOG_BEGIN + 95)
// Ueberlaufpruefung ********************************************************
#define DIALOG_ACT_END RC_MACASSGN_END
diff --git a/sw/inc/envelp.hrc b/sw/inc/envelp.hrc
index 5bc9789..5f483d1 100644
--- a/sw/inc/envelp.hrc
+++ b/sw/inc/envelp.hrc
@@ -22,10 +22,6 @@
#include "rcid.hrc"
-// Dialoge --------------------------------------------------------------------
-
-#define DLG_MAILMERGE (RC_ENVELP_BEGIN + 8)
-
// Bereiche -------------------------------------------------------------------
#define RC_ENVLOP_BEGIN (RC_ENVELP_BEGIN )
@@ -45,10 +41,6 @@
// Strings --------------------------------------------------------------------
-#define STR_DATABASE_NOT_OPENED (RC_ENVLOP_BEGIN + 63)
-#define STR_NO_DRIVERS (RC_ENVLOP_BEGIN + 64)
-
-#define STR_BTN_NEWDOC (RC_ENVLOP_BEGIN + 68)
#define STR_SENDER_TOKENS (RC_ENVLOP_BEGIN + 69)
// Ueberlaufpruefung ----------------------------------------------------------
diff --git a/sw/inc/fldui.hrc b/sw/inc/fldui.hrc
index c48dbd1..b193ac8 100644
--- a/sw/inc/fldui.hrc
+++ b/sw/inc/fldui.hrc
@@ -126,11 +126,9 @@
/*----------------------------------------------------------
Format-Id's
----------------------------------------------------------*/
-// Text
-#define FMT_TEXT FLD_PAGEREF_END
// Numbers
-#define FMT_NUM_BEGIN (FMT_TEXT + 1)
+#define FMT_NUM_BEGIN (FLD_PAGEREF_END + 1)
#define FMT_NUM_ABC FMT_NUM_BEGIN
#define FMT_NUM_SABC (FMT_NUM_BEGIN + 1)
#define FMT_NUM_ABC_N (FMT_NUM_BEGIN + 2)
@@ -232,8 +230,6 @@
--------------------------------------------------------------------*/
#define STR_FLDUI FMT_MARK_END
-#define STR_INSERT STR_FLDUI
-#define STR_ALL (STR_FLDUI + 1)
#define STR_EXTRA (STR_FLDUI + 2)
/*--------------------------------------------------------------------
@@ -247,13 +243,10 @@
#define STR_COMBCHRS_FT (STR_EXTRA + 4)
#define STR_PROMPT (STR_EXTRA + 5)
#define STR_MACNAME (STR_EXTRA + 6)
-#define STR_SETNO (STR_EXTRA + 7)
#define STR_OFFSET (STR_EXTRA + 8)
#define STR_VALUE (STR_EXTRA + 9)
-#define STR_URLPROMPT (STR_EXTRA + 11)
#define STR_FORMULA (STR_EXTRA + 12)
-#define STR_ALL_DATABASE (STR_EXTRA + 13)
#endif
diff --git a/sw/inc/globals.hrc b/sw/inc/globals.hrc
index 0655c11..2eb78e4 100644
--- a/sw/inc/globals.hrc
+++ b/sw/inc/globals.hrc
@@ -25,7 +25,6 @@
// STRINGS -----------------------------------------------------------
#define STR_DLLNOTFOUND (RC_GLOBALS_BEGIN + 0)
-#define STR_FMT_STD (RC_GLOBALS_BEGIN + 1)
#define STR_LOAD_GLOBAL_DOC (RC_GLOBALS_BEGIN + 2)
#define STR_DOC_STAT (RC_GLOBALS_BEGIN + 10)
@@ -118,15 +117,12 @@
// INFOBOX ------------------------------------------------------------
#define STR_ERROR_CLPBRD_READ (RC_GLOBALS_BEGIN + 50)
-#define STR_ERROR_PASSWD (RC_GLOBALS_BEGIN + 51)
// Strings for the context menu of the content tree
#define STR_CONTEXT_FIRST (RC_GLOBALS_BEGIN + 52)
#define STR_OUTLINE_LEVEL (STR_CONTEXT_FIRST + 0)
#define STR_DRAGMODE (STR_CONTEXT_FIRST + 1)
#define STR_HYPERLINK (STR_CONTEXT_FIRST + 2)
-#define STR_LINK_REGION (STR_CONTEXT_FIRST + 3)
-#define STR_COPY_REGION (STR_CONTEXT_FIRST + 4)
#define STR_DISPLAY (STR_CONTEXT_FIRST + 5)
#define STR_ACTIVE_VIEW (STR_CONTEXT_FIRST + 6)
#define STR_STATUS_FIRST (RC_GLOBALS_BEGIN + 59)
diff --git a/sw/inc/index.hrc b/sw/inc/index.hrc
index ce3643a..0b528b4 100644
--- a/sw/inc/index.hrc
+++ b/sw/inc/index.hrc
@@ -30,7 +30,6 @@
#define STR_ALPHA (RC_INDEX_BEGIN + 7)
#define STR_LEVEL (RC_INDEX_BEGIN + 8)
-#define DLG_EDIT_IDXMARK (RC_INDEX_BEGIN + 11)
#define DLG_EDIT_AUTHMARK (RC_INDEX_BEGIN + 12)
#define STR_IDXMRK_INSERT (RC_INDEX_BEGIN + 13)
diff --git a/sw/inc/rcid.hrc b/sw/inc/rcid.hrc
index 6ab03b8..ab9d149 100644
--- a/sw/inc/rcid.hrc
+++ b/sw/inc/rcid.hrc
@@ -21,8 +21,6 @@
#include <sfx2/sfxsids.hrc>
-#define IMAGE_MASK_COLOR Color { Red = 0xFF00; Green = 0x0000; Blue = 0xFF00; }
-
// Areas for the UI-Directories
#define RC_BASE RID_SW_START // From solar.hrc
diff --git a/sw/inc/statstr.hrc b/sw/inc/statstr.hrc
index 813a3bf..787081d 100644
--- a/sw/inc/statstr.hrc
+++ b/sw/inc/statstr.hrc
@@ -27,11 +27,7 @@
#define STR_STATSTR_SWGWRITE (RC_STATLIN_STR + 3)
#define STR_STATSTR_REFORMAT (RC_STATLIN_STR + 4)
#define STR_STATSTR_AUTOFORMAT (RC_STATLIN_STR + 5)
-#define STR_STATSTR_IMPGRF (RC_STATLIN_STR + 6)
#define STR_STATSTR_SEARCH (RC_STATLIN_STR + 7)
-#define STR_STATSTR_FORMAT (RC_STATLIN_STR + 8)
-#define STR_STATSTR_PRINT (RC_STATLIN_STR + 9)
-#define STR_STATSTR_LAYOUTINIT (RC_STATLIN_STR + 10)
#define STR_STATSTR_LETTER (RC_STATLIN_STR + 11)
#define STR_STATSTR_SPELL (RC_STATLIN_STR + 12)
#define STR_STATSTR_HYPHEN (RC_STATLIN_STR + 13)
diff --git a/sw/source/core/inc/pagefrm.hrc b/sw/source/core/inc/pagefrm.hrc
index 7a02bb2..904a8d6 100644
--- a/sw/source/core/inc/pagefrm.hrc
+++ b/sw/source/core/inc/pagefrm.hrc
@@ -14,7 +14,6 @@
// Bitmaps for page shadow
#define BMP_PAGE_SHADOW_MASK RC_PAGEFRM_BEGIN + 0
-#define STR_PAGE_BREAK RC_PAGEFRM_BEGIN + 1
#define STR_COLUMN_BREAK RC_PAGEFRM_BEGIN + 2
// If you add resources, don't forget to update this
diff --git a/sw/source/core/layout/pagefrm.src b/sw/source/core/layout/pagefrm.src
index f0a7cb3..d488047 100644
--- a/sw/source/core/layout/pagefrm.src
+++ b/sw/source/core/layout/pagefrm.src
@@ -14,11 +14,6 @@ Bitmap BMP_PAGE_SHADOW_MASK
File = "page-shadow-mask.png";
};
-String STR_PAGE_BREAK
-{
- Text [ en-US ] = "Manual Page Break" ;
-};
-
String STR_COLUMN_BREAK
{
Text [ en-US ] = "Manual Column Break" ;
diff --git a/sw/source/core/undo/undo.src b/sw/source/core/undo/undo.src
index fca138b..8222623 100644
--- a/sw/source/core/undo/undo.src
+++ b/sw/source/core/undo/undo.src
@@ -426,10 +426,6 @@ String STR_LDOTS
{
Text [ en-US ] = "...";
};
-String STR_CLIPBOARD
-{
- Text [ en-US ] = "clipboard";
-};
String STR_MULTISEL
{
Text [ en-US ] = "multiple selection";
@@ -486,10 +482,6 @@ String STR_REDLINE_FMTCOLL
{
Text [ en-US ] = "Style changed";
};
-String STR_REDLINE_MULTIPLE
-{
- Text [ en-US ] = "multiple changes";
-};
String STR_N_REDLINES
{
Text [ en-US ] = "$1 changes";
diff --git a/sw/source/ui/app/app.src b/sw/source/ui/app/app.src
index 9b41464..c79806f 100644
--- a/sw/source/ui/app/app.src
+++ b/sw/source/ui/app/app.src
@@ -30,16 +30,6 @@
#include "shells.hrc"
#include "helpid.h"
-String STR_PRINT_MERGE_MACRO
-{
- Text [ en-US ] = "Print form letters" ;
-};
-
-String STR_PAGE_COUNT_MACRO
-{
- Text [ en-US ] = "Changing the page count" ;
-};
-
String STR_PARAGRAPHSTYLEFAMILY
{
Text [ en-US ] = "Paragraph Styles" ;
@@ -210,11 +200,6 @@ String STR_DLLNOTFOUND
Text [ en-US ] = "Filter not found." ;
};
-String STR_UNBENANNT
-{
- Text [ en-US ] = "Untitled" ;
-};
-
String STR_LOAD_GLOBAL_DOC
{
Text [ en-US ] = "Name and Path of Master Document" ;
@@ -280,16 +265,6 @@ String STR_READONLY_PATH
Text [ en-US ] = "The 'AutoText' directories are read-only. Do you want to call the path settings dialog?";
};
-String STR_ERROR_PASSWD
-{
- Text [ en-US ] = "Invalid password" ;
-};
-
-String STR_FMT_STD
-{
- Text [ en-US ] = "(none)" ;
-};
-
String STR_DOC_STAT
{
Text [ en-US ] = "Statistics" ;
@@ -327,31 +302,11 @@ String STR_STATSTR_AUTOFORMAT
Text [ en-US ] = "Formatting document automatically..." ;
};
-String STR_STATSTR_IMPGRF
-{
- Text [ en-US ] = "Importing images..." ;
-};
-
String STR_STATSTR_SEARCH
{
Text [ en-US ] = "Search..." ;
};
-String STR_STATSTR_FORMAT
-{
- Text [ en-US ] = "Formatting..." ;
-};
-
-String STR_STATSTR_PRINT
-{
- Text [ en-US ] = "Printing..." ;
-};
-
-String STR_STATSTR_LAYOUTINIT
-{
- Text [ en-US ] = "Converting..." ;
-};
-
String STR_STATSTR_LETTER
{
Text [ en-US ] = "Letter" ;
@@ -442,11 +397,6 @@ String STR_ABSTRACT_TITLE
Text [ en-US ] = "Abstract: " ;
};
-String STR_FDLG_TEMPLATE_BUTTON
-{
- Text [ en-US ] = "Style" ;
-};
-
String STR_FDLG_TEMPLATE_NAME
{
Text [ en-US ] = "separated by: " ;
@@ -497,11 +447,6 @@ String STR_HIDE_NOTE_AUTHOR
Text [ en-US ] = "H~ide All Comments by $1";
};
-String STR_DONT_ASK_AGAIN
-{
- Text [ en-US ] = "~Do not show warning again" ;
-};
-
String STR_OUTLINE_NUMBERING
{
Text [ en-US ] = "Outline Numbering";
@@ -607,11 +552,6 @@ String STR_COL
Text [ en-US ] = "Column" ;
};
-String STR_SIMPLE
-{
- Text [ en-US ] = "Plain" ;
-};
-
String STR_AUTHMRK_EDIT
{
diff --git a/sw/source/ui/chrdlg/chrdlg.src b/sw/source/ui/chrdlg/chrdlg.src
index 6f19fc4..1e7a66c 100644
--- a/sw/source/ui/chrdlg/chrdlg.src
+++ b/sw/source/ui/chrdlg/chrdlg.src
@@ -23,10 +23,6 @@ String STR_TEXTCOLL_HEADER
{
Text [ en-US ] = "(Paragraph Style: " ;
};
-String STR_PAGEFMT_HEADER
-{
- Text [ en-US ] = "(Page Style: " ;
-};
String STR_ILLEGAL_PAGENUM
{
Text [ en-US ] = "Page numbers cannot be applied to the current page. Even numbers can be used on left pages, odd numbers on right pages." ;
diff --git a/sw/source/ui/dbui/dbui.src b/sw/source/ui/dbui/dbui.src
index 3962a25..cfea19f 100644
--- a/sw/source/ui/dbui/dbui.src
+++ b/sw/source/ui/dbui/dbui.src
@@ -85,36 +85,6 @@ String STR_FILTER_ACCDB
Text [ en-US ] = "Microsoft Access 2007 (*.accdb,*.accde)" ;
};
-String ST_SAVESTART
-{
- Text[ en-US ] = "Save ~starting document";
-};
-
-String ST_SAVEMERGED
-{
- Text[ en-US ] = "Save merged document";
-};
-
-String ST_PRINT
-{
- Text[ en-US ] = "Print settings";
-};
-
-String ST_SENDMAIL
-{
- Text[ en-US ] = "E-Mail settings";
-};
-
-String ST_DEFAULTATTACHMENT
-{
- Text[ en-US ] = "Untitled";
-};
-
-String ST_NOSUBJECT
-{
- Text[ en-US ] = "No subject";
-};
-
String ST_CONFIGUREMAIL
{
Text[ en-US ] = "In order to be able to send mail merge documents by e-mail, %PRODUCTNAME requires information about the e-mail account to be used.\n\nDo you want to enter e-mail account information now?";
diff --git a/sw/source/ui/dialog/dialog.src b/sw/source/ui/dialog/dialog.src
index 9d7804d..d30bcf8 100644
--- a/sw/source/ui/dialog/dialog.src
+++ b/sw/source/ui/dialog/dialog.src
@@ -18,15 +18,6 @@
*/
#include "dialog.hrc"
-String STR_LINKEDIT_TEXT
-{
- Text [ en-US ] = "Edit links" ;
-};
-String STR_PATH_NOT_FOUND
-{
- Text [ en-US ] = "The directory '%1' does not exist." ;
-};
-
String STR_QUERY_SPELL_CONTINUE
{
Text [ en-US ] = "Continue checking at beginning of document?" ;
diff --git a/sw/source/ui/docvw/access.src b/sw/source/ui/docvw/access.src
index 9065a90..39cfd24 100644
--- a/sw/source/ui/docvw/access.src
+++ b/sw/source/ui/docvw/access.src
@@ -27,10 +27,6 @@ String STR_ACCESS_DOC_DESC
{
Text [ en-US ] = "Document view";
};
-String STR_ACCESS_HEADING_WITH_NUM_DESC
-{
- Text [ en-US ] = "Heading number $(ARG2): $(ARG1)";
-};
String STR_ACCESS_HEADER_NAME
{
Text [ en-US ] = "Header $(ARG1)";
@@ -104,9 +100,5 @@ String STR_ACCESS_DOC_WORDPROCESSING
{
Text [ en-US ] = "%PRODUCTNAME Document";
};
-String STR_ACCESS_DOC_WORDPROCESSING_READONLY
-{
- Text [ en-US ] = "(read-only)";
-};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/docvw/annotation.src b/sw/source/ui/docvw/annotation.src
index a45c3ca..c47afa1 100644
--- a/sw/source/ui/docvw/annotation.src
+++ b/sw/source/ui/docvw/annotation.src
@@ -20,16 +20,6 @@
#include "annotation.hrc"
#include "cmdid.h"
-String STR_POSTIT_TODAY
-{
- Text [ en-US ] = "Today," ;
-};
-
-String STR_POSTIT_YESTERDAY
-{
- Text [ en-US ] = "Yesterday," ;
-};
-
String STR_DELETE_ALL_NOTES
{
Text [ en-US ] = "All Comments" ;
diff --git a/sw/source/ui/envelp/envelp.src b/sw/source/ui/envelp/envelp.src
index 86fa51f..c244213 100644
--- a/sw/source/ui/envelp/envelp.src
+++ b/sw/source/ui/envelp/envelp.src
@@ -20,22 +20,6 @@
#include "envelp.hrc"
#include "globals.hrc"
-// Strings ******************************************************************
-
-String STR_DATABASE_NOT_OPENED
-{
- Text [ en-US ] = "Database could not be opened." ;
-};
-String STR_NO_DRIVERS
-{
- Text [ en-US ] = "No database drivers installed." ;
-};
-
-String STR_BTN_NEWDOC
-{
- Text [ en-US ] = "~New Doc.";
-};
-
String STR_SENDER_TOKENS
{
Text [ en-US ] = "COMPANY;CR;FIRSTNAME; ;LASTNAME;CR;ADDRESS;CR;CITY; ;STATEPROV; ;POSTALCODE;CR;COUNTRY;CR;";
diff --git a/sw/source/ui/fldui/fldui.src b/sw/source/ui/fldui/fldui.src
index 2dbe170..4138a1b 100644
--- a/sw/source/ui/fldui/fldui.src
+++ b/sw/source/ui/fldui/fldui.src
@@ -559,24 +559,6 @@ String FMT_MARK_OLE
Text [ en-US ] = "Object" ;
};
/*--------------------------------------------------------------------
- Description: text only
- --------------------------------------------------------------------*/
-String FMT_TEXT
-{
- Text = "Text" ;
-};
-/*--------------------------------------------------------------------
- Description: global String resources
- --------------------------------------------------------------------*/
-String STR_ALL
-{
- Text [ en-US ] = "All" ;
-};
-String STR_INSERT
-{
- Text [ en-US ] = "Insert" ;
-};
-/*--------------------------------------------------------------------
Description: ExchangeStrings for Edit/NameFT
--------------------------------------------------------------------*/
String STR_COND
@@ -607,10 +589,6 @@ String STR_COMBCHRS_FT
{
Text [ en-US ] = "Ch~aracters";
};
-String STR_SETNO
-{
- Text [ en-US ] = "Record number" ;
-};
String STR_OFFSET
{
Text [ en-US ] = "O~ffset" ;
@@ -623,14 +601,6 @@ String STR_FORMULA
{
Text [ en-US ] = "Formula" ;
};
-String STR_URLPROMPT
-{
- Text [ en-US ] = "~URL" ;
-};
-String STR_ALL_DATABASE
-{
- Text [ en-US ] = "<All>" ;
-};
String STR_CUSTOM
{
Text [ en-US ] = "Custom" ;
diff --git a/sw/source/ui/frmdlg/frmui.src b/sw/source/ui/frmdlg/frmui.src
index ecbcc4e..1943fd8 100644
--- a/sw/source/ui/frmdlg/frmui.src
+++ b/sw/source/ui/frmdlg/frmui.src
@@ -19,20 +19,6 @@
#include "frmui.hrc"
/*-----------------------------------------------------------------------
- Description: V-Rel
- -----------------------------------------------------------------------*/
-String STR_TOPPRT
-{
- Text [ en-US ] = "Upper Margin" ;
-};
-
-/*-----------------------------------------------------------------------
- Description: H-Rel
- -----------------------------------------------------------------------*/
-/*-----------------------------------------------------------------------
- Description: V-Rel character alignment
- -----------------------------------------------------------------------*/
-/*-----------------------------------------------------------------------
Description: character alignment for frmsh.cxx - context menu
-----------------------------------------------------------------------*/
String STR_TOP_BASE
@@ -59,18 +45,6 @@ String STR_LINE_CENTER
{
Text [ en-US ] = "Center of line" ;
};
-String STR_CHAR_TOP
-{
- Text [ en-US ] = "Top of character" ;
-};
-String STR_CHAR_BOTTOM
-{
- Text [ en-US ] = "Bottom of character" ;
-};
-String STR_CHAR_CENTER
-{
- Text [ en-US ] = "Center of character" ;
-};
String STR_OLE_INSERT
{
Text [ en-US ] = "Insert object" ;
diff --git a/sw/source/ui/globdoc/globdoc.src b/sw/source/ui/globdoc/globdoc.src
index e4af1e9..73039f7 100644
--- a/sw/source/ui/globdoc/globdoc.src
+++ b/sw/source/ui/globdoc/globdoc.src
@@ -18,18 +18,11 @@
*/
#include "globdoc.hrc"
+
String STR_HUMAN_SWGLOBDOC_NAME
{
Text [ en-US ] = "Master Document" ;
};
-String STR_WRITER_GLOBALDOC_FULLTYPE_40
-{
- Text = "%PRODUCTNAME 4.0 Global Document" ;
-};
-String STR_WRITER_GLOBALDOC_FULLTYPE_50
-{
- Text = "%PRODUCTNAME 5.0 Global Document" ;
-};
String STR_WRITER_GLOBALDOC_FULLTYPE
{
Text [ en-US ] = "%PRODUCTNAME %PRODUCTVERSION Master Document";
diff --git a/sw/source/ui/shells/shells.src b/sw/source/ui/shells/shells.src
index 7814bdd..f5365c5 100644
--- a/sw/source/ui/shells/shells.src
+++ b/sw/source/ui/shells/shells.src
@@ -50,10 +50,6 @@ String STR_INSERT_GRAPHIC
{
Text [ en-US ] = "Insert Image" ;
};
-String STR_NO_ADDRESSBOOK
-{
- Text [ en-US ] = "An Address Book does not exist" ;
-};
String STR_REDLINE_COMMENT
{
Text [ en-US ] = "Comment: " ;
@@ -99,12 +95,6 @@ Bitmap BMP_REDLINE_FMTCOLLSET
File = "redline_inserted.png";
};
-Bitmap BMP_REDLINE_AUTOFMT
-{
- // FIXME
- File = "redline_inserted.png";
-};
-
String STR_REDLINE_FORMATED
{
Text [ en-US ] = "Formats" ;
diff --git a/sw/source/ui/utlui/utlui.src b/sw/source/ui/utlui/utlui.src
index 574f52e..c338a64 100644
--- a/sw/source/ui/utlui/utlui.src
+++ b/sw/source/ui/utlui/utlui.src
@@ -241,18 +241,10 @@ String RID_STR_SYSTEM
{
Text [ en-US ] = "[System]";
};
-String STR_MULT_INTERACT_SPELL_WARN
-{
- Text [ en-US ] = "The interactive spellcheck is already active\nin a different document";
-};
String STR_MULT_INTERACT_HYPH_WARN
{
Text [ en-US ] = "The interactive hyphenation is already active\nin a different document";
};
-String STR_SPELL_TITLE
-{
- Text [ en-US ] = "Spellcheck";
-};
String STR_HYPH_TITLE
{
Text [ en-US ] = "Hyphenation";
@@ -318,13 +310,4 @@ Bitmap RID_BMP_PAGE_BREAK
File = "page_break.png" ;
};
-String STR_HYPERCTRL_SEL
-{
- Text [ en-US ] = "SEL";
-};
-String STR_HYPERCTRL_HYP
-{
- Text [ en-US ] = "HYP";
-};
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/web/web.src b/sw/source/ui/web/web.src
index 21910fd..ea2035d 100644
--- a/sw/source/ui/web/web.src
+++ b/sw/source/ui/web/web.src
@@ -28,14 +28,6 @@ String STR_HUMAN_SWWEBDOC_NAME
{
Text [ en-US ] = "HTML" ;
};
-String STR_WRITER_WEBDOC_FULLTYPE_40
-{
- Text [ en-US ] = "%PRODUCTNAME 4.0 HTML" ;
-};
-String STR_WRITER_WEBDOC_FULLTYPE_50
-{
- Text [ en-US ] = "%PRODUCTNAME 5.0 HTML" ;
-};
String STR_WRITER_WEBDOC_FULLTYPE
{
Text [ en-US ] = "%PRODUCTNAME %PRODUCTVERSION HTML Document";
diff --git a/sw/source/uibase/dbui/mailmergechildwindow.src b/sw/source/uibase/dbui/mailmergechildwindow.src
index 8ce4e49..169a083 100644
--- a/sw/source/uibase/dbui/mailmergechildwindow.src
+++ b/sw/source/uibase/dbui/mailmergechildwindow.src
@@ -20,11 +20,6 @@
#include "helpid.h"
#include <cmdid.h>
-String ST_SEND
-{
- Text[ en-US ] = "Sending e-mails...";
-};
-
String ST_CONTINUE
{
Text[ en-US ] = "~Continue";
@@ -70,9 +65,4 @@ String ST_FAILED
Text[ en-US ] = "Sending failed";
};
-String ST_TERMINATEQUERY
-{
- Text[ en-US ] = "There are still e-mail messages in your %PRODUCTNAME Outbox.\nWould you like to exit anyway?";
-};
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/dialog/regionsw.hrc b/sw/source/uibase/dialog/regionsw.hrc
index 2b6e9c2..2e49eb2 100644
--- a/sw/source/uibase/dialog/regionsw.hrc
+++ b/sw/source/uibase/dialog/regionsw.hrc
@@ -21,11 +21,7 @@
#include "dialog.hrc"
-#define ST_INSERT 45
-
/* global resources */
-#define STR_REG_DUPLICATE (RC_REGIONSW_BEGIN+6)
-#define STR_INFO_DUPLICATE (RC_REGIONSW_BEGIN+7)
#define STR_QUERY_CONNECT (RC_REGIONSW_BEGIN+10)
#define STR_WRONG_PASSWORD (RC_REGIONSW_BEGIN+11)
diff --git a/sw/source/uibase/dialog/regionsw.src b/sw/source/uibase/dialog/regionsw.src
index 4a7602f..ea0eb0b 100644
--- a/sw/source/uibase/dialog/regionsw.src
+++ b/sw/source/uibase/dialog/regionsw.src
@@ -42,16 +42,6 @@ Bitmap RID_BMP_PROT_NO_HIDE
File = "re04.png";
};
-String STR_REG_DUPLICATE
-{
- Text [ en-US ] = "Section name changed:" ;
-};
-
-String STR_INFO_DUPLICATE
-{
- Text [ en-US ] = "Duplicate section name" ;
-};
-
String STR_QUERY_CONNECT
{
Text[ en-US ] = "A file connection will delete the contents of the current section. Connect anyway?" ;
diff --git a/sw/source/uibase/docvw/annotation.hrc b/sw/source/uibase/docvw/annotation.hrc
index 0375943..9e1b826 100644
--- a/sw/source/uibase/docvw/annotation.hrc
+++ b/sw/source/uibase/docvw/annotation.hrc
@@ -22,9 +22,6 @@
#include "rcid.hrc"
-#define STR_POSTIT_TODAY (RC_ANNOTATION_BEGIN + 1)
-#define STR_POSTIT_YESTERDAY (RC_ANNOTATION_BEGIN + 2)
-
#define STR_DELETE_ALL_NOTES (RC_ANNOTATION_BEGIN + 3)
#define STR_DELETE_AUTHOR_NOTES (RC_ANNOTATION_BEGIN + 4)
diff --git a/sw/source/uibase/docvw/docvw.hrc b/sw/source/uibase/docvw/docvw.hrc
index 723ea8a..ca60529 100644
--- a/sw/source/uibase/docvw/docvw.hrc
+++ b/sw/source/uibase/docvw/docvw.hrc
@@ -48,13 +48,6 @@
#define MN_READONLY_GRAPHICTOGALLERY (RC_DOCVW_BEGIN + 24)
#define MN_READONLY_BACKGROUNDTOGALLERY (RC_DOCVW_BEGIN + 60)
-#define STR_CHAIN_OK (RC_DOCVW_BEGIN + 2)
-#define STR_CHAIN_NOT_EMPTY (RC_DOCVW_BEGIN + 3)
-#define STR_CHAIN_IS_IN_CHAIN (RC_DOCVW_BEGIN + 4)
-#define STR_CHAIN_WRONG_AREA (RC_DOCVW_BEGIN + 5)
-#define STR_CHAIN_NOT_FOUND (RC_DOCVW_BEGIN + 6)
-#define STR_CHAIN_SOURCE_CHAINED (RC_DOCVW_BEGIN + 7)
-#define STR_CHAIN_SELF (RC_DOCVW_BEGIN + 8)
#define STR_REDLINE_INSERT (RC_DOCVW_BEGIN + 9)
#define STR_REDLINE_DELETE (RC_DOCVW_BEGIN + 10)
#define STR_REDLINE_FORMAT (RC_DOCVW_BEGIN + 11)
diff --git a/sw/source/uibase/docvw/docvw.src b/sw/source/uibase/docvw/docvw.src
index 171c298..a589c11 100644
--- a/sw/source/uibase/docvw/docvw.src
+++ b/sw/source/uibase/docvw/docvw.src
@@ -185,34 +185,6 @@ Menu MN_READONLY_POPUP
};
};
};
-String STR_CHAIN_OK
-{
- Text [ en-US ] = "Click the left mouse button to link the frames." ;
-};
-String STR_CHAIN_NOT_EMPTY
-{
- Text [ en-US ] = "Target frame not empty." ;
-};
-String STR_CHAIN_IS_IN_CHAIN
-{
- Text [ en-US ] = "Target frame is already linked." ;
-};
-String STR_CHAIN_WRONG_AREA
-{
- Text [ en-US ] = "The target frame for the link is in an invalid area." ;
-};
-String STR_CHAIN_NOT_FOUND
-{
- Text [ en-US ] = "Target frame not found at current position." ;
-};
-String STR_CHAIN_SOURCE_CHAINED
-{
- Text [ en-US ] = "The source frame is already the source of a link." ;
-};
-String STR_CHAIN_SELF
-{
- Text [ en-US ] = "A closed link is not possible." ;
-};
String STR_REDLINE_INSERT
{
Text [ en-US ] = "Inserted" ;
diff --git a/sw/source/uibase/inc/app.hrc b/sw/source/uibase/inc/app.hrc
index ad56544..c5dd7ef 100644
--- a/sw/source/uibase/inc/app.hrc
+++ b/sw/source/uibase/inc/app.hrc
@@ -25,10 +25,7 @@
#define STR_CANTCREATE (RC_APP_BEGIN + 4)
#define STR_CANTOPEN (RC_APP_BEGIN + 5)
-#define STR_UNBENANNT (RC_APP_BEGIN + 13)
#define STR_VERSION (RC_APP_BEGIN + 14)
-#define STR_PRINT_MERGE_MACRO (RC_APP_BEGIN + 15)
-#define STR_PAGE_COUNT_MACRO (RC_APP_BEGIN + 16)
// Strings for regions in the configuration
#define STR_PAGEOFFSET (RC_APP_BEGIN + 74)
@@ -46,13 +43,11 @@
#define RID_SW_ERRHDL (RC_APP_BEGIN + 95)
-#define STR_FDLG_TEMPLATE_BUTTON (RC_APP_BEGIN + 1)
#define STR_FDLG_TEMPLATE_NAME (RC_APP_BEGIN + 2)
#define STR_WRITER_DOCUMENT_FULLTYPE (RC_APP_BEGIN + 100)
#define STR_CONVERT_TEXT_TABLE (RC_APP_BEGIN + 101)
#define STR_ABSTRACT_TITLE (RC_APP_BEGIN + 102)
-#define STR_DONT_ASK_AGAIN (RC_APP_BEGIN + 103)
#define STR_OUTLINE_NUMBERING (RC_APP_BEGIN + 104)
#define STR_FDLG_OUTLINE_LEVEL (RC_APP_BEGIN + 105)
#define STR_FDLG_STYLE (RC_APP_BEGIN + 106)
@@ -78,7 +73,6 @@
#define STR_NUMERIC (RC_APP_BEGIN + 126)
#define STR_COL (RC_APP_BEGIN + 127)
#define STR_ROW (RC_APP_BEGIN + 128)
-#define STR_SIMPLE (RC_APP_BEGIN + 129)
#define STR_AUTHMRK_EDIT (RC_APP_BEGIN + 130)
#define STR_AUTHMRK_INSERT (RC_APP_BEGIN + 131)
#define STR_CAPTION_TABLE (RC_APP_BEGIN + 133)
diff --git a/sw/source/uibase/inc/frmui.hrc b/sw/source/uibase/inc/frmui.hrc
index fe11b1d..22fff49 100644
--- a/sw/source/uibase/inc/frmui.hrc
+++ b/sw/source/uibase/inc/frmui.hrc
@@ -25,26 +25,14 @@
#define DLG_COLUMN (RC_FRMDLG_BEGIN + 4)
-#define DLG_CAPTION (RC_FRMDLG_BEGIN + 11)
-
#define STR_FRMUI_BORDER (RC_FRMDLG_BEGIN + 16)
#define STR_FRMUI_PATTERN (RC_FRMDLG_BEGIN + 17)
-#define BMP_BEGIN (RC_FRMDLG_BEGIN + 18)
-#define BMP_NOWRAP (BMP_BEGIN+5)
-
-#define BMP_END (BMP_NOWRAP)
-
-#define MN_BACKGROUND (BMP_END + 4)
-
-#define MN_FOOTNOTE (BMP_END + 7)
-
-#define STR_FRMDLG_BEGIN (MN_FOOTNOTE + 1)
+#define MN_BACKGROUND (RC_FRMDLG_BEGIN + 27)
-#define STR_TOPPRT (STR_FRMDLG_BEGIN + 1)
+#define STR_FRMDLG_BEGIN (RC_FRMDLG_BEGIN + 31)
#define STR_COLUMN (STR_FRMDLG_BEGIN + 17)
-#define STR_CHAR (STR_FRMDLG_BEGIN + 19)
#define STR_OLE_INSERT (STR_FRMDLG_BEGIN + 45)
#define STR_OLE_EDIT (STR_FRMDLG_BEGIN + 46)
@@ -53,11 +41,8 @@
#define STR_LINE_TOP (STR_FRMDLG_BEGIN + 50)
#define STR_LINE_BOTTOM (STR_FRMDLG_BEGIN + 51)
#define STR_LINE_CENTER (STR_FRMDLG_BEGIN + 52)
-#define STR_CHAR_TOP (STR_FRMDLG_BEGIN + 53)
-#define STR_CHAR_BOTTOM (STR_FRMDLG_BEGIN + 54)
-#define STR_CHAR_CENTER (STR_FRMDLG_BEGIN + 55)
-#define FRMDLG_ACT_END STR_CHAR_CENTER
+#define FRMDLG_ACT_END STR_LINE_CENTER
#if FRMDLG_ACT_END > RC_FRMDLG_END
#error Resource-Id Ueberlauf in #file, #line
diff --git a/sw/source/uibase/inc/globdoc.hrc b/sw/source/uibase/inc/globdoc.hrc
index 11614ea..7be2d6b 100644
--- a/sw/source/uibase/inc/globdoc.hrc
+++ b/sw/source/uibase/inc/globdoc.hrc
@@ -23,13 +23,9 @@
#include "rcid.hrc"
#define STR_HUMAN_SWGLOBDOC_NAME (RC_GLOBDOC_BEGIN + 2)
-#define STR_WRITER_GLOBALDOC_FULLTYPE_40 (RC_GLOBDOC_BEGIN + 3)
-#define STR_WRITER_GLOBALDOC_FULLTYPE_50 (RC_GLOBDOC_BEGIN + 4)
#define STR_WRITER_GLOBALDOC_FULLTYPE (RC_GLOBDOC_BEGIN + 5)
-#define MN_GLOBAL_TEXT_POPUPMENU (RC_GLOBDOC_BEGIN + 63)
-
-#define GLOBDOC_ACT_END MN_GLOBAL_TEXT_POPUPMENU
+#define GLOBDOC_ACT_END STR_WRITER_GLOBALDOC_FULLTYPE
#if GLOBDOC_ACT_END > RC_GLOBDOC_END
#error Resource-Id Ueberlauf in #file, #line
diff --git a/sw/source/uibase/inc/misc.hrc b/sw/source/uibase/inc/misc.hrc
index 2c29900..cfa4147 100644
--- a/sw/source/uibase/inc/misc.hrc
+++ b/sw/source/uibase/inc/misc.hrc
@@ -22,8 +22,6 @@
#include "rcid.hrc"
-#define DLG_INSERT_BOOKMARK (RC_MISC_BEGIN + 17)
-
#define DLG_SORTING (RC_MISC_BEGIN + 19)
#define DLG_TAB_OUTLINE (RC_MISC_BEGIN + 29)
diff --git a/sw/source/uibase/inc/ribbar.hrc b/sw/source/uibase/inc/ribbar.hrc
index 3d2d126..79c7cb7 100644
--- a/sw/source/uibase/inc/ribbar.hrc
+++ b/sw/source/uibase/inc/ribbar.hrc
@@ -110,9 +110,7 @@
#define RID_BMP_RIBBAR_FORMULA (STR_IMGBTN_START +58)
#define RID_BMP_RIBBAR_ERROR (STR_IMGBTN_START +59)
-#define BTN_NAVI (STR_IMGBTN_START +60)
-
-#define RC_RIBBAR_ACT_END BTN_NAVI
+#define RC_RIBBAR_ACT_END RID_BMP_RIBBAR_ERROR
#if RC_RIBBAR_ACT_END > RC_RIBBAR_END
#error Resource-Id Ueberlauf in #file, #line
diff --git a/sw/source/uibase/inc/shells.hrc b/sw/source/uibase/inc/shells.hrc
index ed67f6e..3f1cbc3 100644
--- a/sw/source/uibase/inc/shells.hrc
+++ b/sw/source/uibase/inc/shells.hrc
@@ -29,7 +29,6 @@
#define STR_GRFILTER_FILTERERROR (RC_SHELLS_BEGIN + 5)
#define STR_GRFILTER_TOOBIG (RC_SHELLS_BEGIN + 6)
#define STR_INSERT_GRAPHIC (RC_SHELLS_BEGIN + 7)
-#define STR_NO_ADDRESSBOOK (RC_SHELLS_BEGIN + 10)
#define STR_REDLINE_COMMENT (RC_SHELLS_BEGIN + 11)
#define STR_REDLINE_INSERTED (RC_SHELLS_BEGIN + 12)
#define STR_REDLINE_DELETED (RC_SHELLS_BEGIN + 13)
@@ -50,7 +49,6 @@
#define BMP_REDLINE_FORMATED (RC_SHELLS_BEGIN + 26)
#define BMP_REDLINE_TABLECHG (RC_SHELLS_BEGIN + 27)
#define BMP_REDLINE_FMTCOLLSET (RC_SHELLS_BEGIN + 28)
-#define BMP_REDLINE_AUTOFMT (RC_SHELLS_BEGIN + 29)
#define RID_BEZIER_TOOLBOX (RC_SHELLS_BEGIN + 33)
diff --git a/sw/source/uibase/inc/utlui.hrc b/sw/source/uibase/inc/utlui.hrc
index d34c035..4ef7287 100644
--- a/sw/source/uibase/inc/utlui.hrc
+++ b/sw/source/uibase/inc/utlui.hrc
@@ -26,9 +26,6 @@
// Strings in NumberFormatter-Listbox
#define STR_DEFINE_NUMBERFORMAT (RC_UTLUI_BEGIN + 4)
-// hyperlink status bar control
-#define STR_HYPERCTRL_SEL (RC_UTLUI_BEGIN + 5)
-#define STR_HYPERCTRL_HYP (RC_UTLUI_BEGIN + 6)
// names of content types (RC_UTLUI_BEGIN + 7)
#define STR_CONTENT_TYPE_FIRST (RC_UTLUI_BEGIN + 8)
@@ -201,9 +198,7 @@
// empty
#define STR_CALC_DEFAULT (RID_SW_SHELLRES_BEGIN + 10)
#define STR_CALC_ERROR (RID_SW_SHELLRES_BEGIN + 11)
-#define STR_GETREFFLD_UP (RID_SW_SHELLRES_BEGIN + 12)
-#define STR_GETREFFLD_DOWN (RID_SW_SHELLRES_BEGIN + 13)
-#define STR_ALLPAGE_HEADFOOT (RID_SW_SHELLRES_BEGIN + 14)
+// empty
#define STR_TEMPLATE_NONE (RID_SW_SHELLRES_BEGIN + 15)
#define STR_POSTIT_LINE (RID_SW_SHELLRES_BEGIN + 16)
#define STR_FIELD_FIXED (RID_SW_SHELLRES_BEGIN + 17)
diff --git a/sw/source/uibase/inc/web.hrc b/sw/source/uibase/inc/web.hrc
index f7881fb..5fcd8f8 100644
--- a/sw/source/uibase/inc/web.hrc
+++ b/sw/source/uibase/inc/web.hrc
@@ -25,9 +25,7 @@
#define RID_WEBTOOLS_TOOLBOX (RC_WEB_BEGIN + 2)
#define RID_WEBTEXT_TOOLBOX (RC_WEB_BEGIN + 3)
#define STR_HUMAN_SWWEBDOC_NAME (RC_WEB_BEGIN + 4)
-#define STR_WRITER_WEBDOC_FULLTYPE_40 (RC_WEB_BEGIN + 5)
#define RID_WEBFRAME_TOOLBOX (RC_WEB_BEGIN + 8)
-#define STR_WRITER_WEBDOC_FULLTYPE_50 (RC_WEB_BEGIN + 9)
#define RID_WEBGRAPHIC_TOOLBOX (RC_WEB_BEGIN + 10)
#define RID_WEBOLE_TOOLBOX (RC_WEB_BEGIN + 11)
#define STR_WRITER_WEBDOC_FULLTYPE (RC_WEB_BEGIN + 12)
diff --git a/sw/source/uibase/lingu/olmenu.hrc b/sw/source/uibase/lingu/olmenu.hrc
index e106269..6d9f58c 100644
--- a/sw/source/uibase/lingu/olmenu.hrc
+++ b/sw/source/uibase/lingu/olmenu.hrc
@@ -22,10 +22,7 @@
#include "rcid.hrc"
-#define STR_SPELL_OK (RC_LINGU_BEGIN + 2)
#define STR_HYP_OK (RC_LINGU_BEGIN + 3)
-#define STR_WORD (RC_LINGU_BEGIN + 4)
-#define STR_PARAGRAPH (RC_LINGU_BEGIN + 5)
#define STR_LANGSTATUS_NONE (RC_LINGU_BEGIN + 6)
#define STR_LANGSTATUS_MORE (RC_LINGU_BEGIN + 7)
#define STR_IGNORE_SELECTION (RC_LINGU_BEGIN + 8)
diff --git a/sw/source/uibase/lingu/olmenu.src b/sw/source/uibase/lingu/olmenu.src
index 9dc16ca..36d24b7 100644
--- a/sw/source/uibase/lingu/olmenu.src
+++ b/sw/source/uibase/lingu/olmenu.src
@@ -22,18 +22,6 @@
#include "cmdid.h"
#include "helpid.h"
-String STR_WORD
-{
- Text [ en-US ] = "Word is " ;
-};
-String STR_PARAGRAPH
-{
- Text [ en-US ] = "Paragraph is " ;
-};
-String STR_SPELL_OK
-{
- Text [ en-US ] = "The spellcheck is complete." ;
-};
String STR_HYP_OK
{
Text [ en-US ] = "Hyphenation completed" ;
diff --git a/sw/source/uibase/uiview/view.hrc b/sw/source/uibase/uiview/view.hrc
index 41ced87..ef0bf4d 100644
--- a/sw/source/uibase/uiview/view.hrc
+++ b/sw/source/uibase/uiview/view.hrc
@@ -26,8 +26,6 @@
#define STR_NUM_LEVEL (RC_VIEW_BEGIN + 3)
#define STR_NUM_OUTLINE (RC_VIEW_BEGIN + 4)
-#define STR_ERROR_NOLANG (RC_VIEW_BEGIN + 6)
-
#define STR_EDIT_FOOTNOTE (RC_VIEW_BEGIN + 14)
#define STR_NB_REPLACED (RC_VIEW_BEGIN + 20)
@@ -39,11 +37,6 @@
#define STR_NO_MERGE_ENTRY (RC_VIEW_BEGIN + 25)
-#define STR_PRINT_TITLE (RC_VIEW_BEGIN + 26)
-#define STR_PRINT_MSG (RC_VIEW_BEGIN + 27)
-#define STR_PRINT_ALL (RC_VIEW_BEGIN + 28)
-#define STR_PRINT_SELECTION (RC_VIEW_BEGIN + 29)
-
#define RID_PVIEW_TOOLBOX (RC_VIEW_BEGIN + 31)
#define STR_WEBOPTIONS (RC_VIEW_BEGIN + 32)
#define STR_TEXTOPTIONS (RC_VIEW_BEGIN + 33)
diff --git a/sw/source/uibase/uiview/view.src b/sw/source/uibase/uiview/view.src
index edb839f..bcbe2b7 100644
--- a/sw/source/uibase/uiview/view.src
+++ b/sw/source/uibase/uiview/view.src
@@ -61,10 +61,6 @@ String STR_NUM_OUTLINE
{
Text [ en-US ] = "Outline ";
};
-String STR_ERROR_NOLANG
-{
- Text [ en-US ] = "No language is selected in the proofed section." ;
-};
String STR_EDIT_FOOTNOTE
{
Text [ en-US ] = "Edit Footnote/Endnote" ;
@@ -85,22 +81,6 @@ String STR_SRCVIEW_COL
{
Text [ en-US ] = "Column " ;
};
-String STR_PRINT_TITLE
-{
- Text [ en-US ] = "Printing selection";
-};
-String STR_PRINT_MSG
-{
- Text [ en-US ] = "Do you want to print the selection or the entire document?";
-};
-String STR_PRINT_ALL
-{
- Text [ en-US ] = "All";
-};
-String STR_PRINT_SELECTION
-{
- Text [ en-US ] = "Selection";
-};
String STR_SAVEAS_SRC
{
Text [ en-US ] = "~Export source..." ;
diff --git a/sw/source/uibase/utlui/attrdesc.hrc b/sw/source/uibase/utlui/attrdesc.hrc
index 15eb8e2..dafc3a9 100644
--- a/sw/source/uibase/utlui/attrdesc.hrc
+++ b/sw/source/uibase/utlui/attrdesc.hrc
@@ -39,11 +39,8 @@
#define STR_SURROUND_NONE (RC_ATTR_BEGIN + 15)
#define STR_SURROUND_THROUGHT (RC_ATTR_BEGIN + 16)
#define STR_SURROUND_PARALLEL (RC_ATTR_BEGIN + 17)
-#define STR_SURROUND_COLUMN (RC_ATTR_BEGIN + 18)
#define STR_SURROUND_LEFT (RC_ATTR_BEGIN + 19)
#define STR_SURROUND_RIGHT (RC_ATTR_BEGIN + 20)
-#define STR_SURROUND_INSIDE (RC_ATTR_BEGIN + 21)
-#define STR_SURROUND_OUTSIDE (RC_ATTR_BEGIN + 22)
#define STR_FRM_WIDTH (RC_ATTR_BEGIN + 23)
#define STR_FRM_FIXEDHEIGHT (RC_ATTR_BEGIN + 24)
#define STR_FRM_MINHEIGHT (RC_ATTR_BEGIN + 25)
diff --git a/sw/source/uibase/utlui/attrdesc.src b/sw/source/uibase/utlui/attrdesc.src
index cd14d9e6..7e7e464 100644
--- a/sw/source/uibase/utlui/attrdesc.src
+++ b/sw/source/uibase/utlui/attrdesc.src
@@ -98,10 +98,6 @@ String STR_SURROUND_PARALLEL
{
Text [ en-US ] = "Parallel wrap" ;
};
-String STR_SURROUND_COLUMN
-{
- Text [ en-US ] = "Column Wrap" ;
-};
String STR_SURROUND_LEFT
{
Text [ en-US ] = "Left wrap" ;
@@ -110,14 +106,6 @@ String STR_SURROUND_RIGHT
{
Text [ en-US ] = "Right wrap" ;
};
-String STR_SURROUND_INSIDE
-{
- Text [ en-US ] = "Inner wrap" ;
-};
-String STR_SURROUND_OUTSIDE
-{
- Text [ en-US ] = "Outer wrap" ;
-};
String STR_SURROUND_ANCHORONLY
{
Text [ en-US ] = "(Anchor only)" ;
diff --git a/sw/source/uibase/utlui/content.cxx b/sw/source/uibase/utlui/content.cxx
index 2eb92b3..70e6ab3 100644
--- a/sw/source/uibase/utlui/content.cxx
+++ b/sw/source/uibase/utlui/content.cxx
@@ -57,7 +57,6 @@
#include <unotxvw.hxx>
#include <cmdid.h>
#include <helpid.h>
-#include <navipi.hrc>
#include <utlui.hrc>
#include <misc.hrc>
#include <comcore.hrc>
diff --git a/sw/source/uibase/utlui/glbltree.cxx b/sw/source/uibase/utlui/glbltree.cxx
index 33a735a..f18bb5b 100644
--- a/sw/source/uibase/utlui/glbltree.cxx
+++ b/sw/source/uibase/utlui/glbltree.cxx
@@ -53,7 +53,6 @@
#include <cmdid.h>
#include <helpid.h>
-#include <navipi.hrc>
#include <utlui.hrc>
#include <comcore.hrc>
#include <globals.hrc>
diff --git a/sw/source/uibase/utlui/initui.src b/sw/source/uibase/utlui/initui.src
index 1b06fec..05899f3 100644
--- a/sw/source/uibase/utlui/initui.src
+++ b/sw/source/uibase/utlui/initui.src
@@ -63,22 +63,10 @@ String STR_CALC_ERROR
{
Text [ en-US ] = "** Expression is faulty **" ;
};
-String STR_GETREFFLD_UP
-{
- Text [ en-US ] = "above" ;
-};
-String STR_GETREFFLD_DOWN
-{
- Text [ en-US ] = "below" ;
-};
String STR_GETREFFLD_REFITEMNOTFOUND
{
Text [ en-US ] = "Error: Reference source not found" ;
};
-String STR_ALLPAGE_HEADFOOT
-{
- Text [ en-US ] = "All" ;
-};
String STR_TEMPLATE_NONE
{
Text [ en-US ] = "None" ;
diff --git a/sw/source/uibase/utlui/navipi.cxx b/sw/source/uibase/utlui/navipi.cxx
index 3168e01..68a410d 100644
--- a/sw/source/uibase/utlui/navipi.cxx
+++ b/sw/source/uibase/utlui/navipi.cxx
@@ -50,7 +50,6 @@
#include <cmdid.h>
#include <helpid.h>
#include <ribbar.hrc>
-#include <navipi.hrc>
#include <utlui.hrc>
#include "access.hrc"
diff --git a/sw/source/uibase/utlui/navipi.hrc b/sw/source/uibase/utlui/navipi.hrc
deleted file mode 100644
index b8ca734..0000000
--- a/sw/source/uibase/utlui/navipi.hrc
+++ /dev/null
@@ -1,24 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#define TL_CONTENT 51
-#define LB_DOCS 53
-#define TL_GLOBAL 55
-#define TB_GLOBAL 56
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/utlui/navipi.src b/sw/source/uibase/utlui/navipi.src
index e1e5bc9..0da7b7b 100644
--- a/sw/source/uibase/utlui/navipi.src
+++ b/sw/source/uibase/utlui/navipi.src
@@ -20,7 +20,6 @@
#include "cmdid.h"
#include "globals.hrc"
#include "utlui.hrc"
-#include "navipi.hrc"
#include "helpid.h"
#include "access.hrc"
@@ -119,14 +118,6 @@ String STR_HYPERLINK
{
Text [ en-US ] = "Insert as Hyperlink" ;
};
-String STR_LINK_REGION
-{
- Text [ en-US ] = "Insert as Link" ;
-};
-String STR_COPY_REGION
-{
- Text [ en-US ] = "Insert as Copy" ;
-};
String STR_DISPLAY
{
Text [ en-US ] = "Display" ;
diff --git a/sw/source/uibase/wrtsh/wrtsh.hrc b/sw/source/uibase/wrtsh/wrtsh.hrc
index 4b5a1cd..05cdf6c 100644
--- a/sw/source/uibase/wrtsh/wrtsh.hrc
+++ b/sw/source/uibase/wrtsh/wrtsh.hrc
@@ -21,14 +21,7 @@
#include "rcid.hrc"
-#define STR_DDEERROR_APP1 (RC_WRTSH_BEGIN + 2)
-#define STR_DDEERROR_APP2 (RC_WRTSH_BEGIN + 3)
-#define STR_DDEERROR_DATA1 (RC_WRTSH_BEGIN + 4)
-#define STR_DDEERROR_DATA2 (RC_WRTSH_BEGIN + 5)
-#define STR_DDEERROR_LINK1 (RC_WRTSH_BEGIN + 6)
-#define STR_DDEERROR_LINK2 (RC_WRTSH_BEGIN + 7)
-
-#define WRTSH_ACT_END STR_DDEERROR_LINK2
+#define WRTSH_ACT_END RC_WRTSH_BEGIN
#if WRTSH_ACT_END > RC_WRTSH_END
#error Resource-Id Ueberlauf
diff --git a/sw/source/uibase/wrtsh/wrtsh.src b/sw/source/uibase/wrtsh/wrtsh.src
index 5d6e3bf..3b605ff 100644
--- a/sw/source/uibase/wrtsh/wrtsh.src
+++ b/sw/source/uibase/wrtsh/wrtsh.src
@@ -18,29 +18,4 @@
*/
#include "wrtsh.hrc"
-String STR_DDEERROR_APP1
-{
- Text[ en-US ] = "Application [" ;
-};
-String STR_DDEERROR_APP2
-{
- Text[ en-US ] = "] is not responding." ;
-};
-String STR_DDEERROR_DATA1
-{
- Text[ en-US ] = "Data for [" ;
-};
-String STR_DDEERROR_DATA2
-{
- Text[ en-US ] = "] cannot be obtained" ;
-};
-String STR_DDEERROR_LINK1
-{
- Text[ en-US ] = "Link to [" ;
-};
-String STR_DDEERROR_LINK2
-{
- Text[ en-US ] = "] cannot be established" ;
-};
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
More information about the Libreoffice-commits
mailing list