[Libreoffice-commits] core.git: 2 commits - cui/source include/svx svx/source
Thomas Arnhold
thomas at arnhold.org
Wed Aug 6 01:12:33 PDT 2014
cui/source/inc/cuires.hrc | 17 -----------------
include/svx/dialogs.hrc | 33 ---------------------------------
svx/source/src/app.hrc | 33 ---------------------------------
3 files changed, 83 deletions(-)
New commits:
commit 48ccd80566d18ef0305381d7b4ed68fdaf032948
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Wed Aug 6 10:11:01 2014 +0200
remove some more unused resource ids
Change-Id: Ife159630b7e68e8e346619853b8285f46dcf275b
diff --git a/cui/source/inc/cuires.hrc b/cui/source/inc/cuires.hrc
index 176e7fd..03b5d61 100644
--- a/cui/source/inc/cuires.hrc
+++ b/cui/source/inc/cuires.hrc
@@ -96,7 +96,6 @@
// options
#define RID_SVXSTR_DIAGRAM_ROW (RID_SVX_START + 1162)
-#define RID_OFAPAGE_CONNPOOLOPTIONS (RID_OFA_START + 122)
#define QUERY_DELETE_CONFIRM (RID_SVX_START + 1110)
#define RID_SVXPAGE_JSEARCH_OPTIONS (RID_SVX_START + 840)
#define STR_LINKEDDOC_DOESNOTEXIST (RID_SVX_START + 1111)
@@ -112,7 +111,6 @@
#define RID_RIDER_SLL_PERSONAL (RID_OFA_START + 101)//?
// options
-#define RID_SVXDLG_SECURITY_OPTIONS (RID_SVX_START + 300)
#define RID_SVXPAGE_ONLINEUPDATE (RID_SVX_START + 298)
#define OFA_TP_MEMORY (RID_OFA_START + 250)
#define RID_SVXPAGE_INET_SECURITY (RID_SVX_START + 200)
@@ -123,11 +121,9 @@
#define OFA_TP_LANGUAGES (RID_OFA_START + 205)
#define OFA_TP_MISC (RID_OFA_START + 200)
#define OFA_TP_VIEW (RID_OFA_START + 202)
-#define RID_OFAPAGE_MSFILTEROPT (RID_OFA_START + 120)
#define RID_OFAPAGE_MSFILTEROPT2 (RID_OFA_START + 121)
#define RID_SVXPAGE_OPTIONS_CTL (RID_SVX_START + 252)
#define RID_SVXPAGE_OPTIONS_JAVA (RID_SVX_START + 253)
-#define RID_SVXPAGE_ABOUT_CONFIG (RID_SVX_START + 301)
#define RID_SVXPAGE_ACCESSIBILITYCONFIG (RID_SVX_START + 250)
#define RID_SVXPAGE_ASIAN_LAYOUT (RID_SVX_START + 246)
#define RID_OPTPAGE_CHART_DEFCOLORS (RID_SVX_START + 299)
@@ -140,8 +136,6 @@
#define RID_SVXSTR_COLOR_CONFIG_DELETE (RID_SVX_START + 855)
#define RID_SVXSTR_OPT_DOUBLE_DICTS (RID_SVX_START + 320)
#define RID_SVXERR_OPT_PROXYPORTS (RID_SVX_START + 224)
-#define RID_SVXDLG_JAVA_PARAMETER (RID_SVX_START + 254)
-#define RID_SVXDLG_JAVA_CLASSPATH (RID_SVX_START + 255)
#define RID_SVXERR_JRE_NOT_RECOGNIZED (RID_SVX_START + 256)
#define RID_SVXERR_JRE_FAILED_VERSION (RID_SVX_START + 257)
#define RID_SVXSTR_PATH_NAME_START (RID_SVX_START + 1003)
@@ -174,7 +168,6 @@
#define RID_SVXSTR_KEY_USERDICTIONARY_DIR (RID_SVX_START + 1025)//?
// dialogs
-#define RID_SVX_WND_COMMON_LINGU ( RID_SVX_START + 0 )
#define STR_MODIFY (RID_SVX_START + 336)//from optdict.src
// hyperlink dialog
@@ -213,9 +206,6 @@
#define RID_SVXSTR_HYPERDLG_FORM_BUTTON (RID_SVX_START + 813)
#define RID_SVXSTR_HYPERDLG_FROM_TEXT (RID_SVX_START + 814)
-// hangulhanja
-#define RID_SVX_MDLG_HANGULHANJA (RID_SVX_START + 1 )
-
// icon choice
#define RID_SVXSTR_ICONCHOICEDLG_RESETBUT (RID_SVX_START + 580)
@@ -249,15 +239,8 @@
#define RID_SVXSTR_ERROR_TYPE_LABEL (RID_SVX_START + 1108)
#define RID_SVXSTR_ERROR_MESSAGE_LABEL (RID_SVX_START + 1109)
-// spell check dialog
-#define RID_SVXDLG_SPELLCHECK (RID_SVX_START + 32)
-
-// split cells
-#define RID_SVX_SPLITCELLDLG ( RID_SVX_START + 43 )
-
// customize
#define RID_SVXDLG_CUSTOMIZE (RID_SVX_START + 291)
-#define RID_SVXPAGE_TOOLBARS (RID_SVX_START + 294)
#define RID_SVXPAGE_CONFIGGROUPBOX (RID_SVX_START + 304)
#define RID_SVXSTR_NEW_MENU (RID_SVX_START + 1039)
diff --git a/include/svx/dialogs.hrc b/include/svx/dialogs.hrc
index d2a7224..0c71500 100644
--- a/include/svx/dialogs.hrc
+++ b/include/svx/dialogs.hrc
@@ -119,7 +119,6 @@
#define RID_SW_TP_OPTCAPTION_PAGE (RID_OFA_START + 256)
#define SID_SC_TP_LAYOUT (RID_OFA_START + 218)
#define SID_SC_TP_CONTENT (RID_OFA_START + 219)
-#define SID_SC_TP_INPUT (RID_OFA_START + 220)
#define SID_SC_TP_GRID (RID_OFA_START + 221)
#define SID_SC_TP_USERLISTS (RID_OFA_START + 222)
#define SID_SC_TP_CALC (RID_OFA_START + 223)
@@ -1040,13 +1039,8 @@
// I suggest sticking to per-type ids instead of per-semantic ids, this is
// better maintainable (IMO), and does not waste that much ids
-// "Window" resource ids
-
// "ModalDialog" resource ids
-// "Menu" resource ids
-#define RID_SVX_MDLG_FONTWORK_CHARSPACING ( RID_SVX_START + 19 )
-
// document recovery and error report
// recycling ids from DBManager
#define RID_SVX_MDLG_DOCRECOVERY_BROKEN ( RID_SVX_START + 12 )
diff --git a/svx/source/src/app.hrc b/svx/source/src/app.hrc
index 6c83495..d19db1c 100644
--- a/svx/source/src/app.hrc
+++ b/svx/source/src/app.hrc
@@ -33,17 +33,8 @@
#define RID_OFAPAGE_HTMLOPT (RID_OFA_START + 100)
#define RID_OFA_AUTOCORR_DLG (RID_OFA_START + 101)
-#define RID_OFAPAGE_AUTOCORR_OPTIONS (RID_OFA_START + 102)
-#define RID_OFAPAGE_AUTOCORR_REPLACE (RID_OFA_START + 103)
-#define RID_OFAPAGE_AUTOCORR_EXCEPT (RID_OFA_START + 104)
-#define RID_OFAPAGE_AUTOCORR_QUOTE (RID_OFA_START + 109)
-#define RID_OFAPAGE_AUTOFMT_APPLY (RID_OFA_START + 110)
-#define RID_OFADLG_PRCNT_SET (RID_OFA_START + 111)
#define RID_OFADLG_OPTIONS_TREE_PAGES (RID_OFA_START + 116)
-#define RID_OFAPAGE_AUTOCOMPLETE_OPTIONS (RID_OFA_START + 119)
-#define RID_OFAPAGE_MSFILTEROPT (RID_OFA_START + 120)
#define RID_OFAPAGE_MSFILTEROPT2 (RID_OFA_START + 121)
-#define RID_OFAPAGE_CONNPOOLOPTIONS (RID_OFA_START + 122)
// TabPages --------------------------------------------------------------
@@ -64,7 +55,6 @@
#define RID_SW_TP_BACKGROUND (RID_OFA_START + 217)
#define SID_SC_TP_LAYOUT (RID_OFA_START + 218)
#define SID_SC_TP_CONTENT (RID_OFA_START + 219)
-#define SID_SC_TP_INPUT (RID_OFA_START + 220)
#define SID_SC_TP_GRID (RID_OFA_START + 221)
#define SID_SC_TP_USERLISTS (RID_OFA_START + 222)
#define SID_SC_TP_CALC (RID_OFA_START + 223)
commit 14bfa5ccd9ce531a26a006a2b62fe87d36a98d7d
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Wed Aug 6 09:51:28 2014 +0200
resource ids: defined twice but never used
Change-Id: Icd6028d2b84db106351084936d00b44ad73f2592
diff --git a/include/svx/dialogs.hrc b/include/svx/dialogs.hrc
index 3542e99..d2a7224 100644
--- a/include/svx/dialogs.hrc
+++ b/include/svx/dialogs.hrc
@@ -1054,38 +1054,11 @@
// !!!! double defined ID's (see below) !!!
#define RID_OFA_AUTOCORR_DLG (RID_OFA_START + 101)
-#define RID_OFA_GENERAL_OPTIONS_DLG (RID_OFA_START + 105)
-#define RID_OFADLG_INTERNET (RID_OFA_START + 106)
-#define RID_OFA_TABNEW_DLG (RID_OFA_START + 107)
-#define RID_OFADLG_BROWSER (RID_OFA_START + 108)
-#define RID_OFA_FORMNEW_DLG (RID_OFA_START + 112)
-#define RID_OFA_TABPROPERTIES (RID_OFA_START + 113)
-#define RID_OFADLG_REGISTRATION (RID_OFA_START + 114)
-#define RID_OFADLG_AWCP_VALUES (RID_OFA_START + 117)
-
// TabPages --------------------------------------------------------------
// !!!! double defined ID's (see above) !!!
-#define OFA_TP_APPEARANCE (RID_OFA_START + 203)
-#define OFA_TP_TABPROPERTIES_GENERAL (RID_OFA_START + 204)
-
-//the RID_??_TP_* are duplicate in offids.hrc
-
-#define RID_SW_TP_LAYOUT_OPT (RID_OFA_START + 207)
-#define RID_SW_TP_OPTINSERT_PAGE (RID_OFA_START + 213)
#define RID_SW_TP_OPTTEST_PAGE (RID_OFA_START + 215)
-#define RID_SW_TP_OPTSRCVIEW (RID_OFA_START + 216)
-#define RID_SW_TP_OPTINSERT_HTML_PAGE (RID_OFA_START + 238)
-#define RID_SW_TP_HTML_LAYOUT_OPT (RID_OFA_START + 241)
-#define SID_SD_TP_LAYOUT (RID_OFA_START + 226)
-#define SID_SD_TP_SCALE (RID_OFA_START + 228)
-#define SID_SD_TP_GRID (RID_OFA_START + 229)
-#define SID_SI_TP_LAYOUT (RID_OFA_START + 233)
-#define SID_SI_TP_GRID (RID_OFA_START + 235)
-#define SID_SC_TP_MISC (RID_OFA_START + 239)
-#define OFA_TP_TABPROPERTIES_TEXT (RID_OFA_START + 245)
-#define OFA_TP_HELPERPROG (RID_OFA_START + 249)
#define STR_COLORTABLE (RID_OFA_START + 257)
#define STR_SWITCH (RID_OFA_START + 258)
#define SID_SC_TP_FORMULA (RID_OFA_START + 259)
diff --git a/svx/source/src/app.hrc b/svx/source/src/app.hrc
index 97dd105..6c83495 100644
--- a/svx/source/src/app.hrc
+++ b/svx/source/src/app.hrc
@@ -36,18 +36,10 @@
#define RID_OFAPAGE_AUTOCORR_OPTIONS (RID_OFA_START + 102)
#define RID_OFAPAGE_AUTOCORR_REPLACE (RID_OFA_START + 103)
#define RID_OFAPAGE_AUTOCORR_EXCEPT (RID_OFA_START + 104)
-#define RID_OFA_GENERAL_OPTIONS_DLG (RID_OFA_START + 105)
-#define RID_OFADLG_INTERNET (RID_OFA_START + 106)
-#define RID_OFA_TABNEW_DLG (RID_OFA_START + 107)
-#define RID_OFADLG_BROWSER (RID_OFA_START + 108)
#define RID_OFAPAGE_AUTOCORR_QUOTE (RID_OFA_START + 109)
#define RID_OFAPAGE_AUTOFMT_APPLY (RID_OFA_START + 110)
#define RID_OFADLG_PRCNT_SET (RID_OFA_START + 111)
-#define RID_OFA_FORMNEW_DLG (RID_OFA_START + 112)
-#define RID_OFA_TABPROPERTIES (RID_OFA_START + 113)
-#define RID_OFADLG_REGISTRATION (RID_OFA_START + 114)
#define RID_OFADLG_OPTIONS_TREE_PAGES (RID_OFA_START + 116)
-#define RID_OFADLG_AWCP_VALUES (RID_OFA_START + 117)
#define RID_OFAPAGE_AUTOCOMPLETE_OPTIONS (RID_OFA_START + 119)
#define RID_OFAPAGE_MSFILTEROPT (RID_OFA_START + 120)
#define RID_OFAPAGE_MSFILTEROPT2 (RID_OFA_START + 121)
@@ -58,22 +50,17 @@
#define OFA_TP_MISC (RID_OFA_START + 200)
#define OFA_TP_VIEW (RID_OFA_START + 202)
-#define OFA_TP_APPEARANCE (RID_OFA_START + 203)
-#define OFA_TP_TABPROPERTIES_GENERAL (RID_OFA_START + 204)
#define OFA_TP_LANGUAGES (RID_OFA_START + 205)
//die RID_??_TP_* stehen nochmal im offids.hrc
#define RID_SW_TP_CONTENT_OPT (RID_OFA_START + 206)
-#define RID_SW_TP_LAYOUT_OPT (RID_OFA_START + 207)
#define RID_SW_TP_STD_FONT (RID_OFA_START + 208)
#define RID_SW_TP_OPTPRINT_PAGE (RID_OFA_START + 209)
#define RID_SW_TP_OPTTABLE_PAGE (RID_OFA_START + 210)
#define RID_SW_TP_OPTSHDWCRSR (RID_OFA_START + 211)
#define RID_SW_TP_REDLINE_OPT (RID_OFA_START + 212)
-#define RID_SW_TP_OPTINSERT_PAGE (RID_OFA_START + 213)
#define RID_SW_TP_OPTLOAD_PAGE (RID_OFA_START + 214)
#define RID_SW_TP_OPTTEST_PAGE (RID_OFA_START + 215)
-#define RID_SW_TP_OPTSRCVIEW (RID_OFA_START + 216)
#define RID_SW_TP_BACKGROUND (RID_OFA_START + 217)
#define SID_SC_TP_LAYOUT (RID_OFA_START + 218)
#define SID_SC_TP_CONTENT (RID_OFA_START + 219)
@@ -83,30 +70,20 @@
#define SID_SC_TP_CALC (RID_OFA_START + 223)
#define SID_SC_TP_CHANGES (RID_OFA_START + 224)
#define SID_SD_TP_CONTENTS (RID_OFA_START + 225)
-#define SID_SD_TP_LAYOUT (RID_OFA_START + 226)
#define SID_SD_TP_SNAP (RID_OFA_START + 227)
-#define SID_SD_TP_SCALE (RID_OFA_START + 228)
-#define SID_SD_TP_GRID (RID_OFA_START + 229)
#define SID_SD_TP_PRINT (RID_OFA_START + 220)
#define SID_SD_TP_MISC (RID_OFA_START + 231)
#define SID_SI_TP_CONTENTS (RID_OFA_START + 232)
-#define SID_SI_TP_LAYOUT (RID_OFA_START + 233)
#define SID_SI_TP_SNAP (RID_OFA_START + 234)
-#define SID_SI_TP_GRID (RID_OFA_START + 235)
#define SID_SI_TP_PRINT (RID_OFA_START + 236)
#define SID_SI_TP_MISC (RID_OFA_START + 237)
-#define RID_SW_TP_OPTINSERT_HTML_PAGE (RID_OFA_START + 238)
-#define SID_SC_TP_MISC (RID_OFA_START + 239)
#define RID_SW_TP_HTML_CONTENT_OPT (RID_OFA_START + 240)
-#define RID_SW_TP_HTML_LAYOUT_OPT (RID_OFA_START + 241)
#define RID_SW_TP_HTML_OPTPRINT_PAGE (RID_OFA_START + 242)
#define RID_SW_TP_HTML_OPTTABLE_PAGE (RID_OFA_START + 243)
#define RID_SW_TP_HTML_OPTGRID_PAGE (RID_OFA_START + 244)
-#define OFA_TP_TABPROPERTIES_TEXT (RID_OFA_START + 245)
#define RID_SW_TP_HTML_OPTSHDWCRSR (RID_OFA_START + 246)
#define RID_SW_TP_STD_FONT_CJK (RID_OFA_START + 247)
#define RID_SC_TP_PRINT (RID_OFA_START + 248)
-#define OFA_TP_HELPERPROG (RID_OFA_START + 249)
#define OFA_TP_MEMORY (RID_OFA_START + 250)
#define RID_SW_TP_STD_FONT_CTL (RID_OFA_START + 251)
#define RID_SW_TP_OPTCOMPATIBILITY_PAGE (RID_OFA_START + 255)
More information about the Libreoffice-commits
mailing list