Kaydet (Commit) ee67ae67 authored tarafından Joseph Powers's avatar Joseph Powers

hrc cleanup

üst 211d74a2
...@@ -53,7 +53,6 @@ ...@@ -53,7 +53,6 @@
#define TP_LEGEND_POS 900 #define TP_LEGEND_POS 900
#define TP_DATA_DESCR 901 #define TP_DATA_DESCR 901
#define TP_ALIGNMENT 902 #define TP_ALIGNMENT 902
//#define TP_SYMBOL 906
#define TP_LAYOUT 907 #define TP_LAYOUT 907
#define TP_OPTIONS 908 #define TP_OPTIONS 908
#define TP_POLAROPTIONS 909 #define TP_POLAROPTIONS 909
......
...@@ -37,15 +37,6 @@ ...@@ -37,15 +37,6 @@
#define FT_LEGEND_TEXTDIR 3 #define FT_LEGEND_TEXTDIR 3
#define LB_LEGEND_TEXTDIR 4 #define LB_LEGEND_TEXTDIR 4
//#define TP_DATA_DESCR 901
//#define TP_ALIGNMENT 902
////#define FL_ORDER 2
////#define RBT_SIDEBYSIDE 1
////#define RBT_UPDOWN 2
////#define RBT_DOWNUP 3
////#define RBT_AUTOORDER 4
#define FL_TEXTBREAK 3 #define FL_TEXTBREAK 3
#define CBX_TEXTBREAK 2 #define CBX_TEXTBREAK 2
#define CBX_TEXTOVERLAP 4 #define CBX_TEXTOVERLAP 4
......
...@@ -33,12 +33,6 @@ ...@@ -33,12 +33,6 @@
//see old chart: schhids.h //see old chart: schhids.h
/*
#define HID_SCH_DATA_ROW (HID_SCH_START + 0)
#define HID_SCH_DATA_LINE (HID_SCH_START + 1)
#define HID_SCH_DATA_POINT (HID_SCH_START + 2)
#define HID_SCH_DIAGRAM_X_AXIS (HID_SCH_START + 3)
*/
#define HID_SCH_ALIGNMENT (HID_SCH_START + 4) #define HID_SCH_ALIGNMENT (HID_SCH_START + 4)
#define HID_SCH_LEGEND_POS (HID_SCH_START + 5) #define HID_SCH_LEGEND_POS (HID_SCH_START + 5)
#define HID_SCH_DATA_DESCR (HID_SCH_START + 6) #define HID_SCH_DATA_DESCR (HID_SCH_START + 6)
...@@ -160,9 +154,4 @@ ...@@ -160,9 +154,4 @@
// HID_SCH_START should be 63280 (checked 25.Nov 2002) // HID_SCH_START should be 63280 (checked 25.Nov 2002)
// 453 == SCH_IF_CHARTVIEWSHELL, da SFX_INTERFACE_LIB kein
// Define sondern neuerdings ein Enum ist
//#define HID_SCH_VIEWSHELL_DOCUMENT (453)
#endif #endif
...@@ -37,5 +37,4 @@ ...@@ -37,5 +37,4 @@
#define RID_CONTEXTMENU_SHAPE (RID_APP_START + 1) #define RID_CONTEXTMENU_SHAPE (RID_APP_START + 1)
#define RID_CONTEXTMENU_SHAPEEDIT (RID_APP_START + 2) #define RID_CONTEXTMENU_SHAPEEDIT (RID_APP_START + 2)
// CHART_MENURESIDS_HRC
#endif #endif
...@@ -46,5 +46,4 @@ ...@@ -46,5 +46,4 @@
#define COMMAND_ID_FONT_DIALOG 15 #define COMMAND_ID_FONT_DIALOG 15
#define COMMAND_ID_PARAGRAPH_DIALOG 16 #define COMMAND_ID_PARAGRAPH_DIALOG 16
// CHART_SHAPECONTROLLER_HRC
#endif #endif
...@@ -46,5 +46,4 @@ ...@@ -46,5 +46,4 @@
#define COMMAND_ID_DRAWTBX_CS_CALLOUT 15 #define COMMAND_ID_DRAWTBX_CS_CALLOUT 15
#define COMMAND_ID_DRAWTBX_CS_STAR 16 #define COMMAND_ID_DRAWTBX_CS_STAR 16
// CHART_DRAWCOMMANDDISPATCH_HRC
#endif #endif
...@@ -33,62 +33,6 @@ ...@@ -33,62 +33,6 @@
//next free is 291 //next free is 291
//single free is: 134 //single free is: 134
//#define RID_APP_START 30000
////#define STR_NULL (RID_APP_START + 1)
////#define STR_BASIC_IDE (RID_APP_START + 2)
//#define STR_LINES (RID_APP_START + 3)
//#define STR_COLUMNS (RID_APP_START + 4)
//#define STR_BARS (RID_APP_START + 5)
//#define STR_AREAS (RID_APP_START + 6)
//#define STR_CIRCLES (RID_APP_START + 7)
//#define STR_DONUT2 (RID_APP_START + 9)
//#define STR_OFS (RID_APP_START + 14)
//#define STR_XY (RID_APP_START + 16)
//#define STR_XYZ (RID_APP_START + 17)
//#define STR_ONLY_SYMBOLS (RID_APP_START + 115)
//#define STR_LINESYMB (RID_APP_START + 15)
//#define STR_LINE_SYMBOLS (RID_APP_START + 117)
//#define STR_SYMBOL (RID_APP_START + 53)
//#define STR_SYMBOL_STACK (RID_APP_START + 54)
//#define STR_SYMBOL_PERCENT (RID_APP_START + 55)
//#define STR_SPLINE_CUBIC (RID_APP_START + 56)
//#define STR_SPLINE_CUBIC_SYMBOL (RID_APP_START + 57)
//#define STR_SPLINE_B (RID_APP_START + 58)
//#define STR_SPLINE_B_SYMBOL (RID_APP_START + 59)
//#define STR_STOCKCHART (RID_APP_START + 142)
//#define STR_SAEULE_3D_1 (RID_APP_START + 149)
//#define STR_SAEULE_3D_2 (RID_APP_START + 150)
//#define STR_SAEULE_3D_3 (RID_APP_START + 151)
//#define STR_SAEULE_3D_4 (RID_APP_START + 152)
//#define STR_ROEHRE_3D_1 (RID_APP_START + 153)
//#define STR_ROEHRE_3D_2 (RID_APP_START + 154)
//#define STR_ROEHRE_3D_3 (RID_APP_START + 155)
//#define STR_ROEHRE_3D_4 (RID_APP_START + 156)
//#define STR_PYRAMID_3D_1 (RID_APP_START + 157)
//#define STR_PYRAMID_3D_2 (RID_APP_START + 158)
//#define STR_PYRAMID_3D_3 (RID_APP_START + 159)
//#define STR_PYRAMID_3D_4 (RID_APP_START + 160)
//#define STR_PYRAMIDQ_3D_1 (RID_APP_START + 161)
//#define STR_PYRAMIDQ_3D_2 (RID_APP_START + 162)
//#define STR_PYRAMIDQ_3D_3 (RID_APP_START + 163)
//#define STR_PYRAMIDQ_3D_4 (RID_APP_START + 164)
//#define STR_KEGEL_3D_1 (RID_APP_START + 165)
//#define STR_KEGEL_3D_2 (RID_APP_START + 166)
//#define STR_KEGEL_3D_3 (RID_APP_START + 167)
//#define STR_KEGEL_3D_4 (RID_APP_START + 168)
//#define STR_KEGELQ_3D_1 (RID_APP_START + 169)
//#define STR_KEGELQ_3D_2 (RID_APP_START + 170)
//#define STR_KEGELQ_3D_3 (RID_APP_START + 171)
//#define STR_KEGELQ_3D_4 (RID_APP_START + 172)
////#define STR_NORMAL_LINES (RID_APP_START + 18)
////#define STR_SURFACE (RID_APP_START + 19)
// #define STR_STEPMAIN_LT_MAXVALUE (RID_APP_START + 103)
// #define STR_STEPHELP_LT_STEPMAIN (RID_APP_START + 104)
// #define STR_WRONG_ORIGIN (RID_APP_START + 112)
////#define STR_AREA (RID_APP_START + 122)
////#define STR_LINE (RID_APP_START + 123)
////#define STR_OBJECT_SOURCE_DATA (RID_APP_START + 129)
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
//chart types //chart types
//see Strings_ChartTypes.src //see Strings_ChartTypes.src
...@@ -342,65 +286,6 @@ ...@@ -342,65 +286,6 @@
#define STR_TEXT_DIRECTION_SUPER (RID_APP_START + 280) #define STR_TEXT_DIRECTION_SUPER (RID_APP_START + 280)
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
/*
////#define STR_DIAGRAM_X_AXIS (RID_APP_START + 34)
////#define STR_DIAGRAM_Y_AXIS (RID_APP_START + 35)
////#define STR_DIAGRAM_Z_AXIS (RID_APP_START + 36)
////#define STR_ACTION_DIAGRAM_DATA (RID_APP_START + 63)
////#define STR_UNDO_AUTOFORMAT (RID_APP_START + 79)
////#define STR_DIAGRAM_DESCR_ROW (RID_APP_START + 46)
////#define STR_DIAGRAM_DESCR_COL (RID_APP_START + 47)
////#define STR_LEGEND_SYMBOL_COL (RID_APP_START + 50)
////#define STR_BAD_PASSWORD_OR_FILE_CORRUPTED (RID_APP_START + 110)
////#define STR_QUERY_SORT (RID_APP_START + 113)
////#define STR_CFG_DEFAULT_COLORS (RID_APP_START + 177)
////#define STR_DIAGRAM_DATA_SAFETY_QUERY (RID_APP_START + 181)
////#define STR_UNDO_CUT (RID_APP_START + 60)
////#define STR_UNDO_DELETE (RID_APP_START + 61)
////#define STR_UNDO_DRAGDROP (RID_APP_START + 62)
////#define STR_UNDO_INSERT_TITLE (RID_APP_START + 65)
////#define STR_UNDO_INSERT_LEGEND (RID_APP_START + 66)
////#define STR_UNDO_INSERT_DESCR (RID_APP_START + 67)
////#define STR_UNDO_INSERT_AXIS (RID_APP_START + 68)
////#define STR_UNDO_DATA_ROW (RID_APP_START + 69)
////#define STR_UNDO_DATA_POINT (RID_APP_START + 70)
////#define STR_UNDO_TITLE (RID_APP_START + 71)
////#define STR_UNDO_LEGEND (RID_APP_START + 72)
////#define STR_UNDO_DIAGRAM_AXIS (RID_APP_START + 73)
////#define STR_UNDO_DIAGRAM_GRID (RID_APP_START + 74)
////#define STR_UNDO_DIAGRAM_WALL (RID_APP_START + 75)
////#define STR_UNDO_DIAGRAM_FLOOR (RID_APP_START + 76)
////#define STR_UNDO_DIAGRAM_AREA (RID_APP_START + 77)
////#define STR_UNDO_LIGHTING (RID_APP_START + 81)
////#define STR_UNDO_TOGGLE_TITLE (RID_APP_START + 82)
////#define STR_UNDO_TOGGLE_AXIS_TITLE (RID_APP_START + 84)
////#define STR_UNDO_TOGGLE_AXIS_DESCR (RID_APP_START + 85)
////#define STR_DEFAULTVIEW (RID_APP_START + 90)
////#define STR_UNDO_STATISTICS (RID_APP_START + 91)
////#define STR_UNDO_DIAGRAM_LINE (RID_APP_START + 92)
////#define STR_UNDO_REMOVEPOINTATTRS (RID_APP_START + 94)
////#define STR_UNDO_MOREFRONT (RID_APP_START + 95)
////#define STR_UNDO_MOREBACK (RID_APP_START + 96)
////#define STR_UNDO_INSERT_SPECCHAR (RID_APP_START + 173)
////#define STR_UNDO_INSERT_GRID (RID_APP_START + 178)
////#define STR_UNDO_TRANSFORM (RID_APP_START + 183)
////#define STR_UNDO_MOVE (RID_APP_START + 184)
////#define STR_UNDO_RESIZE (RID_APP_START + 185)
////#define STR_UNDO_ROTATE (RID_APP_START + 186)
////#define STR_UNDO_DIAGRAM_STOCK_LOSS (RID_APP_START + 147)
////#define STR_UNDO_DIAGRAM_STOCK_PLUS (RID_APP_START + 148)
////#define STR_OPEN_DOCUMENT (RID_APP_START + 105) use SID_DOC_LOADING instead
////#define STR_SAVE_DOCUMENT (RID_APP_START + 106) use SID_SAVEDOC instead
////#define STR_GRAPHIC (RID_APP_START + 108)
////#define STR_CHART_DOCUMENT (RID_APP_START + 109)
////#define STR_CHART_DOCUMENT_FULLTYPE_40 (RID_APP_START + 114)
////#define STR_CHART_DOCUMENT_FULLTYPE_31 (RID_APP_START + 118)
////#define STR_CHART_DOCUMENT_FULLTYPE_50 (RID_APP_START + 119)
////#define STR_CHART_DOCUMENT_FULLTYPE_60 (RID_APP_START + 182)
////#define STR_INVISIBLE (RID_APP_START + 120)
////#define STR_SOLID (RID_APP_START + 121)
////#define STR_APPNAME (RID_APP_START + 139)
*/
// ids must not exceed RID_APP_START + 499 // ids must not exceed RID_APP_START + 499
// ids >= RID_APP_START + 500 are defined in glob.hrc // ids >= RID_APP_START + 500 are defined in glob.hrc
......
...@@ -32,4 +32,3 @@ ...@@ -32,4 +32,3 @@
#define ROT13_PAR1_DESC 3 #define ROT13_PAR1_DESC 3
#endif #endif
...@@ -28,7 +28,6 @@ ...@@ -28,7 +28,6 @@
#ifndef __GLOBSTR_HRC_ #ifndef __GLOBSTR_HRC_
#define __GLOBSTR_HRC_ #define __GLOBSTR_HRC_
#define STR_UNDO_DELETECELLS 1 #define STR_UNDO_DELETECELLS 1
#define STR_UNDO_CUT 2 #define STR_UNDO_CUT 2
#define STR_UNDO_PASTE 3 #define STR_UNDO_PASTE 3
...@@ -92,7 +91,6 @@ ...@@ -92,7 +91,6 @@
#define STR_MSSG_SOLVE_4 60 #define STR_MSSG_SOLVE_4 60
#define STR_MSSG_SOLVE_5 61 #define STR_MSSG_SOLVE_5 61
#define STR_MSSG_SOLVE_6 62 #define STR_MSSG_SOLVE_6 62
// unused: 63
#define STR_TABLE_GESAMTERGEBNIS 64 #define STR_TABLE_GESAMTERGEBNIS 64
#define STR_TABLE_ERGEBNIS 65 #define STR_TABLE_ERGEBNIS 65
...@@ -101,7 +99,6 @@ ...@@ -101,7 +99,6 @@
#define STR_TABLE_ODER 68 #define STR_TABLE_ODER 68
#define STR_UNDO_INSERTCELLS 69 #define STR_UNDO_INSERTCELLS 69
#define STR_TABLE_DEF 70 #define STR_TABLE_DEF 70
//#define STR_STYLENAME_STANDARD 71 s.u.
#define STR_MOVE_TO_END 72 #define STR_MOVE_TO_END 72
#define STR_BOX_YNI 73 #define STR_BOX_YNI 73
#define STR_NO_REF_TABLE 74 #define STR_NO_REF_TABLE 74
...@@ -166,8 +163,6 @@ ...@@ -166,8 +163,6 @@
#define STR_FUN_TEXT_VAR 131 #define STR_FUN_TEXT_VAR 131
#define STR_DOC_STAT 132 #define STR_DOC_STAT 132
//#define STR_STYLENAME_RESULT 133 s.u.
#define STR_DBNAME_IMPORT 134 #define STR_DBNAME_IMPORT 134
#define STR_NOCHARTATCURSOR 135 #define STR_NOCHARTATCURSOR 135
...@@ -352,7 +347,6 @@ ...@@ -352,7 +347,6 @@
#define STR_SCATTR_PAGE_SCALETOPAGES 277 #define STR_SCATTR_PAGE_SCALETOPAGES 277
#define STR_NOREF_STR 278 /* moved to compiler.src, keep define! */ #define STR_NOREF_STR 278 /* moved to compiler.src, keep define! */
// unused: 279
#define STR_UNDO_CHARTDATA 280 #define STR_UNDO_CHARTDATA 280
#define STR_UNDO_ORIGINALSIZE 281 #define STR_UNDO_ORIGINALSIZE 281
...@@ -408,7 +402,6 @@ ...@@ -408,7 +402,6 @@
#define STR_DETINVALID_OVERFLOW 315 #define STR_DETINVALID_OVERFLOW 315
#define STR_GRAPHICNAME 316 #define STR_GRAPHICNAME 316
#define STR_INVALIDNAME 317 #define STR_INVALIDNAME 317
// 318 ist oben
#define STR_ERR_LINKOVERLAP 319 #define STR_ERR_LINKOVERLAP 319
#define STR_VALID_MACRONOTFOUND 320 #define STR_VALID_MACRONOTFOUND 320
...@@ -597,6 +590,6 @@ ...@@ -597,6 +590,6 @@
#define STR_PGNUM 457 #define STR_PGNUM 457
#define STR_COUNT 458 #define STR_COUNT 458
#endif #endif
This diff is collapsed.
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
* *
************************************************************************/ ************************************************************************/
#include "sc.hrc" #include "sc.hrc"
//#define RID_SCDLG_ASCII 256
#define BTN_OK 1 #define BTN_OK 1
#define BTN_CANCEL 2 #define BTN_CANCEL 2
#define BTN_HELP 3 #define BTN_HELP 3
...@@ -60,12 +60,3 @@ ...@@ -60,12 +60,3 @@
#define LB_TYPE1 28 #define LB_TYPE1 28
#define CTR_TABLEBOX 29 #define CTR_TABLEBOX 29
#define STR_TEXTTOCOLUMNS 30 #define STR_TEXTTOCOLUMNS 30
...@@ -58,4 +58,3 @@ ...@@ -58,4 +58,3 @@
#define FL_OPTIONS 60 #define FL_OPTIONS 60
#define BTN_REFS 61 #define BTN_REFS 61
...@@ -50,4 +50,3 @@ ...@@ -50,4 +50,3 @@
#define CB_OBJECT 21 #define CB_OBJECT 21
#define FT_OBJTYPE 22 #define FT_OBJTYPE 22
#define LB_OBJTYPE 23 #define LB_OBJTYPE 23
...@@ -61,4 +61,3 @@ ...@@ -61,4 +61,3 @@
#define STR_UNITS 1 #define STR_UNITS 1
#endif #endif
...@@ -26,8 +26,6 @@ ...@@ -26,8 +26,6 @@
************************************************************************/ ************************************************************************/
#include "sc.hrc" #include "sc.hrc"
//#define RID_SCDLG_IMPORTOPT 2256
#define BTN_OK 1 #define BTN_OK 1
#define BTN_CANCEL 2 #define BTN_CANCEL 2
#define BTN_HELP 3 #define BTN_HELP 3
...@@ -41,4 +39,3 @@ ...@@ -41,4 +39,3 @@
#define FL_FIELDOPT 11 #define FL_FIELDOPT 11
#define CB_FIXEDWIDTH 12 #define CB_FIXEDWIDTH 12
#define CB_SAVESHOWN 13 #define CB_SAVESHOWN 13
...@@ -78,4 +78,3 @@ ...@@ -78,4 +78,3 @@
#define PIVOTSTR_DEV2 9 #define PIVOTSTR_DEV2 9
#define PIVOTSTR_VAR 10 #define PIVOTSTR_VAR 10
#define PIVOTSTR_VAR2 11 #define PIVOTSTR_VAR2 11
...@@ -27,9 +27,6 @@ ...@@ -27,9 +27,6 @@
#include "sc.hrc" #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_OK 1
#define BTN_CANCEL 2 #define BTN_CANCEL 2
#define BTN_HELP 3 #define BTN_HELP 3
...@@ -80,4 +77,3 @@ ...@@ -80,4 +77,3 @@
#define NF_SHOW 1 #define NF_SHOW 1
#define CT_HIDE 1 #define CT_HIDE 1
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
* *
************************************************************************/ ************************************************************************/
#include "sc.hrc" #include "sc.hrc"
//#define RID_SCDLG_NEWSCENARIO 256
#define BTN_OK 1 #define BTN_OK 1
#define BTN_CANCEL 2 #define BTN_CANCEL 2
#define BTN_HELP 3 #define BTN_HELP 3
......
...@@ -31,7 +31,3 @@ ...@@ -31,7 +31,3 @@
#define IMB_INSERT 1 #define IMB_INSERT 1
#define FI_FUNCDESC 1 #define FI_FUNCDESC 1
#define FT_SPLIT 2 #define FT_SPLIT 2
// ********************************************************************** EOF
...@@ -30,17 +30,15 @@ ...@@ -30,17 +30,15 @@
#define BTN_OK 1 #define BTN_OK 1
#define BTN_CANCEL 2 #define BTN_CANCEL 2
#define BTN_HELP 5 #define BTN_HELP 5
//
#define CTR_REDLINING 10 #define CTR_REDLINING 10
#define TP_FILTER 11 #define TP_FILTER 11
#define TP_VIEW 12 #define TP_VIEW 12
#define FT_ASSIGN 14 #define FT_ASSIGN 14
#define ED_ASSIGN 15 #define ED_ASSIGN 15
#define RB_ASSIGN 16 #define RB_ASSIGN 16
#define STR_INSERT_COLS 20 #define STR_INSERT_COLS 20
#define STR_INSERT_ROWS 21 #define STR_INSERT_ROWS 21
#define STR_INSERT_TABS 22 #define STR_INSERT_TABS 22
...@@ -57,6 +55,7 @@ ...@@ -57,6 +55,7 @@
#define STR_CHILD_CONTENT 33 #define STR_CHILD_CONTENT 33
#define STR_CHILD_ORGCONTENT 34 #define STR_CHILD_ORGCONTENT 34
#define STR_EMPTY 35 #define STR_EMPTY 35
// Bitmaps // Bitmaps
#define BMP_STR_CLOSE 41 #define BMP_STR_CLOSE 41
#define BMP_STR_OPEN 42 #define BMP_STR_OPEN 42
...@@ -70,6 +69,3 @@ ...@@ -70,6 +69,3 @@
#define SC_SORT_AUTHOR 53 #define SC_SORT_AUTHOR 53
#define SC_SORT_DATE 54 #define SC_SORT_DATE 54
#define SC_SORT_COMMENT 55 #define SC_SORT_COMMENT 55
//
...@@ -47,5 +47,3 @@ ...@@ -47,5 +47,3 @@
#define BTN_HIDE_PRINT 6 #define BTN_HIDE_PRINT 6
#define FT_HINT2 7 #define FT_HINT2 7
#define FL_PRINT 8 #define FL_PRINT 8
...@@ -70,4 +70,3 @@ ...@@ -70,4 +70,3 @@
#define BTN_COND1_NEW 34 #define BTN_COND1_NEW 34
#define BTN_COND2_NEW 35 #define BTN_COND2_NEW 35
#define BTN_COND3_NEW 36 #define BTN_COND3_NEW 36
...@@ -32,9 +32,9 @@ ...@@ -32,9 +32,9 @@
#define BTN_ADD 3 #define BTN_ADD 3
#define BTN_REMOVE 4 #define BTN_REMOVE 4
#define BTN_HELP 5 #define BTN_HELP 5
//
#define LB_RANGE 11 #define LB_RANGE 11
//
#define FL_ASSIGN 12 #define FL_ASSIGN 12
#define ED_AREA 13 #define ED_AREA 13
#define RB_AREA 14 #define RB_AREA 14
...@@ -43,4 +43,3 @@ ...@@ -43,4 +43,3 @@
#define ED_DATA 17 #define ED_DATA 17
#define RB_DATA 18 #define RB_DATA 18
#define FT_DATA_LABEL 19 #define FT_DATA_LABEL 19
//
...@@ -48,4 +48,3 @@ ...@@ -48,4 +48,3 @@
#define STR_MODIFY 31 #define STR_MODIFY 31
#define STR_DB_INVALID 32 #define STR_DB_INVALID 32
#define BTN_MORE 33 #define BTN_MORE 33
...@@ -79,4 +79,3 @@ ...@@ -79,4 +79,3 @@
#define LB_CRITERIA_AREA 51 #define LB_CRITERIA_AREA 51
#define ED_CRITERIA_AREA 52 #define ED_CRITERIA_AREA 52
#define RB_CRITERIA_AREA 53 #define RB_CRITERIA_AREA 53
...@@ -34,7 +34,6 @@ ...@@ -34,7 +34,6 @@
#define CB_HIGHLIGHT_ACCEPT 6 #define CB_HIGHLIGHT_ACCEPT 6
#define CB_HIGHLIGHT_REJECT 7 #define CB_HIGHLIGHT_REJECT 7
//
#define FL_FILTER 10 #define FL_FILTER 10
#define TP_FILTER 11 #define TP_FILTER 11
#define TP_VIEW 12 #define TP_VIEW 12
...@@ -44,12 +43,6 @@ ...@@ -44,12 +43,6 @@
#define ED_ASSIGN 15 #define ED_ASSIGN 15
#define RB_ASSIGN 16 #define RB_ASSIGN 16
#define STR_INSERT_COLS 20 #define STR_INSERT_COLS 20
#define STR_INSERT_ROWS 21 #define STR_INSERT_ROWS 21
#define STR_INSERT_TABS 22 #define STR_INSERT_TABS 22
...@@ -65,7 +58,3 @@ ...@@ -65,7 +58,3 @@
#define BMP_STR_OPEN 32 #define BMP_STR_OPEN 32
#define BMP_STR_END 33 #define BMP_STR_END 33
#define BMP_STR_ERROR 34 #define BMP_STR_ERROR 34
//
...@@ -27,8 +27,6 @@ ...@@ -27,8 +27,6 @@
#include <sc.hrc> // -> RID_SCDLG_INSERT_TABLE #include <sc.hrc> // -> RID_SCDLG_INSERT_TABLE
//#define RID_SCDLG_INSERT_TABLE 300
#define BTN_OK 1 #define BTN_OK 1
#define BTN_CANCEL 2 #define BTN_CANCEL 2
#define BTN_HELP 3 #define BTN_HELP 3
...@@ -48,5 +46,3 @@ ...@@ -48,5 +46,3 @@
#define BTN_BROWSE 28 #define BTN_BROWSE 28
#define CB_LINK 29 #define CB_LINK 29
#define FT_PATH 30 #define FT_PATH 30
...@@ -39,4 +39,3 @@ ...@@ -39,4 +39,3 @@
#define BTN_RELOAD 10 #define BTN_RELOAD 10
#define NF_DELAY 11 #define NF_DELAY 11
#define FT_SECONDS 12 #define FT_SECONDS 12
...@@ -36,20 +36,6 @@ ...@@ -36,20 +36,6 @@
// -> RID_SCDLG_FILLSERIES // -> RID_SCDLG_FILLSERIES
// -> RID_SCDLG_AUTOFORMAT // -> 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 // allgemein
#define BTN_OK 100 #define BTN_OK 100
#define BTN_CANCEL 102 #define BTN_CANCEL 102
...@@ -185,4 +171,3 @@ ...@@ -185,4 +171,3 @@
// Tab Bg Color // Tab Bg Color
#define TAB_BG_COLOR_CT_BORDER 1 #define TAB_BG_COLOR_CT_BORDER 1
#define TAB_BG_COLOR_SET_BGDCOLOR 2 #define TAB_BG_COLOR_SET_BGDCOLOR 2
...@@ -33,20 +33,19 @@ ...@@ -33,20 +33,19 @@
#define BTN_REMOVE 4 #define BTN_REMOVE 4
#define BTN_HELP 5 #define BTN_HELP 5
#define BTN_MORE 6 #define BTN_MORE 6
//
#define FL_NAME 11 #define FL_NAME 11
#define ED_NAME 12 #define ED_NAME 12
#define FL_ASSIGN 13 #define FL_ASSIGN 13
#define ED_ASSIGN 15 #define ED_ASSIGN 15
#define RB_ASSIGN 16 #define RB_ASSIGN 16
//
#define STR_ADD 21 #define STR_ADD 21
#define STR_MODIFY 22 #define STR_MODIFY 22
#define STR_INVALIDSYMBOL 23 #define STR_INVALIDSYMBOL 23
//
#define BTN_CRITERIA 31 #define BTN_CRITERIA 31
#define BTN_PRINTAREA 32 #define BTN_PRINTAREA 32
#define BTN_COLHEADER 33 #define BTN_COLHEADER 33
#define BTN_ROWHEADER 34 #define BTN_ROWHEADER 34
#define FL_TYPE 35 #define FL_TYPE 35
...@@ -109,19 +109,19 @@ ...@@ -109,19 +109,19 @@
// TP_LCONTENT // TP_LCONTENT
#define GB_DISPLAY 20 #define GB_DISPLAY 20
#define CB_FORMULA 21 #define CB_FORMULA 21
#define CB_NIL 22 #define CB_NIL 22
#define CB_ANNOT 23 #define CB_ANNOT 23
#define CB_VALUE 24 #define CB_VALUE 24
#define CB_ANCHOR 25 #define CB_ANCHOR 25
#define GB_OBJECT 26 #define GB_OBJECT 26
#define FT_OBJGRF 27 #define FT_OBJGRF 27
#define LB_OBJGRF 28 #define LB_OBJGRF 28
#define FT_DIAGRAM 29 #define FT_DIAGRAM 29
#define LB_DIAGRAM 30 #define LB_DIAGRAM 30
#define FT_DRAW 31 #define FT_DRAW 31
#define LB_DRAW 32 #define LB_DRAW 32
#define CB_CLIP 33 #define CB_CLIP 33
#define GB_ZOOM 34 #define GB_ZOOM 34
#define CB_SYNCZOOM 35 #define CB_SYNCZOOM 35
...@@ -162,9 +162,8 @@ ...@@ -162,9 +162,8 @@
#define FL_SEPARATOR1 71 #define FL_SEPARATOR1 71
#define FL_SEPARATOR2 72 #define FL_SEPARATOR2 72
#define FL_SEPARATOR 73 #define FL_SEPARATOR 73
#define FL_H_SEPARATOR 74
// TP_INPUT
// TP_INPUT
#define GB_OPTIONS 70 #define GB_OPTIONS 70
#define CB_ALIGN 71 #define CB_ALIGN 71
#define LB_ALIGN 72 #define LB_ALIGN 72
......
...@@ -36,5 +36,3 @@ ...@@ -36,5 +36,3 @@
#define CB_AUTO_UPDATE_FIELDS 8 #define CB_AUTO_UPDATE_FIELDS 8
#define CB_AUTO_UPDATE_CHARTS 9 #define CB_AUTO_UPDATE_CHARTS 9
#define FT_UPDATE_LINKS 10 #define FT_UPDATE_LINKS 10
...@@ -91,8 +91,5 @@ ...@@ -91,8 +91,5 @@
#define BTN_OK 5 #define BTN_OK 5
#define BTN_CANCEL 6 #define BTN_CANCEL 6
#define IMG_DEL_H 1
#define STR_INVALIDINPUT 1 #define STR_INVALIDINPUT 1
#define STR_INVALIDCONDITION 2 #define STR_INVALIDCONDITION 2
...@@ -34,4 +34,3 @@ ...@@ -34,4 +34,3 @@
#define FT_ASSIGN 10 #define FT_ASSIGN 10
#define ED_ASSIGN 11 #define ED_ASSIGN 11
#define RB_ASSIGN 12 #define RB_ASSIGN 12
...@@ -44,4 +44,3 @@ ...@@ -44,4 +44,3 @@
#define NF_VALUE 1 #define NF_VALUE 1
#define ED_VALUE 1 #define ED_VALUE 1
...@@ -43,4 +43,3 @@ ...@@ -43,4 +43,3 @@
#define STR_INVALIDVAR 2 #define STR_INVALIDVAR 2
#define STR_INVALIDFORM 3 #define STR_INVALIDFORM 3
#define STR_NOFORMULA 4 #define STR_NOFORMULA 4
...@@ -34,13 +34,6 @@ ...@@ -34,13 +34,6 @@
// -> SCSTR_UNDEFINED // -> SCSTR_UNDEFINED
// -> SCSTR_FIELD // -> 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_FIELDS 1
#define TP_OPTIONS 2 #define TP_OPTIONS 2
...@@ -63,8 +56,6 @@ ...@@ -63,8 +56,6 @@
#define LB_SORT_USER 2 #define LB_SORT_USER 2
#define LB_OUTAREA 3 #define LB_OUTAREA 3
#define ED_OUTAREA 4 #define ED_OUTAREA 4
//#define FT_AREA_LABEL 5
//#define FT_AREA 6
#define BTN_SORT_USER 7 #define BTN_SORT_USER 7
#define BTN_CASESENSITIVE 8 #define BTN_CASESENSITIVE 8
#define BTN_LABEL 9 #define BTN_LABEL 9
...@@ -86,6 +77,3 @@ ...@@ -86,6 +77,3 @@
#define BTN_EXTSORT 3 #define BTN_EXTSORT 3
#define BTN_CURSORT 4 #define BTN_CURSORT 4
#define BTN_CANCEL 5 #define BTN_CANCEL 5
...@@ -27,12 +27,6 @@ ...@@ -27,12 +27,6 @@
#include "sc.hrc" #include "sc.hrc"
/*
#define RID_SCDLG_SUBTOTALS 256
#define RID_SCPAGE_SUBT_GROUP 256
#define RID_SCPAGE_SUBT_OPTIONS 257
*/
// TabDialog // TabDialog
#define BTN_REMOVE 1 #define BTN_REMOVE 1
#define PAGE_GROUP1 2 #define PAGE_GROUP1 2
...@@ -60,5 +54,3 @@ ...@@ -60,5 +54,3 @@
#define BTN_FORMATS 33 #define BTN_FORMATS 33
#define BTN_USERDEF 34 #define BTN_USERDEF 34
#define LB_USERDEF 35 #define LB_USERDEF 35
...@@ -46,5 +46,3 @@ ...@@ -46,5 +46,3 @@
#define STR_WRONGROWCOL 4 #define STR_WRONGROWCOL 4
#define STR_NOCOLFORMULA 5 #define STR_NOCOLFORMULA 5
#define STR_NOROWFORMULA 6 #define STR_NOROWFORMULA 6
...@@ -28,5 +28,3 @@ ...@@ -28,5 +28,3 @@
#define RID_TOOLBOX_INSERT 1 #define RID_TOOLBOX_INSERT 1
#define RID_TOOLBOX_INSCELLS 2 #define RID_TOOLBOX_INSCELLS 2
#define RID_TOOLBOX_INSOBJ 3 #define RID_TOOLBOX_INSOBJ 3
...@@ -71,7 +71,6 @@ private: ...@@ -71,7 +71,6 @@ private:
RadioButton aBtnDateSc10; RadioButton aBtnDateSc10;
RadioButton aBtnDate1904; RadioButton aBtnDate1904;
FixedLine aHSeparatorFL;
CheckBox aBtnCase; CheckBox aBtnCase;
CheckBox aBtnCalc; CheckBox aBtnCalc;
CheckBox aBtnMatch; CheckBox aBtnMatch;
......
...@@ -58,9 +58,7 @@ ...@@ -58,9 +58,7 @@
#define CB_SORTLIST 28 #define CB_SORTLIST 28
#define EDT_LIST 29 #define EDT_LIST 29
#define FT_SOURCEHINT 30 #define FT_SOURCEHINT 30
//<!--Added by PengYunQuan for Validity Cell Range Picker
#define RB_VALIDITY_REF 88 #define RB_VALIDITY_REF 88
//-->Added by PengYunQuan for Validity Cell Range Picker
/* Position indexes for "Allow" list box. /* Position indexes for "Allow" list box.
They do not map directly to ScValidationMode and can safely be modified to They do not map directly to ScValidationMode and can safely be modified to
...@@ -85,4 +83,3 @@ ...@@ -85,4 +83,3 @@
#define SC_VALIDDLG_DATA_NOTEQUAL 5 #define SC_VALIDDLG_DATA_NOTEQUAL 5
#define SC_VALIDDLG_DATA_BETWEEN 6 #define SC_VALIDDLG_DATA_BETWEEN 6
#define SC_VALIDDLG_DATA_NOTBETWEEN 7 #define SC_VALIDDLG_DATA_NOTBETWEEN 7
...@@ -26,8 +26,6 @@ ...@@ -26,8 +26,6 @@
************************************************************************/ ************************************************************************/
#include "sc.hrc" #include "sc.hrc"
//#define RID_SCDLG_NAVIGATOR 256
#define FT_ROW 1 #define FT_ROW 1
#define ED_ROW 2 #define ED_ROW 2
#define FT_COL 3 #define FT_COL 3
......
...@@ -83,7 +83,6 @@ ScTpCalcOptions::ScTpCalcOptions( Window* pParent, ...@@ -83,7 +83,6 @@ ScTpCalcOptions::ScTpCalcOptions( Window* pParent,
aBtnDateStd ( this, ScResId( BTN_DATESTD ) ), aBtnDateStd ( this, ScResId( BTN_DATESTD ) ),
aBtnDateSc10 ( this, ScResId( BTN_DATESC10 ) ), aBtnDateSc10 ( this, ScResId( BTN_DATESC10 ) ),
aBtnDate1904 ( this, ScResId( BTN_DATE1904 ) ), aBtnDate1904 ( this, ScResId( BTN_DATE1904 ) ),
aHSeparatorFL ( this, ScResId( FL_H_SEPARATOR ) ),
aBtnCase ( this, ScResId( BTN_CASE ) ), aBtnCase ( this, ScResId( BTN_CASE ) ),
aBtnCalc ( this, ScResId( BTN_CALC ) ), aBtnCalc ( this, ScResId( BTN_CALC ) ),
aBtnMatch ( this, ScResId( BTN_MATCH ) ), aBtnMatch ( this, ScResId( BTN_MATCH ) ),
......
...@@ -27,9 +27,6 @@ ...@@ -27,9 +27,6 @@
#include "sc.hrc" #include "sc.hrc"
//#define RID_SCPAGE_HFEDIT 256
//#define RID_SCDLG_HFEDIT 256
#define FT_LEFT 1 #define FT_LEFT 1
#define FT_CENTER 2 #define FT_CENTER 2
#define FT_RIGHT 3 #define FT_RIGHT 3
......
...@@ -402,8 +402,6 @@ ModelessDialog RID_SCDLG_OPTSOLVER ...@@ -402,8 +402,6 @@ ModelessDialog RID_SCDLG_OPTSOLVER
DefButton = TRUE ; DefButton = TRUE ;
}; };
// IMG_DEL_H not used - image is set dynamically
String STR_INVALIDINPUT String STR_INVALIDINPUT
{ {
Text [ en-US ] = "Invalid input." ; Text [ en-US ] = "Invalid input." ;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment