diff options
| author | Thomas Arnhold <thomas@arnhold.org> | 2012-06-21 11:51:04 +0200 |
|---|---|---|
| committer | Thomas Arnhold <thomas@arnhold.org> | 2012-06-21 11:54:18 +0200 |
| commit | 5fcecf9b88a0879081d8239cebbc03e30150985a (patch) | |
| tree | 2eaa65002db4ccb19778e054f9fc40c33312537c /sw/source | |
| parent | 47009fbf515dc6e4d4c275e5a3458b4ce2d817d9 (diff) | |
hrc cleanup: Remove unused defines
All of those defines (should) not be used at any point in the code.
False positives may exist, because some macro names are getting
generated by some template/macro foo. This is the version which
compiled fine for me.
Also there are many commented out lines removed.
Change-Id: I6394024682e4ab3691eb72707a9363d41ba31df8
Diffstat (limited to 'sw/source')
35 files changed, 1 insertions, 447 deletions
diff --git a/sw/source/core/undo/undo.hrc b/sw/source/core/undo/undo.hrc index eee3e3ce1236..102a96828c89 100644 --- a/sw/source/core/undo/undo.hrc +++ b/sw/source/core/undo/undo.hrc @@ -73,9 +73,6 @@ #define STR_PASTE_CLIPBOARD_UNDO (UNDO_BASE +40) #define STR_TYPING_UNDO (UNDO_BASE +41) -#define STR_REPEAT_DUMMY_6 (UNDO_BASE +42) -#define STR_REPEAT_DUMMY_7 (UNDO_BASE +43) -#define STR_REPEAT_DUMMY_8 (UNDO_BASE +44) #define STR_REPEAT_DUMMY_9 (UNDO_BASE +45) // !!!!!! umsetzen !!!!!!!!!!! umsetzen !!!!!!!!!!! umsetzen !!!! #define CORE_REPEAT_END STR_REPEAT_DUMMY_9// !!!! umsetzen !!! @@ -181,6 +178,4 @@ #define STR_UNDO_NLS (UNDO_MORE_STRINGS_BEGIN + 2) #define STR_UNDO_PAGEBREAKS (UNDO_MORE_STRINGS_BEGIN + 3) #define STR_UNDO_COLBRKS (UNDO_MORE_STRINGS_BEGIN + 4) -#define STR_UNDO_SPECIALCHAR (UNDO_MORE_STRINGS_BEGIN + 5) -#define UNDO_ACT_END STR_UNDO_TABLE_NAME diff --git a/sw/source/ui/chrdlg/chardlg.hrc b/sw/source/ui/chrdlg/chardlg.hrc index 48a661bfebec..20d340ba50b3 100644 --- a/sw/source/ui/chrdlg/chardlg.hrc +++ b/sw/source/ui/chrdlg/chardlg.hrc @@ -24,48 +24,9 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#define FONT_FT 1 -#define FONT_CB 2 -#define FACE_FT 3 -#define FACE_LB 4 #define SIZE_FT 5 -#define SIZE_CB 6 -#define OUTLINE_TB 7 -#define SHADOW_TB 8 -#define UNDERL_TB 9 -#define STRIKETHRU_TB 10 -#define COLOR_FT 11 #define COLOR_LB 12 -#define LANG_FT 13 -#define LANG_LB 14 -#define EXAMPLE_WN 15 -#define EXAMPLE_FL 16 -#define CASEMAP_FL 17 -#define NONE_RB 20 #define CAPS_RB 21 -#define LOWERCASE_RB 22 -#define SMALLCAPS_RB 23 -#define TITEL_RB 24 -#define HIGH_RB 25 -#define NORMAL_RB 26 -#define DEEP_RB 27 -#define DEEPHIGHT_FT 28 -#define DEEPHIGH_MF 29 -#define RELSIZE_FT 30 -#define RELSIZE_MF 31 -#define KERN_LB 32 -#define KERN_FT 33 -#define KERN_MF 34 -#define UNDERLINE_FT 35 -#define UNDERLINE_LB 36 -#define STRIKE_FT 37 -#define STRIKE_LB 38 -#define STRIKE_CB 39 -#define EFFECT_FL 41 -#define POS_FL 42 -#define POSEXT_FL 43 -#define KERN_FL 45 -#define FONTTYPE_FT 46 #define FL_URL 50 #define FT_URL 51 diff --git a/sw/source/ui/chrdlg/paradlg.hrc b/sw/source/ui/chrdlg/paradlg.hrc index e8e48dfaa956..c6c514e7b7cf 100644 --- a/sw/source/ui/chrdlg/paradlg.hrc +++ b/sw/source/ui/chrdlg/paradlg.hrc @@ -25,47 +25,10 @@ * ************************************************************************/ #define TAB_CONTROL 55 -#define INDENT_FRM 1 -#define LEFT_LABEL 2 -#define FLINE_LABEL 3 -#define RIGHT_LABEL 4 -#define LEFT_INDENT 5 -#define FLINE_INDENT 6 -#define RIGHT_INDENT 7 #define DIST_FRM 8 -#define TOP_LABEL 9 #define TOP_DIST 10 -#define BOTTOM_LABEL 11 #define BOTTOM_DIST 12 -#define ALG_LEFT 13 -#define ALG_RIGHT 50 -#define ALG_CENTER 51 -#define ALG_JUSTIFY 52 -#define ALG_FRM 14 -#define LINEDIST_FRM 15 -#define LINEDIST_BOX 16 -#define LINEDIST_AT_LABEL 17 -#define LINEDIST_AT_PERCENTBOX 18 -#define LINEDIST_AT_METRICBOX 19 -#define HYPHEN_FRM 21 #define HYPHEN_BOX_AFTER 44 #define HYPHEN_BOX_BEFORE 22 -#define EXTHYPHEN_BOX_AFTER 42 -#define EXTHYPHEN_BOX_BEFORE 23 -#define HYPHEN_LABEL_AFTER 43 -#define HYPHEN_LABEL_BEFORE 24 -#define EXTEND_FRM 25 -#define PAGEBREAK_BOX 26 -#define PAGEBREAK_DAVOR 27 -#define PAGEBREAK_DAHINTER 28 -#define KEEP_TOGETHER_BOX 29 -#define WIDOW_BOX 31 -#define WIDOW_ROW_NO 32 -#define WIDOW_ROW_LABEL 33 -#define ORPHAN_BOX 34 -#define ORPHAN_ROW_NO 35 -#define ORPHAN_ROW_LABEL 36 -#define PAGE_COLL_BTN 40 -#define PAGE_COLL_BOX 41 #define OK_BTN 50 #define CANCEL_BTN 51 diff --git a/sw/source/ui/config/config.hrc b/sw/source/ui/config/config.hrc index 33209779ed0c..09a4260c0eb1 100644 --- a/sw/source/ui/config/config.hrc +++ b/sw/source/ui/config/config.hrc @@ -32,30 +32,11 @@ // dialogs for configuration // strings for configuration -#define STR_CFG_SIGNATUR (RC_CONFIG_BEGIN + 0) -#define DLG_CONFIG_VIEW (RC_CONFIG_BEGIN + 1) -#define DLG_CONFIG_MISC (RC_CONFIG_BEGIN + 2) -#define DLG_CONFIG_SAVE (RC_CONFIG_BEGIN + 3) -#define DLG_CONFIG_PATH (RC_CONFIG_BEGIN + 4) -#define DLG_CONFIG_MENU (RC_CONFIG_BEGIN + 5) -#define DLG_CONFIG_KEY (RC_CONFIG_BEGIN + 6) -#define DLG_CONFIG_TOOLBOX (RC_CONFIG_BEGIN + 7) -#define DLG_CONFIG_COLOR (RC_CONFIG_BEGIN + 8) -#define DLG_TBSEL (RC_CONFIG_BEGIN + 9) -#define DLG_CFGSEL (RC_CONFIG_BEGIN + 10) -#define DLG_CONFIG (RC_CONFIG_BEGIN + 11) -#define DLG_MAC_ASSIGN (RC_CONFIG_BEGIN + 12) -#define MSG_DOUBLE_MENU_ID (RC_CONFIG_BEGIN + 13) -#define MSG_DOUBLE_ID (RC_CONFIG_BEGIN + 14) -#define DLG_SYMBOL_SELECT (RC_CONFIG_BEGIN + 15) -#define DLG_CONFIG_GRID (RC_CONFIG_BEGIN + 16) -#define DLG_CONFIG_ADDR (RC_CONFIG_BEGIN + 17) #define DLG_MM_TESTACCOUNTSETTINGS (RC_CONFIG_BEGIN + 19) #define DLG_MM_SERVERAUTHENTICATION (RC_CONFIG_BEGIN + 20) -#define STR_ERROR_PATH (RC_CONFIG_BEGIN + 25) #define STR_ARR_METRIC (RC_CONFIG_BEGIN + 26) #define CONFIG_ACT_END STR_ARR_METRIC diff --git a/sw/source/ui/config/optdlg.hrc b/sw/source/ui/config/optdlg.hrc index 1da9f06f7e35..12cb0e1c4a74 100644 --- a/sw/source/ui/config/optdlg.hrc +++ b/sw/source/ui/config/optdlg.hrc @@ -50,24 +50,12 @@ #define FL_LINE 22 #define CB_POSTIT 23 #define CB_VRULER_RIGHT 24 -#define CB_BIGHANDLE 25 #define FL_SETTINGS 26 #define LB_METRIC 27 #define FT_METRIC 28 //test tab page -#define CB_TEST1 25 -#define CB_TEST2 26 -#define CB_TEST3 27 -#define CB_TEST4 28 -#define CB_TEST5 29 -#define CB_TEST6 30 -#define CB_TEST7 31 -#define CB_TEST8 32 -#define CB_TEST9 33 -#define CB_TEST10 34 -#define FL_TEST 35 #define CB_FLD_HIDDEN_PARA 36 // right in the middle of it, so that HelpIds stay compatible to FPII #define CB_SMOOTH_SCROLL 37 @@ -75,21 +63,14 @@ #define BT_OK 38 #define BT_CANCEL 39 #define BT_MORE 40 -#define BT_GRID 41 -#define MF_HFRAME 42 -#define MF_VFRAME 43 #define CB_INDEX 44 #define LB_COLOR 50 -#define WIN_COLOR 52 -#define ED_COLORNAME 53 #define BT_EDIT 55 #define BT_NEW 56 #define BT_DELETE 57 #define BT_DEFAULT 58 -#define CB_HANDLE 59 -#define CB_SECT_BOUNDS 60 #define CB_CHAR_HIDDEN 61 // Print-Extra-Page #define CB_PGRF 61 @@ -179,21 +160,13 @@ #define FT_VAR 126 #define FT_MOVE 128 -#define FL_COLOR 130 -#define FT_SGML 131 -#define LB_SGML 132 #define FT_COMMENT 133 -#define LB_COMMENT 134 -#define FT_KEYWD 135 -#define LB_KEYWD 136 #define FT_UNKNOWN 137 -#define LB_UNKNOWN 138 #define FL_TABLE_SEPARATOR 139 #define CB_PROSPECT_RTL 140 #define FL_SHDWCRSFLAG 1 #define CB_SHDWCRSONOFF 2 -#define FL_SHDWCRSMODE 3 #define FT_SHDWCRSFILLMODE 4 #define RB_SHDWCRSFILLMARGIN 5 #define RB_SHDWCRSFILLINDENT 6 diff --git a/sw/source/ui/dbui/mmoutputpage.hrc b/sw/source/ui/dbui/mmoutputpage.hrc index f8daf2734b0c..92bd1c3b0e51 100644 --- a/sw/source/ui/dbui/mmoutputpage.hrc +++ b/sw/source/ui/dbui/mmoutputpage.hrc @@ -48,7 +48,6 @@ #define LB_PRINT 22 #define PB_PRINTERSETTINGS 23 #define RB_PRINTALL 24 -#define RB_PRINTCURRENT 25 #define PB_PRINTNOW 26 #define ST_SAVESTART 27 #define ST_SAVEMERGED 28 diff --git a/sw/source/ui/dialog/regionsw.hrc b/sw/source/ui/dialog/regionsw.hrc index b9d027fa6398..c56c9b5196b4 100644 --- a/sw/source/ui/dialog/regionsw.hrc +++ b/sw/source/ui/dialog/regionsw.hrc @@ -51,7 +51,6 @@ #define ED_RANAME 19 #define ED_RNAME 20 #define FT_CONDITION 21 -#define FL_EDIT_OPTIONS 22 #define FLD_END_OFFSET 23 #define FLD_FTN_OFFSET 24 #define FT_DDE 25 @@ -62,7 +61,6 @@ #define FT_FTN_OFFSET 30 #define FT_FTN_PREFIX 31 #define FT_FTN_SUFFIX 32 -#define FT_RNAME 33 #define FT_SUBREG 34 #define LB_END_NUMVIEW 36 #define LB_FTN_NUMVIEW 37 @@ -72,7 +70,6 @@ #define PB_HELP 41 #define PB_OK 42 #define PB_OPTIONS 43 -#define PB_SAVED 44 #define ST_INSERT 45 #define TLB_SECTION 46 #define FL_NAME 47 @@ -91,7 +88,6 @@ #define STR_REG_DUPLICATE (RC_REGIONSW_BEGIN+6) #define STR_INFO_DUPLICATE (RC_REGIONSW_BEGIN+7) -#define MD_INS_REGION (RC_REGIONSW_BEGIN+8) #define MD_EDIT_REGION (RC_REGIONSW_BEGIN+9) #define QB_CONNECT (RC_REGIONSW_BEGIN+10) #define REG_WRONG_PASSWORD (RC_REGIONSW_BEGIN+11) diff --git a/sw/source/ui/dialog/wordcountdialog.hrc b/sw/source/ui/dialog/wordcountdialog.hrc index 0db5c87b970f..af6f3a79c76c 100644 --- a/sw/source/ui/dialog/wordcountdialog.hrc +++ b/sw/source/ui/dialog/wordcountdialog.hrc @@ -43,6 +43,5 @@ #define FL_BOTTOM 15 #define PB_OK 16 #define PB_HELP 17 -#define WINDOW_DLG 18 #endif diff --git a/sw/source/ui/envelp/label.hrc b/sw/source/ui/envelp/label.hrc index 4b563068cb66..5a854e3c586a 100644 --- a/sw/source/ui/envelp/label.hrc +++ b/sw/source/ui/envelp/label.hrc @@ -53,8 +53,6 @@ #define BTN_INSERT 19 #define BTN_SYNC 20 -#define RB_FROM_AUTO_TEXT 1 -#define RB_FROM_EDIT 2 #define LB_AUTO_TEXT 3 #define FT_AUTO_TEXT_GROUP 4 #define LB_AUTO_TEXT_GROUP 5 diff --git a/sw/source/ui/fldui/changedb.hrc b/sw/source/ui/fldui/changedb.hrc index bc90e9f453ee..66f05120f21a 100644 --- a/sw/source/ui/fldui/changedb.hrc +++ b/sw/source/ui/fldui/changedb.hrc @@ -33,7 +33,6 @@ #define FT_DESC 1 #define FT_DOCDBTEXT 2 #define FT_DOCDBNAME 3 -#define BT_CHANGEDB 4 #define FT_USEDDB 5 #define FT_AVAILDB 6 #define TLB_USEDDB 7 diff --git a/sw/source/ui/frmdlg/column.hrc b/sw/source/ui/frmdlg/column.hrc index 9ad30e6673c0..61b89d1b3d86 100644 --- a/sw/source/ui/frmdlg/column.hrc +++ b/sw/source/ui/frmdlg/column.hrc @@ -27,7 +27,6 @@ #define FT_NUMBER 1 #define ED_NUMBER 2 #define FT_DISTANCE 3 -#define ED_DISTANCE 4 #define CB_AUTO_WIDTH 4 #define FL_COLUMNS 6 @@ -55,7 +54,6 @@ #define WN_BSP 41 -#define LB_REFERENCE 42 #define CB_REGISTER 43 #define FL_REGISTER 44 #define FT_REFERENCE 45 @@ -67,7 +65,6 @@ #define FT_WIDTH 49 #define FT_DIST 50 #define VS_DEFAULTS 51 -#define IL_PRE_COLS 52 #define FT_APPLY_TO 53 #define LB_APPLY_TO 54 diff --git a/sw/source/ui/frmdlg/cption.hrc b/sw/source/ui/frmdlg/cption.hrc index 1487171f0c01..8b8c7d19d018 100644 --- a/sw/source/ui/frmdlg/cption.hrc +++ b/sw/source/ui/frmdlg/cption.hrc @@ -30,7 +30,6 @@ #define BTN_OK 1 #define BTN_CANCEL 2 -#define TXT_SAMPLE 3 #define TXT_CATEGORY 4 #define BOX_CATEGORY 5 #define TXT_FORMAT 6 @@ -48,8 +47,6 @@ #define FT_SEPARATOR 18 #define ED_SEPARATOR 19 #define CB_COPY_ATTR 20 -#define FT_OBJECT_NAME 21 -#define ED_OBJECT_NAME 22 #define BTN_AUTOCAPTION 23 #define TXT_SEP 24 #define EDT_SEP 25 diff --git a/sw/source/ui/frmdlg/frmpage.hrc b/sw/source/ui/frmdlg/frmpage.hrc index ed58d821f032..f72c60a172ba 100644 --- a/sw/source/ui/frmdlg/frmpage.hrc +++ b/sw/source/ui/frmdlg/frmpage.hrc @@ -33,7 +33,6 @@ #define RB_ANCHOR_AS_CHAR 4 #define RB_ANCHOR_FRAME 5 #define WN_BSP 21 -#define FT_BSP 22 // SwFrmPage @@ -59,7 +58,6 @@ #define LB_VERT_RELATION 4 #define FL_POSITION 43 #define BT_REALSIZE 44 -#define BT_MANUAL 45 #define CB_AUTOWIDTH 46 #define FT_WIDTH_AUTO 47 #define FT_HEIGHT_AUTO 48 diff --git a/sw/source/ui/frmdlg/pattern.hrc b/sw/source/ui/frmdlg/pattern.hrc index f9eabe9bb3c5..f3c878dc84d3 100644 --- a/sw/source/ui/frmdlg/pattern.hrc +++ b/sw/source/ui/frmdlg/pattern.hrc @@ -25,21 +25,9 @@ * ************************************************************************/ -#define BRUSH_LBL 1 -#define BRUSH_LBOX 2 - #define COLOR_LBL 3 #define COLOR_LBOX 4 -#define FILLIN_COLOR_LBL 5 -#define FILLIN_COLOR_LBOX 6 - -#define NO_PATTERN_BOX 7 - -#define PATTERN_FRM 8 -#define EXAMPLE_FRM 9 -#define EXAMPLE_WIN 10 - #define OK_BTN 11 #define CANCEL_BTN 12 #define RESET_BTN 13 diff --git a/sw/source/ui/inc/app.hrc b/sw/source/ui/inc/app.hrc index 95356a5858c4..32a106c9e83a 100644 --- a/sw/source/ui/inc/app.hrc +++ b/sw/source/ui/inc/app.hrc @@ -30,9 +30,6 @@ #include "rcid.hrc" -// Document-Icon -#define RC_DOC_ICON (RC_APP_BEGIN + 2) - // Should the clipboard for other applications... #define MSG_CLPBRD_CLEAR (RC_APP_BEGIN + 3) @@ -57,24 +54,6 @@ #define BMP_STYLES_FAMILY_NUM (RC_APP_BEGIN + 17) // Strings for regions in the configuration -#define STR_GRP_FILE (RC_APP_BEGIN + 56) -#define STR_GRP_EDIT (RC_APP_BEGIN + 57) -#define STR_GRP_TRAVELLING (RC_APP_BEGIN + 58) -#define STR_GRP_VIEW (RC_APP_BEGIN + 59) -#define STR_GRP_INSERT (RC_APP_BEGIN + 60) -#define STR_GRP_FORMAT (RC_APP_BEGIN + 61) -#define STR_GRP_STYLE (RC_APP_BEGIN + 62) -#define STR_GRP_TEXT (RC_APP_BEGIN + 63) -#define STR_GRP_FRAME (RC_APP_BEGIN + 64) -#define STR_GRP_GRAPHIC (RC_APP_BEGIN + 65) -#define STR_GRP_TABLE (RC_APP_BEGIN + 66) -#define STR_GRP_TOOLS (RC_APP_BEGIN + 67) -#define STR_GRP_NUMBERING (RC_APP_BEGIN + 68) -#define STR_GRP_WINDOW (RC_APP_BEGIN + 69) -#define STR_GRP_MISC (RC_APP_BEGIN + 70) -#define STR_GRP_MACRO (RC_APP_BEGIN + 71) -#define RES_EXT_HELP_STRING (RC_APP_BEGIN + 72) -#define RES_STD_HELP_STRING (RC_APP_BEGIN + 73) #define STR_PAGEOFFSET (RC_APP_BEGIN + 74) #define STR_PAGEBREAK (RC_APP_BEGIN + 75) #define STR_REDLINE_UNKNOWN_AUTHOR (RC_APP_BEGIN + 76) @@ -89,7 +68,6 @@ #define PB_MERGE_CANCEL 3 #define IMG_MERGE 4 -#define SID_TOGGLETOOLBOX (RC_APP_BEGIN + 89) #define STR_ENV_TITLE (RC_APP_BEGIN + 91) #define STR_LAB_TITLE (RC_APP_BEGIN + 92) diff --git a/sw/source/ui/inc/frmui.hrc b/sw/source/ui/inc/frmui.hrc index 4c71fff51b40..5d516732053c 100644 --- a/sw/source/ui/inc/frmui.hrc +++ b/sw/source/ui/inc/frmui.hrc @@ -31,43 +31,24 @@ #include "rcid.hrc" #include "globals.hrc" -#define DLG_FRMOPT (RC_FRMDLG_BEGIN + 1) -#define DLG_PATTERN (RC_FRMDLG_BEGIN + 2) #define DLG_BORDER (RC_FRMDLG_BEGIN + 3) #define DLG_COLUMN (RC_FRMDLG_BEGIN + 4) -#define DLG_FOOTNOTE (RC_FRMDLG_BEGIN + 5) -#define DLG_INSERT_FOOTNOTE (RC_FRMDLG_BEGIN + 6) -#define DLG_VIEW_HEADER (RC_FRMDLG_BEGIN + 8) -#define DLG_FORMAT_COLUMN (RC_FRMDLG_BEGIN + 10) #define DLG_CAPTION (RC_FRMDLG_BEGIN + 11) #define DLG_SEQUENCE_OPTION (RC_FRMDLG_BEGIN + 12) #define TP_FOOTNOTEOPTION (RC_FRMDLG_BEGIN + 12) #define TP_ENDNOTEOPTION (RC_FRMDLG_BEGIN + 13) -#define STR_PATTERN_BRD (RC_FRMDLG_BEGIN + 13) -#define STR_SHPATTERN (RC_FRMDLG_BEGIN + 14) -#define STR_LNPATTERN (RC_FRMDLG_BEGIN + 15) #define STR_FRMUI_BORDER (RC_FRMDLG_BEGIN + 16) #define STR_FRMUI_PATTERN (RC_FRMDLG_BEGIN + 17) #define STR_FRMUI_WRAP (RC_FRMDLG_BEGIN + 18) -#define BMP_PORTRAIT (RC_FRMDLG_BEGIN + 16) -#define BMP_LANDSCAPE (RC_FRMDLG_BEGIN + 17) #define BMP_BEGIN (RC_FRMDLG_BEGIN + 18) -#define BMP_WRAP (BMP_BEGIN) -#define BMP_LEFT (BMP_BEGIN+1) -#define BMP_RIGHT (BMP_BEGIN+2) -#define BMP_OPAQUE (BMP_BEGIN+3) -#define BMP_OPAQUET (BMP_BEGIN+4) #define BMP_NOWRAP (BMP_BEGIN+5) #define BMP_END (BMP_NOWRAP) -#define MN_OPTION (BMP_END + 1) -#define MN_COLUMN (BMP_END + 2) -#define MN_PAPERSZ (BMP_END + 3) #define MN_BACKGROUND (BMP_END + 4) #define STR_BACKGROUND (BMP_END + 6) @@ -76,50 +57,11 @@ #define STR_FRMDLG_BEGIN (MN_FOOTNOTE + 1) #define STR_TOPPRT (STR_FRMDLG_BEGIN + 1) -//#define STR_FROMBOTTOM (STR_FRMDLG_BEGIN + 2) -//#define STR_FROMTOP (STR_FRMDLG_BEGIN + 3) -//#define STR_BELOW (STR_FRMDLG_BEGIN + 4) -/* -#define STR_LEFT (STR_FRMDLG_BEGIN + 5) -#define STR_RIGHT (STR_FRMDLG_BEGIN + 6) -#define STR_FROMLEFT (STR_FRMDLG_BEGIN + 7) -#define STR_MIR_LEFT (STR_FRMDLG_BEGIN + 8) -#define STR_MIR_RIGHT (STR_FRMDLG_BEGIN + 9) -#define STR_MIR_FROMLEFT (STR_FRMDLG_BEGIN + 10) -*/ #define STR_BORDER (STR_FRMDLG_BEGIN + 16) #define STR_COLUMN (STR_FRMDLG_BEGIN + 17) -#define STR_PARA (STR_FRMDLG_BEGIN + 18) #define STR_CHAR (STR_FRMDLG_BEGIN + 19) -/* -#define STR_FRAME (STR_FRMDLG_BEGIN + 20) -#define STR_PRTAREA (STR_FRMDLG_BEGIN + 21) -#define STR_REL_PG_LEFT (STR_FRMDLG_BEGIN + 22) -#define STR_REL_PG_RIGHT (STR_FRMDLG_BEGIN + 23) -#define STR_REL_FRM_LEFT (STR_FRMDLG_BEGIN + 24) -#define STR_REL_FRM_RIGHT (STR_FRMDLG_BEGIN + 25) -#define STR_MIR_REL_PG_LEFT (STR_FRMDLG_BEGIN + 26) -#define STR_MIR_REL_PG_RIGHT (STR_FRMDLG_BEGIN + 27) -#define STR_MIR_REL_FRM_LEFT (STR_FRMDLG_BEGIN + 28) -#define STR_MIR_REL_FRM_RIGHT (STR_FRMDLG_BEGIN + 29) -#define STR_REL_PG_FRAME (STR_FRMDLG_BEGIN + 30) -#define STR_REL_PG_PRTAREA (STR_FRMDLG_BEGIN + 31) -#define STR_REL_BASE (STR_FRMDLG_BEGIN + 32) -#define STR_REL_CHAR (STR_FRMDLG_BEGIN + 33) -#define STR_REL_ROW (STR_FRMDLG_BEGIN + 34) -#define STR_REL_BORDER (STR_FRMDLG_BEGIN + 35) -#define STR_REL_PRTAREA (STR_FRMDLG_BEGIN + 36) -#define STR_FLY_REL_PG_LEFT (STR_FRMDLG_BEGIN + 37) -#define STR_FLY_REL_PG_RIGHT (STR_FRMDLG_BEGIN + 38) -#define STR_FLY_REL_PG_FRAME (STR_FRMDLG_BEGIN + 39) -#define STR_FLY_REL_PG_PRTAREA (STR_FRMDLG_BEGIN + 40) -#define STR_FLY_MIR_REL_PG_LEFT (STR_FRMDLG_BEGIN + 41) -#define STR_FLY_MIR_REL_PG_RIGHT (STR_FRMDLG_BEGIN + 42) -#define STR_FLY_MIR_REL_PG_FRAME (STR_FRMDLG_BEGIN + 43) -#define STR_FLY_MIR_REL_PG_PRTAREA (STR_FRMDLG_BEGIN + 44)*/ - #define STR_OLE_INSERT (STR_FRMDLG_BEGIN + 45) #define STR_OLE_EDIT (STR_FRMDLG_BEGIN + 46) #define STR_COLL_HEADER (STR_FRMDLG_BEGIN + 47) diff --git a/sw/source/ui/inc/globdoc.hrc b/sw/source/ui/inc/globdoc.hrc index cf06e4de05ca..06976a205184 100644 --- a/sw/source/ui/inc/globdoc.hrc +++ b/sw/source/ui/inc/globdoc.hrc @@ -35,21 +35,7 @@ #define STR_WRITER_GLOBALDOC_FULLTYPE_50 (RC_GLOBDOC_BEGIN + 4) #define STR_WRITER_GLOBALDOC_FULLTYPE (RC_GLOBDOC_BEGIN + 5) -#define MN_GLOBALFILE (RC_GLOBDOC_BEGIN + 30) -#define MN_GLOBALEDIT (RC_GLOBDOC_BEGIN + 31) -#define MN_GLOBALVIEW (RC_GLOBDOC_BEGIN + 32) -#define MN_GLOBALINS (RC_GLOBDOC_BEGIN + 33) -#define MN_GLOBALFORMAT (RC_GLOBDOC_BEGIN + 34) -#define MN_GLOBALEXTRA (RC_GLOBDOC_BEGIN + 35) -#define MN_GLOBALWIN (RC_GLOBDOC_BEGIN + 36) -#define MN_GLOBALFILE_PORT (RC_GLOBDOC_BEGIN + 47) -#define MN_GLOBALEDIT_PORT (RC_GLOBDOC_BEGIN + 48) -#define MN_GLOBALVIEW_PORT (RC_GLOBDOC_BEGIN + 49) -#define MN_GLOBALINS_PORT (RC_GLOBDOC_BEGIN + 50) -#define MN_GLOBALFORMAT_PORT (RC_GLOBDOC_BEGIN + 51) -#define MN_GLOBALEXTRA_PORT (RC_GLOBDOC_BEGIN + 52) -#define MN_GLOBALWIN_PORT (RC_GLOBDOC_BEGIN + 53) #define MN_GLOBAL_TEXT_POPUPMENU (RC_GLOBDOC_BEGIN + 63) // ------------------------------------------------------------------------ diff --git a/sw/source/ui/inc/misc.hrc b/sw/source/ui/inc/misc.hrc index 39f33d39d677..059d02d975d8 100644 --- a/sw/source/ui/inc/misc.hrc +++ b/sw/source/ui/inc/misc.hrc @@ -30,32 +30,20 @@ #include "rcid.hrc" -#define DLG_QUERY_DELETE (RC_MISC_BEGIN + 2) -#define DLG_MASTERDOC_PAGE (RC_MISC_BEGIN + 3) -#define DLG_QUERY_ADD (RC_MISC_BEGIN + 4) #define STR_GLOSSARY_BIB_DLG (RC_MISC_BEGIN + 5) -#define STR_DOCUMENT_BIB_DLG (RC_MISC_BEGIN + 6) -#define WIN_GLOBAL_DOC (RC_MISC_BEGIN + 7) -#define DLG_GLOBAL_DOC_OPTION (RC_MISC_BEGIN + 8) -#define DLG_NUMBERING (RC_MISC_BEGIN + 9) #define DLG_ZOOM (RC_MISC_BEGIN + 10) #define DLG_GLOSSARY (RC_MISC_BEGIN + 11) #define DLG_INS_FOOTNOTE (RC_MISC_BEGIN + 12) #define DLG_DOC_FOOTNOTE (RC_MISC_BEGIN + 13) -#define DLG_PG_FOOTNOTE (RC_MISC_BEGIN + 14) -#define DLG_NUMBERING_OUTLINE (RC_MISC_BEGIN + 15) #define DLG_BIB_BASE (RC_MISC_BEGIN + 16) #define DLG_INSERT_BOOKMARK (RC_MISC_BEGIN + 17) #define DLG_NUM_NAMES (RC_MISC_BEGIN + 18) #define DLG_SORTING (RC_MISC_BEGIN + 19) #define DLG_CHARMAP (RC_MISC_BEGIN + 20) -#define DLG_AUTOCORR (RC_MISC_BEGIN + 23) -#define DLG_AUTOFMT_OPT (RC_MISC_BEGIN + 24) #define DLG_RENAME_GLOS (RC_MISC_BEGIN + 25) -#define DLG_AUTOFMT_TAB (RC_MISC_BEGIN + 26) #define DLG_PRCNT_SET (RC_MISC_BEGIN + 27) #define DLG_INSERT_RULER (RC_MISC_BEGIN + 28) #define DLG_REDLINE_ACCEPT (RC_MISC_BEGIN + 29) @@ -70,8 +58,6 @@ #define STR_QUERY_DELETE_GROUP2 (RC_MISC_BEGIN + 33) #define MSG_NO_GLOSSARIES (RC_MISC_BEGIN + 34) -#define MSG_BLOCK_CREATE_ERR (RC_MISC_BEGIN + 40) -#define MSG_BLOCK_DELETE_ERR (RC_MISC_BEGIN + 41) #define MSG_SRTERR (RC_MISC_BEGIN + 42) #define STR_GLOSSARY (RC_MISC_BEGIN + 43) @@ -89,10 +75,7 @@ #define STR_FULLNUMS_7 (STR_FULLNUMS_START + 6) #define STR_FULLNUMS_8 (STR_FULLNUMS_START + 7) -#define STR_BULLET_THEME (RC_MISC_BEGIN + 55) -#define MSG_NO_BULLETS (RC_MISC_BEGIN + 56) -#define STR_NUMRULE_UNKNOWN (RC_MISC_BEGIN + 60) #define MN_REDLINE_POPUP (RC_MISC_BEGIN + 61) #define STR_REMOVE_WARNING (RC_MISC_BEGIN + 62) #define STRRES_NUMTYPES (RC_MISC_BEGIN + 63) diff --git a/sw/source/ui/inc/popup.hrc b/sw/source/ui/inc/popup.hrc index 7edb6dadeecc..7bdd5f503e8c 100644 --- a/sw/source/ui/inc/popup.hrc +++ b/sw/source/ui/inc/popup.hrc @@ -41,12 +41,8 @@ #define MN_SRCVIEW_POPUPMENU (RC_POPUPS_BEGIN + 8) #define MN_DRAWFORM_POPUPMENU (RC_POPUPS_BEGIN + 9) #define MN_MEDIA_POPUPMENU (RC_POPUPS_BEGIN + 10) -#define MN_LANGUAGE_FOR_TEXT (RC_POPUPS_BEGIN + 11) -#define MN_LANGUAGE_FOR_PARAGRAPH (RC_POPUPS_BEGIN + 12) -#define MN_LANGUAGE_FOR_DOCUMENT (RC_POPUPS_BEGIN + 13) #define MN_ANNOTATION_POPUPMENU (RC_POPUPS_BEGIN + 14) #define MN_ANNOTATION_BUTTON (RC_POPUPS_BEGIN + 15) -#define MN_REDCOMMENT_POPUPMENU (RC_POPUPS_BEGIN + 16) #define MN_REDCOMMENT_BUTTON (RC_POPUPS_BEGIN + 17) #define MN_HEADERFOOTER_BUTTON (RC_POPUPS_BEGIN + 18) #define MN_PAGEBREAK_BUTTON (RC_POPUPS_BEGIN + 19) diff --git a/sw/source/ui/inc/ribbar.hrc b/sw/source/ui/inc/ribbar.hrc index a2788ced07b8..276efa648d9d 100644 --- a/sw/source/ui/inc/ribbar.hrc +++ b/sw/source/ui/inc/ribbar.hrc @@ -36,30 +36,14 @@ #define MN_FORM4 4 #define MN_FORM5 5 -#define WIN_RIBBAR RC_RIBBAR_BEGIN - #define CB_FORMAT (RC_RIBBAR_BEGIN +1) -#define CB_FONT (RC_RIBBAR_BEGIN +2) #define CB_SIZE (RC_RIBBAR_BEGIN +3) #define PB_FORMULA_OK (RC_RIBBAR_BEGIN +4) #define PB_FORMULA_CANCEL (RC_RIBBAR_BEGIN +5) -#define BMP_OK PB_FORMULA_OK -#define BMP_CANCEL PB_FORMULA_CANCEL #define RID_TBX_FORMULA (RC_RIBBAR_BEGIN +6) #define FT_POS (RC_RIBBAR_BEGIN +7) -#define BT_FORMULA (RC_RIBBAR_BEGIN +8) #define STR_TBL_FORMULA (RC_RIBBAR_BEGIN +9) -#define STR_BACKGROUND_PATTERN (RC_RIBBAR_BEGIN + 10) -#define STR_BACKGROUND_COLOR (RC_RIBBAR_BEGIN + 11) -#define STR_BORDER_COLOR (RC_RIBBAR_BEGIN + 12) -#define STR_BORDER_STYLE (RC_RIBBAR_BEGIN + 13) -#define STR_BORDER_LINE (RC_RIBBAR_BEGIN + 14) -#define STR_TEXT_COLOR (RC_RIBBAR_BEGIN + 15) -#define STR_NUMLIST (RC_RIBBAR_BEGIN + 16) - -#define STR_HELP_TOOLBOX_TOGGLE (RC_RIBBAR_BEGIN + 17) - #define RID_DRAW_WIN (RC_RIBBAR_BEGIN + 18) #define RID_CNTRLR_WIN (RC_RIBBAR_BEGIN + 19) #define RID_ALIGNMENT_WIN (RC_RIBBAR_BEGIN + 20) @@ -67,7 +51,6 @@ //Resourcen fuer Inputwin (Rechenleiste) #define MN_CALC_POPUP (RC_RIBBAR_BEGIN + 22) -#define MN_NUMNAMES_POPUP (RC_RIBBAR_BEGIN + 23) #define RID_INSERT_FIELD_CTRL (RC_RIBBAR_BEGIN + 26) #define RID_SCROLL_NAVIGATION_WIN (RC_RIBBAR_BEGIN + 30) #define RID_PVIEW_ZOOM_LB (RC_RIBBAR_BEGIN + 31) diff --git a/sw/source/ui/inc/utlui.hrc b/sw/source/ui/inc/utlui.hrc index c5b2d0255850..7e97fb6dc4dd 100644 --- a/sw/source/ui/inc/utlui.hrc +++ b/sw/source/ui/inc/utlui.hrc @@ -150,7 +150,6 @@ #define RES_FRMEX_MENU (STR_AUTH_FIELD_END + 1) #define DLG_NAVIGATION_PI (RC_UTLUI_BEGIN + 1) -#define DLG_ADDR_PI (RC_UTLUI_BEGIN + 2) #define DLG_GLOSSARY_DECIDE_DLG (RC_UTLUI_BEGIN + 3) #define IMG_NAVI_ENTRYBMP (RC_UTLUI_BEGIN + 4) diff --git a/sw/source/ui/inc/web.hrc b/sw/source/ui/inc/web.hrc index e9e446d62cdb..f77386cb285d 100644 --- a/sw/source/ui/inc/web.hrc +++ b/sw/source/ui/inc/web.hrc @@ -30,7 +30,6 @@ #include "rcid.hrc" -#define RC_WEB_ICON (RC_WEB_BEGIN + 1) #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) @@ -43,29 +42,9 @@ #define RID_WEBOLE_TOOLBOX (RC_WEB_BEGIN + 11) #define STR_WRITER_WEBDOC_FULLTYPE (RC_WEB_BEGIN + 12) - -#define MN_WEBFILE (RC_WEB_BEGIN + 30) -#define MN_WEBEDIT (RC_WEB_BEGIN + 31) -#define MN_WEBVIEW (RC_WEB_BEGIN + 32) -#define MN_WEBINS (RC_WEB_BEGIN + 33) -#define MN_WEBFORMAT (RC_WEB_BEGIN + 34) -#define MN_WEBEXTRA (RC_WEB_BEGIN + 35) -#define MN_WEBWIN (RC_WEB_BEGIN + 36) - -#define MN_WEB_TEXT_POPUPMENU (RC_WEB_BEGIN + 46) - -#define MN_WEBFILE_PORT (RC_WEB_BEGIN + 47) -#define MN_WEBEDIT_PORT (RC_WEB_BEGIN + 48) -#define MN_WEBVIEW_PORT (RC_WEB_BEGIN + 49) -#define MN_WEBINS_PORT (RC_WEB_BEGIN + 50) -#define MN_WEBFORMAT_PORT (RC_WEB_BEGIN + 51) -#define MN_WEBEXTRA_PORT (RC_WEB_BEGIN + 52) -#define MN_WEBWIN_PORT (RC_WEB_BEGIN + 53) - // ------------------------------------------------------------------------ -#define WEB_ACT_END MN_WEBWIN_PORT - +#define WEB_ACT_END STR_WRITER_WEBDOC_FULLTYPE #if WEB_ACT_END > RC_WEB_END #error Resource-Id Ueberlauf in #file, #line diff --git a/sw/source/ui/index/cnttab.hrc b/sw/source/ui/index/cnttab.hrc index b6170bf53176..9bde0d94571d 100644 --- a/sw/source/ui/index/cnttab.hrc +++ b/sw/source/ui/index/cnttab.hrc @@ -24,57 +24,24 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#define CB_MARKS 4 -#define CB_OUTLN 5 #define FT_LEVEL 6 -#define ED_LEVEL 7 -#define FL_CREATE 8 -#define ED_BSP 11 -#define FL_BSP 12 -#define BT_OUTLN 13 #define FL_TITLE 14 #define ED_TITLE 15 #define BT_HELP 16 #define ST_AUTHTYPE 17 #define LB_ENTRY 20 -#define FT_NUM 21 #define ED_ENTRY 22 -#define BT_ENTRY_NUMBER 23 -#define BT_ENTRY_TEXT 24 -#define BT_TAB 25 #define BT_STD 26 -#define BT_PAGE 27 #define FL_ENTRY 28 -//#define FT_LEVEL 28 #define LB_LEVEL 29 #define FT_TEMPLATE 30 #define LB_PARALAY 31 #define BT_ASSIGN 32 #define FL_FORMAT 33 -#define BT_ENTRY 34 -//#define BT_EDIT 34 -#define BT_JUMP 35 -#define CB_RECALC_TABS 36 -#define CB_FIRST_TAB_POS 37 -#define MF_FIRST_TAB_POS 38 -#define CB_REL_TO_TEXT 39 #define BT_EDIT_STYLE 40 -#define CB_SAME 41 -#define CB_FF 42 #define CB_CASE 43 -#define CB_SEC 44 -#define CB_ALPHA 45 -#define FL_OPT 46 -#define CB_MAKRS 47 -#define DLB_TOD 48 -#define CB_TEMPL 49 -#define DLB_LAYOUT 50 #define CB_OBJECT 51 -#define DLB_OBJECT 52 -#define FL_SOURCE 53 -#define CB_USER_MARKS 54 -#define BT_ALL_LEVEL 55 #define FT_MAIN_ENTRY_STYLE 56 #define LB_MAIN_ENTRY_STYLE 57 @@ -128,14 +95,10 @@ #define CB_FILLCHAR 46 #define FT_CHAPTERENTRY 47 #define LB_CHAPTERENTRY 48 -#define FT_SORTING 49 -#define LB_SORTING 50 #define FT_TABPOS 51 #define MF_TABPOS 52 #define CB_AUTORIGHT 53 #define CB_RELTOSTYLE 54 -#define CB_RECALCTAB 56 -#define CB_NUMSTYLEFROMPDESC 57 #define CB_ALPHADELIM 58 #define CB_COMMASEPARATED 59 @@ -243,17 +206,7 @@ //TabDialog #define WIN_EXAMPLE 1 -#define RES_EXAMPLE_TEXT 2 -#define ST_HEADING_1 4 -#define ST_TEXT_1 5 -#define ST_HEADING_1_1 6 -#define ST_TEXT_1_1 7 -#define ST_HEADING_1_2 8 -#define ST_TEXT_1_2 9 -#define ST_TABLE_LABEL 10 -#define ST_FRAME_LABEL 11 -#define ST_GRAPHIC_LABEL 12 #define ST_USERDEFINEDINDEX 13 #define CB_SHOWEXAMPLE 14 diff --git a/sw/source/ui/lingu/olmenu.hrc b/sw/source/ui/lingu/olmenu.hrc index 73fbac09804f..d43ded4de33a 100644 --- a/sw/source/ui/lingu/olmenu.hrc +++ b/sw/source/ui/lingu/olmenu.hrc @@ -91,7 +91,6 @@ // id range for 'set language for all text' sub menu entries #define MN_SET_LANGUAGE_ALL_TEXT_START 1300 -#define MN_SET_LANGUAGE_ALL_TEXT_END (MN_SET_LANGUAGE_ALL_TEXT_START + MN_MAX_NUM_LANG) #endif diff --git a/sw/source/ui/misc/glossary.hrc b/sw/source/ui/misc/glossary.hrc index dc55c5e9d61a..decb540d31bb 100644 --- a/sw/source/ui/misc/glossary.hrc +++ b/sw/source/ui/misc/glossary.hrc @@ -65,8 +65,6 @@ // Box library text blocks #define FL_EDIT 1 -#define FL_BIB 2 -#define ED_BIB 3 #define PB_NEW 10 #define PB_DELETE 11 diff --git a/sw/source/ui/misc/outline.hrc b/sw/source/ui/misc/outline.hrc index 17dd3194f0bf..bc4e2bb25637 100644 --- a/sw/source/ui/misc/outline.hrc +++ b/sw/source/ui/misc/outline.hrc @@ -24,33 +24,17 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#define RB_1 1 -#define RB_2 2 -#define RB_3 3 -#define RB_4 4 -#define RB_5 5 #define FT_1 6 #define FT_2 7 #define FT_3 8 #define FT_4 9 #define FT_5 10 -#define FI_1 11 -#define FI_2 12 -#define FI_3 13 -#define FI_4 14 -#define FI_5 15 -//#define FL_LEVEL 16 #define FT_COLL 20 #define LB_COLL 21 #define FT_NUMBER 22 #define LB_NUMBER 23 #define FT_DELIM 24 -#define FT_DELIM_BEVOR 25 -#define FT_DELIM_AFTER 26 -#define ED_DELIM_BEVOR 27 -#define ED_DELIM_AFTER 28 -#define CB_COMPLETE 29 #define FL_NUMBER 30 #define LB_ALIGN 31 @@ -63,8 +47,6 @@ #define BT_OK 100 #define BT_CANCEL 101 #define BT_HELP 102 -#define BT_FORM 103 -#define BT_RESET 104 #define FL_FORM 105 #define LB_FORM 106 #define ED_FORM 107 diff --git a/sw/source/ui/misc/pggrid.hrc b/sw/source/ui/misc/pggrid.hrc index e736e5040dbb..9e700d10d315 100644 --- a/sw/source/ui/misc/pggrid.hrc +++ b/sw/source/ui/misc/pggrid.hrc @@ -33,12 +33,10 @@ #define FL_LAYOUT 6 #define FT_LINESPERPAGE 7 #define NF_LINESPERPAGE 8 -#define FT_LINESPERPAGEHINT 9 #define FT_TEXTSIZE 10 #define MF_TEXTSIZE 11 #define FT_CHARSPERLINE 12 #define NF_CHARSPERLINE 13 -#define FT_CHARSPERLINEHINT 14 #define FT_RUBYSIZE 15 #define MF_RUBYSIZE 16 #define CB_RUBYBELOW 17 diff --git a/sw/source/ui/ribbar/tblctrl.cxx b/sw/source/ui/ribbar/tblctrl.cxx index f004dc5dc2d2..99e4d6b892b3 100644 --- a/sw/source/ui/ribbar/tblctrl.cxx +++ b/sw/source/ui/ribbar/tblctrl.cxx @@ -34,8 +34,6 @@ #include "cmdid.h" #include "swtypes.hxx" #include "tblctrl.hxx" -#include "tblctrl.hrc" - SFX_IMPL_TOOLBOX_CONTROL( SwTableOptimizeCtrl, SfxUInt16Item ); diff --git a/sw/source/ui/ribbar/tblctrl.hrc b/sw/source/ui/ribbar/tblctrl.hrc deleted file mode 100644 index 7cfa32d7bb5d..000000000000 --- a/sw/source/ui/ribbar/tblctrl.hrc +++ /dev/null @@ -1,35 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef _TBLCTRL_HRC -#define _TBLCTRL_HRC -#include "ribbar.hrc" - -#define TBX_OPTIMIZE_TABLE 1 - -#endif - - diff --git a/sw/source/ui/ribbar/workctrl.hrc b/sw/source/ui/ribbar/workctrl.hrc index 51ac45b2ae87..4b28eae5d011 100644 --- a/sw/source/ui/ribbar/workctrl.hrc +++ b/sw/source/ui/ribbar/workctrl.hrc @@ -29,9 +29,6 @@ #include "ribbar.hrc" #define TBX_INSERT 1 -#define TBX_OBJ_INSERT 2 -#define TBX_FIELD_INSERT 3 -#define TBX_NAVIGATION 4 #define IL_VALUES 5 #define IMG_BTN 6 #define ST_QUICK 7 diff --git a/sw/source/ui/smartmenu/stmenu.hrc b/sw/source/ui/smartmenu/stmenu.hrc index 56afc5752f79..20f33949f3cf 100644 --- a/sw/source/ui/smartmenu/stmenu.hrc +++ b/sw/source/ui/smartmenu/stmenu.hrc @@ -32,7 +32,6 @@ #define MN_SMARTTAG_POPUP (RC_SMARTTAG_BEGIN + 1) -#define MN_SMARTTAG 104 #define MN_SMARTTAG_OPTIONS 105 #define MN_ST_INSERT_START 500 diff --git a/sw/source/ui/table/tabledlg.hrc b/sw/source/ui/table/tabledlg.hrc index 3933cd3fc37f..9665b0e48d41 100644 --- a/sw/source/ui/table/tabledlg.hrc +++ b/sw/source/ui/table/tabledlg.hrc @@ -45,18 +45,11 @@ #define ED_BOTTOM_DIST 23 #define FL_DIST 24 #define FT_WIDTH 25 -#define FT_SCOL 30 -#define DLB_SCOL 31 #define FT_POS 32 -#define DLB_SPOS 33 -#define FT_SSZ 34 -#define ED_SSZ 36 -#define FL_SHADE 37 #define CB_HEADLINE 40 #define FT_REPEAT_HEADER 40 #define NF_REPEAT_HEADER 40 #define WIN_REPEAT_HEADER 40 -#define FL_HEADLINE 41 #define FL_PROPERTIES 42 #define FT_TEXTORIENTATION 43 #define LB_TEXTORIENTATION 44 diff --git a/sw/source/ui/uiview/pview.hrc b/sw/source/ui/uiview/pview.hrc index 3724789431ed..de2e7a83b075 100644 --- a/sw/source/ui/uiview/pview.hrc +++ b/sw/source/ui/uiview/pview.hrc @@ -42,12 +42,9 @@ #define PVIEW_MAX_COL 20 //Dialog Druckoptionen -#define FL_ROWCOL 1 #define FT_ROWS 2 #define NF_ROWS 3 -#define FT_COLS 4 #define NF_COLS 5 -#define FL_MARGINS 6 #define FL_DISTANCE 7 #define FL_ORIENTATION 8 @@ -58,13 +55,9 @@ #define MF_LMARGIN 13 #define FT_RMARGIN 14 #define MF_RMARGIN 15 -#define FT_TMARGIN 16 #define MF_TMARGIN 17 -#define FT_BMARGIN 18 #define MF_BMARGIN 19 -#define FT_HMARGIN 20 #define MF_HMARGIN 21 -#define FT_VMARGIN 22 #define MF_VMARGIN 23 #define PB_STANDARD 24 diff --git a/sw/source/ui/utlui/navipi.hrc b/sw/source/ui/utlui/navipi.hrc index bba57cf53d6b..58074783feb0 100644 --- a/sw/source/ui/utlui/navipi.hrc +++ b/sw/source/ui/utlui/navipi.hrc @@ -24,19 +24,9 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#define TB_1 1 -#define TB_2 2 -#define TB_3 3 -#define TB_4 4 -#define BT_UP 5 -#define BT_DOWN 6 #define IL_CONTENT 7 #define FT_PAGE 10 #define ED_PAGE 11 -#define LB_SELECT 22 -#define TL_SELECT 23 -#define TB_PAGE_TEXT 41 -#define TB_PAGE_COUNT 42 #define TB_CONTENT 50 #define TL_CONTENT 51 #define LB_DOCS 53 diff --git a/sw/source/ui/wrtsh/wrtsh.hrc b/sw/source/ui/wrtsh/wrtsh.hrc index a82a4c3c1b48..1fb06902ba2a 100644 --- a/sw/source/ui/wrtsh/wrtsh.hrc +++ b/sw/source/ui/wrtsh/wrtsh.hrc @@ -29,7 +29,6 @@ #include "rcid.hrc" -#define DLG_GOTO (RC_WRTSH_BEGIN + 1) #define STR_DDEERROR_APP1 (RC_WRTSH_BEGIN + 2) |