diff options
| author | Joseph Powers <jpowers27@cox.net> | 2010-11-21 05:22:24 -0800 |
|---|---|---|
| committer | Joseph Powers <jpowers27@cox.net> | 2010-11-21 05:22:52 -0800 |
| commit | ee67ae67d8c68f8c5a7d9a8870c4d0357f1d1f78 (patch) | |
| tree | c407478a02d6a1eaeeef9a9f002795e9c5e2e174 /sc/source | |
| parent | 211d74a272d422d7e2469dcc84e47113334859f6 (diff) | |
hrc cleanup
Diffstat (limited to 'sc/source')
36 files changed, 17 insertions, 128 deletions
diff --git a/sc/source/ui/dbgui/asciiopt.hrc b/sc/source/ui/dbgui/asciiopt.hrc index 7bf6d42d6e2f..6e1c9ae92877 100644 --- a/sc/source/ui/dbgui/asciiopt.hrc +++ b/sc/source/ui/dbgui/asciiopt.hrc @@ -25,7 +25,7 @@ * ************************************************************************/ #include "sc.hrc" -//#define RID_SCDLG_ASCII 256 + #define BTN_OK 1 #define BTN_CANCEL 2 #define BTN_HELP 3 @@ -60,12 +60,3 @@ #define LB_TYPE1 28 #define CTR_TABLEBOX 29 #define STR_TEXTTOCOLUMNS 30 - - - - - - - - - diff --git a/sc/source/ui/dbgui/consdlg.hrc b/sc/source/ui/dbgui/consdlg.hrc index 6f9f6708c388..0e52b94ce052 100644 --- a/sc/source/ui/dbgui/consdlg.hrc +++ b/sc/source/ui/dbgui/consdlg.hrc @@ -58,4 +58,3 @@ #define FL_OPTIONS 60 #define BTN_REFS 61 - diff --git a/sc/source/ui/dbgui/dapitype.hrc b/sc/source/ui/dbgui/dapitype.hrc index efbabe64fa04..6358763d7fd1 100644 --- a/sc/source/ui/dbgui/dapitype.hrc +++ b/sc/source/ui/dbgui/dapitype.hrc @@ -50,4 +50,3 @@ #define CB_OBJECT 21 #define FT_OBJTYPE 22 #define LB_OBJTYPE 23 - diff --git a/sc/source/ui/dbgui/dpgroupdlg.hrc b/sc/source/ui/dbgui/dpgroupdlg.hrc index 5a4797489ddf..27adea32c4e1 100644 --- a/sc/source/ui/dbgui/dpgroupdlg.hrc +++ b/sc/source/ui/dbgui/dpgroupdlg.hrc @@ -61,4 +61,3 @@ #define STR_UNITS 1 #endif - diff --git a/sc/source/ui/dbgui/imoptdlg.hrc b/sc/source/ui/dbgui/imoptdlg.hrc index 5fd9256e8009..6fab4c6db907 100644 --- a/sc/source/ui/dbgui/imoptdlg.hrc +++ b/sc/source/ui/dbgui/imoptdlg.hrc @@ -26,8 +26,6 @@ ************************************************************************/ #include "sc.hrc" -//#define RID_SCDLG_IMPORTOPT 2256 - #define BTN_OK 1 #define BTN_CANCEL 2 #define BTN_HELP 3 @@ -41,4 +39,3 @@ #define FL_FIELDOPT 11 #define CB_FIXEDWIDTH 12 #define CB_SAVESHOWN 13 - diff --git a/sc/source/ui/dbgui/pivot.hrc b/sc/source/ui/dbgui/pivot.hrc index 1a97d4c75b52..12c80a8b8420 100644 --- a/sc/source/ui/dbgui/pivot.hrc +++ b/sc/source/ui/dbgui/pivot.hrc @@ -78,4 +78,3 @@ #define PIVOTSTR_DEV2 9 #define PIVOTSTR_VAR 10 #define PIVOTSTR_VAR2 11 - diff --git a/sc/source/ui/dbgui/pvfundlg.hrc b/sc/source/ui/dbgui/pvfundlg.hrc index c9b6f562a9e1..fdff335fd247 100644 --- a/sc/source/ui/dbgui/pvfundlg.hrc +++ b/sc/source/ui/dbgui/pvfundlg.hrc @@ -27,9 +27,6 @@ #include "sc.hrc" -// RID_SCDLG_DPDATAFIELD - DataPilot Data Field Function -// RID_SCDLG_PIVOTSUBT - DataPilot Page/Row/Column Field Subtotals - #define BTN_OK 1 #define BTN_CANCEL 2 #define BTN_HELP 3 @@ -80,4 +77,3 @@ #define NF_SHOW 1 #define CT_HIDE 1 - diff --git a/sc/source/ui/dbgui/scendlg.hrc b/sc/source/ui/dbgui/scendlg.hrc index 83818773bf5a..8fbf9a2d5b54 100644 --- a/sc/source/ui/dbgui/scendlg.hrc +++ b/sc/source/ui/dbgui/scendlg.hrc @@ -25,7 +25,7 @@ * ************************************************************************/ #include "sc.hrc" -//#define RID_SCDLG_NEWSCENARIO 256 + #define BTN_OK 1 #define BTN_CANCEL 2 #define BTN_HELP 3 diff --git a/sc/source/ui/formdlg/dwfunctr.hrc b/sc/source/ui/formdlg/dwfunctr.hrc index 388fea28b7ca..a53c884583d2 100644 --- a/sc/source/ui/formdlg/dwfunctr.hrc +++ b/sc/source/ui/formdlg/dwfunctr.hrc @@ -31,7 +31,3 @@ #define IMB_INSERT 1 #define FI_FUNCDESC 1 #define FT_SPLIT 2 - - -// ********************************************************************** EOF - diff --git a/sc/source/ui/inc/acredlin.hrc b/sc/source/ui/inc/acredlin.hrc index b21676ee6ae9..54ad490291af 100644 --- a/sc/source/ui/inc/acredlin.hrc +++ b/sc/source/ui/inc/acredlin.hrc @@ -30,17 +30,15 @@ #define BTN_OK 1 #define BTN_CANCEL 2 #define BTN_HELP 5 -// + #define CTR_REDLINING 10 #define TP_FILTER 11 #define TP_VIEW 12 - #define FT_ASSIGN 14 #define ED_ASSIGN 15 #define RB_ASSIGN 16 - #define STR_INSERT_COLS 20 #define STR_INSERT_ROWS 21 #define STR_INSERT_TABS 22 @@ -57,6 +55,7 @@ #define STR_CHILD_CONTENT 33 #define STR_CHILD_ORGCONTENT 34 #define STR_EMPTY 35 + // Bitmaps #define BMP_STR_CLOSE 41 #define BMP_STR_OPEN 42 @@ -70,6 +69,3 @@ #define SC_SORT_AUTHOR 53 #define SC_SORT_DATE 54 #define SC_SORT_COMMENT 55 - -// - diff --git a/sc/source/ui/inc/attrdlg.hrc b/sc/source/ui/inc/attrdlg.hrc index f43c1cb30b86..d048e302f062 100644 --- a/sc/source/ui/inc/attrdlg.hrc +++ b/sc/source/ui/inc/attrdlg.hrc @@ -47,5 +47,3 @@ #define BTN_HIDE_PRINT 6 #define FT_HINT2 7 #define FL_PRINT 8 - - diff --git a/sc/source/ui/inc/condfrmt.hrc b/sc/source/ui/inc/condfrmt.hrc index 099d82b2fa85..223e2f8d3918 100644 --- a/sc/source/ui/inc/condfrmt.hrc +++ b/sc/source/ui/inc/condfrmt.hrc @@ -70,4 +70,3 @@ #define BTN_COND1_NEW 34 #define BTN_COND2_NEW 35 #define BTN_COND3_NEW 36 - diff --git a/sc/source/ui/inc/crnrdlg.hrc b/sc/source/ui/inc/crnrdlg.hrc index 1d27531f9bc1..7467b398d5fb 100644 --- a/sc/source/ui/inc/crnrdlg.hrc +++ b/sc/source/ui/inc/crnrdlg.hrc @@ -32,9 +32,9 @@ #define BTN_ADD 3 #define BTN_REMOVE 4 #define BTN_HELP 5 -// + #define LB_RANGE 11 -// + #define FL_ASSIGN 12 #define ED_AREA 13 #define RB_AREA 14 @@ -43,4 +43,3 @@ #define ED_DATA 17 #define RB_DATA 18 #define FT_DATA_LABEL 19 -// diff --git a/sc/source/ui/inc/dbnamdlg.hrc b/sc/source/ui/inc/dbnamdlg.hrc index fd0205e3bbed..ab3e51cbf1b2 100644 --- a/sc/source/ui/inc/dbnamdlg.hrc +++ b/sc/source/ui/inc/dbnamdlg.hrc @@ -48,4 +48,3 @@ #define STR_MODIFY 31 #define STR_DB_INVALID 32 #define BTN_MORE 33 - diff --git a/sc/source/ui/inc/filter.hrc b/sc/source/ui/inc/filter.hrc index 508c5af9aab5..d973bb15180b 100644 --- a/sc/source/ui/inc/filter.hrc +++ b/sc/source/ui/inc/filter.hrc @@ -79,4 +79,3 @@ #define LB_CRITERIA_AREA 51 #define ED_CRITERIA_AREA 52 #define RB_CRITERIA_AREA 53 - diff --git a/sc/source/ui/inc/highred.hrc b/sc/source/ui/inc/highred.hrc index 426c9ba29ee2..b6a4a1a4023c 100644 --- a/sc/source/ui/inc/highred.hrc +++ b/sc/source/ui/inc/highred.hrc @@ -34,7 +34,6 @@ #define CB_HIGHLIGHT_ACCEPT 6 #define CB_HIGHLIGHT_REJECT 7 -// #define FL_FILTER 10 #define TP_FILTER 11 #define TP_VIEW 12 @@ -44,12 +43,6 @@ #define ED_ASSIGN 15 #define RB_ASSIGN 16 - - - - - - #define STR_INSERT_COLS 20 #define STR_INSERT_ROWS 21 #define STR_INSERT_TABS 22 @@ -65,7 +58,3 @@ #define BMP_STR_OPEN 32 #define BMP_STR_END 33 #define BMP_STR_ERROR 34 - - -// - diff --git a/sc/source/ui/inc/instbdlg.hrc b/sc/source/ui/inc/instbdlg.hrc index 08bff85388dd..dbe7e98e342a 100644 --- a/sc/source/ui/inc/instbdlg.hrc +++ b/sc/source/ui/inc/instbdlg.hrc @@ -27,8 +27,6 @@ #include <sc.hrc> // -> RID_SCDLG_INSERT_TABLE -//#define RID_SCDLG_INSERT_TABLE 300 - #define BTN_OK 1 #define BTN_CANCEL 2 #define BTN_HELP 3 @@ -48,5 +46,3 @@ #define BTN_BROWSE 28 #define CB_LINK 29 #define FT_PATH 30 - - diff --git a/sc/source/ui/inc/linkarea.hrc b/sc/source/ui/inc/linkarea.hrc index bc906fdb14ad..401739474acb 100644 --- a/sc/source/ui/inc/linkarea.hrc +++ b/sc/source/ui/inc/linkarea.hrc @@ -39,4 +39,3 @@ #define BTN_RELOAD 10 #define NF_DELAY 11 #define FT_SECONDS 12 - diff --git a/sc/source/ui/inc/miscdlgs.hrc b/sc/source/ui/inc/miscdlgs.hrc index 00b1658849d6..2873dffbb844 100644 --- a/sc/source/ui/inc/miscdlgs.hrc +++ b/sc/source/ui/inc/miscdlgs.hrc @@ -36,20 +36,6 @@ // -> RID_SCDLG_FILLSERIES // -> RID_SCDLG_AUTOFORMAT -// Fuer den DesignEditor: -/* -#define RID_SCDLG_DELCELL 1256 -#define RID_SCDLG_INSCELL 1257 -#define RID_SCDLG_DELCONT 1258 -#define RID_SCDLG_INSCONT 1259 -#define RID_SCDLG_MOVETAB 1260 -#define RID_SCDLG_STRINPUT 1261 -#define RID_SCDLG_MTRINPUT 1262 -#define RID_SCDLG_SELENTRY 1263 -#define RID_SCDLG_FILLSERIES 1264 -#define RID_SCDLG_AUTOFORMAT 1255 -*/ - // allgemein #define BTN_OK 100 #define BTN_CANCEL 102 @@ -185,4 +171,3 @@ // Tab Bg Color #define TAB_BG_COLOR_CT_BORDER 1 #define TAB_BG_COLOR_SET_BGDCOLOR 2 - diff --git a/sc/source/ui/inc/namedlg.hrc b/sc/source/ui/inc/namedlg.hrc index b2eec6879ec3..0d49fe8c3f60 100644 --- a/sc/source/ui/inc/namedlg.hrc +++ b/sc/source/ui/inc/namedlg.hrc @@ -33,20 +33,19 @@ #define BTN_REMOVE 4 #define BTN_HELP 5 #define BTN_MORE 6 -// + #define FL_NAME 11 #define ED_NAME 12 #define FL_ASSIGN 13 #define ED_ASSIGN 15 #define RB_ASSIGN 16 -// + #define STR_ADD 21 #define STR_MODIFY 22 #define STR_INVALIDSYMBOL 23 -// + #define BTN_CRITERIA 31 #define BTN_PRINTAREA 32 #define BTN_COLHEADER 33 #define BTN_ROWHEADER 34 #define FL_TYPE 35 - diff --git a/sc/source/ui/inc/optdlg.hrc b/sc/source/ui/inc/optdlg.hrc index e03f3e807037..9ac8213cf621 100644 --- a/sc/source/ui/inc/optdlg.hrc +++ b/sc/source/ui/inc/optdlg.hrc @@ -109,19 +109,19 @@ // TP_LCONTENT -#define GB_DISPLAY 20 -#define CB_FORMULA 21 -#define CB_NIL 22 +#define GB_DISPLAY 20 +#define CB_FORMULA 21 +#define CB_NIL 22 #define CB_ANNOT 23 #define CB_VALUE 24 #define CB_ANCHOR 25 #define GB_OBJECT 26 #define FT_OBJGRF 27 #define LB_OBJGRF 28 -#define FT_DIAGRAM 29 -#define LB_DIAGRAM 30 -#define FT_DRAW 31 -#define LB_DRAW 32 +#define FT_DIAGRAM 29 +#define LB_DIAGRAM 30 +#define FT_DRAW 31 +#define LB_DRAW 32 #define CB_CLIP 33 #define GB_ZOOM 34 #define CB_SYNCZOOM 35 @@ -162,9 +162,8 @@ #define FL_SEPARATOR1 71 #define FL_SEPARATOR2 72 #define FL_SEPARATOR 73 -#define FL_H_SEPARATOR 74 -// TP_INPUT +// TP_INPUT #define GB_OPTIONS 70 #define CB_ALIGN 71 #define LB_ALIGN 72 diff --git a/sc/source/ui/inc/optload.hrc b/sc/source/ui/inc/optload.hrc index 992bb8c737e4..c090c64dc136 100644 --- a/sc/source/ui/inc/optload.hrc +++ b/sc/source/ui/inc/optload.hrc @@ -36,5 +36,3 @@ #define CB_AUTO_UPDATE_FIELDS 8 #define CB_AUTO_UPDATE_CHARTS 9 #define FT_UPDATE_LINKS 10 - - diff --git a/sc/source/ui/inc/optsolver.hrc b/sc/source/ui/inc/optsolver.hrc index 9df8eea1d7f4..5ed7b8560060 100644 --- a/sc/source/ui/inc/optsolver.hrc +++ b/sc/source/ui/inc/optsolver.hrc @@ -91,8 +91,5 @@ #define BTN_OK 5 #define BTN_CANCEL 6 -#define IMG_DEL_H 1 - #define STR_INVALIDINPUT 1 #define STR_INVALIDCONDITION 2 - diff --git a/sc/source/ui/inc/simpref.hrc b/sc/source/ui/inc/simpref.hrc index d6fb6d4412eb..c7dbb3ebdea9 100644 --- a/sc/source/ui/inc/simpref.hrc +++ b/sc/source/ui/inc/simpref.hrc @@ -34,4 +34,3 @@ #define FT_ASSIGN 10 #define ED_ASSIGN 11 #define RB_ASSIGN 12 - diff --git a/sc/source/ui/inc/solveroptions.hrc b/sc/source/ui/inc/solveroptions.hrc index e3be150ccd1b..3c543e61a8f5 100644 --- a/sc/source/ui/inc/solveroptions.hrc +++ b/sc/source/ui/inc/solveroptions.hrc @@ -44,4 +44,3 @@ #define NF_VALUE 1 #define ED_VALUE 1 - diff --git a/sc/source/ui/inc/solvrdlg.hrc b/sc/source/ui/inc/solvrdlg.hrc index 7139abd2a5f6..ab40fd3f72a2 100644 --- a/sc/source/ui/inc/solvrdlg.hrc +++ b/sc/source/ui/inc/solvrdlg.hrc @@ -43,4 +43,3 @@ #define STR_INVALIDVAR 2 #define STR_INVALIDFORM 3 #define STR_NOFORMULA 4 - diff --git a/sc/source/ui/inc/sortdlg.hrc b/sc/source/ui/inc/sortdlg.hrc index d079ea560779..04cff7374df5 100644 --- a/sc/source/ui/inc/sortdlg.hrc +++ b/sc/source/ui/inc/sortdlg.hrc @@ -34,13 +34,6 @@ // -> SCSTR_UNDEFINED // -> SCSTR_FIELD -/* -#define RID_SCDLG_SORT 256 -#define RID_SCPAGE_SORT_FIELDS 257 -#define RID_SCPAGE_SORT_OPTIONS 258 -#define RID_SCDLG_SORT_WARNING -*/ - #define TP_FIELDS 1 #define TP_OPTIONS 2 @@ -63,8 +56,6 @@ #define LB_SORT_USER 2 #define LB_OUTAREA 3 #define ED_OUTAREA 4 -//#define FT_AREA_LABEL 5 -//#define FT_AREA 6 #define BTN_SORT_USER 7 #define BTN_CASESENSITIVE 8 #define BTN_LABEL 9 @@ -86,6 +77,3 @@ #define BTN_EXTSORT 3 #define BTN_CURSORT 4 #define BTN_CANCEL 5 - - - diff --git a/sc/source/ui/inc/subtdlg.hrc b/sc/source/ui/inc/subtdlg.hrc index 66c63df48953..b0680ece924b 100644 --- a/sc/source/ui/inc/subtdlg.hrc +++ b/sc/source/ui/inc/subtdlg.hrc @@ -27,12 +27,6 @@ #include "sc.hrc" -/* -#define RID_SCDLG_SUBTOTALS 256 -#define RID_SCPAGE_SUBT_GROUP 256 -#define RID_SCPAGE_SUBT_OPTIONS 257 -*/ - // TabDialog #define BTN_REMOVE 1 #define PAGE_GROUP1 2 @@ -60,5 +54,3 @@ #define BTN_FORMATS 33 #define BTN_USERDEF 34 #define LB_USERDEF 35 - - diff --git a/sc/source/ui/inc/tabopdlg.hrc b/sc/source/ui/inc/tabopdlg.hrc index 5ae127b63e73..633c69881776 100644 --- a/sc/source/ui/inc/tabopdlg.hrc +++ b/sc/source/ui/inc/tabopdlg.hrc @@ -46,5 +46,3 @@ #define STR_WRONGROWCOL 4 #define STR_NOCOLFORMULA 5 #define STR_NOROWFORMULA 6 - - diff --git a/sc/source/ui/inc/tbinsert.hrc b/sc/source/ui/inc/tbinsert.hrc index 44c0d295cfc6..78ff1ca0ec84 100644 --- a/sc/source/ui/inc/tbinsert.hrc +++ b/sc/source/ui/inc/tbinsert.hrc @@ -28,5 +28,3 @@ #define RID_TOOLBOX_INSERT 1 #define RID_TOOLBOX_INSCELLS 2 #define RID_TOOLBOX_INSOBJ 3 - - diff --git a/sc/source/ui/inc/tpcalc.hxx b/sc/source/ui/inc/tpcalc.hxx index 12e12c8750b8..608670181f46 100644 --- a/sc/source/ui/inc/tpcalc.hxx +++ b/sc/source/ui/inc/tpcalc.hxx @@ -71,7 +71,6 @@ private: RadioButton aBtnDateSc10; RadioButton aBtnDate1904; - FixedLine aHSeparatorFL; CheckBox aBtnCase; CheckBox aBtnCalc; CheckBox aBtnMatch; diff --git a/sc/source/ui/inc/validate.hrc b/sc/source/ui/inc/validate.hrc index 45e5dda39c2d..bde827c84e00 100644 --- a/sc/source/ui/inc/validate.hrc +++ b/sc/source/ui/inc/validate.hrc @@ -58,9 +58,7 @@ #define CB_SORTLIST 28 #define EDT_LIST 29 #define FT_SOURCEHINT 30 -//<!--Added by PengYunQuan for Validity Cell Range Picker #define RB_VALIDITY_REF 88 -//-->Added by PengYunQuan for Validity Cell Range Picker /* Position indexes for "Allow" list box. They do not map directly to ScValidationMode and can safely be modified to @@ -85,4 +83,3 @@ #define SC_VALIDDLG_DATA_NOTEQUAL 5 #define SC_VALIDDLG_DATA_BETWEEN 6 #define SC_VALIDDLG_DATA_NOTBETWEEN 7 - diff --git a/sc/source/ui/navipi/navipi.hrc b/sc/source/ui/navipi/navipi.hrc index 97486c940a5f..643435655a26 100644 --- a/sc/source/ui/navipi/navipi.hrc +++ b/sc/source/ui/navipi/navipi.hrc @@ -26,8 +26,6 @@ ************************************************************************/ #include "sc.hrc" -//#define RID_SCDLG_NAVIGATOR 256 - #define FT_ROW 1 #define ED_ROW 2 #define FT_COL 3 diff --git a/sc/source/ui/optdlg/tpcalc.cxx b/sc/source/ui/optdlg/tpcalc.cxx index 7d56184d014e..b99c4777a3b0 100644 --- a/sc/source/ui/optdlg/tpcalc.cxx +++ b/sc/source/ui/optdlg/tpcalc.cxx @@ -83,7 +83,6 @@ ScTpCalcOptions::ScTpCalcOptions( Window* pParent, aBtnDateStd ( this, ScResId( BTN_DATESTD ) ), aBtnDateSc10 ( this, ScResId( BTN_DATESC10 ) ), aBtnDate1904 ( this, ScResId( BTN_DATE1904 ) ), - aHSeparatorFL ( this, ScResId( FL_H_SEPARATOR ) ), aBtnCase ( this, ScResId( BTN_CASE ) ), aBtnCalc ( this, ScResId( BTN_CALC ) ), aBtnMatch ( this, ScResId( BTN_MATCH ) ), diff --git a/sc/source/ui/pagedlg/hfedtdlg.hrc b/sc/source/ui/pagedlg/hfedtdlg.hrc index 59db21f1b93b..f18cc50ce7b4 100644 --- a/sc/source/ui/pagedlg/hfedtdlg.hrc +++ b/sc/source/ui/pagedlg/hfedtdlg.hrc @@ -27,9 +27,6 @@ #include "sc.hrc" -//#define RID_SCPAGE_HFEDIT 256 -//#define RID_SCDLG_HFEDIT 256 - #define FT_LEFT 1 #define FT_CENTER 2 #define FT_RIGHT 3 diff --git a/sc/source/ui/src/optsolver.src b/sc/source/ui/src/optsolver.src index 2fc5cf3a3c54..5ce6fa724475 100644 --- a/sc/source/ui/src/optsolver.src +++ b/sc/source/ui/src/optsolver.src @@ -402,8 +402,6 @@ ModelessDialog RID_SCDLG_OPTSOLVER DefButton = TRUE ; }; - // IMG_DEL_H not used - image is set dynamically - String STR_INVALIDINPUT { Text [ en-US ] = "Invalid input." ; |