[Libreoffice-commits] .: chart2/source sc/addin sc/inc sc/source
Joseph Powers
jpowers at kemper.freedesktop.org
Sun Nov 21 05:26:27 PST 2010
chart2/source/controller/dialogs/ResourceIds.hrc | 3
chart2/source/controller/dialogs/TabPages.hrc | 11 -
chart2/source/controller/inc/HelpIds.hrc | 13 --
chart2/source/controller/inc/MenuResIds.hrc | 3
chart2/source/controller/inc/ShapeController.hrc | 3
chart2/source/controller/main/DrawCommandDispatch.hrc | 3
chart2/source/inc/Strings.hrc | 117 ------------------
sc/addin/inc/rot13.hrc | 3
sc/inc/globstr.hrc | 11 -
sc/inc/sc.hrc | 73 +----------
sc/source/ui/dbgui/asciiopt.hrc | 31 +---
sc/source/ui/dbgui/consdlg.hrc | 3
sc/source/ui/dbgui/dapitype.hrc | 3
sc/source/ui/dbgui/dpgroupdlg.hrc | 3
sc/source/ui/dbgui/imoptdlg.hrc | 5
sc/source/ui/dbgui/pivot.hrc | 3
sc/source/ui/dbgui/pvfundlg.hrc | 6
sc/source/ui/dbgui/scendlg.hrc | 4
sc/source/ui/formdlg/dwfunctr.hrc | 6
sc/source/ui/inc/acredlin.hrc | 10 -
sc/source/ui/inc/attrdlg.hrc | 4
sc/source/ui/inc/condfrmt.hrc | 3
sc/source/ui/inc/crnrdlg.hrc | 7 -
sc/source/ui/inc/dbnamdlg.hrc | 3
sc/source/ui/inc/filter.hrc | 3
sc/source/ui/inc/highred.hrc | 13 --
sc/source/ui/inc/instbdlg.hrc | 6
sc/source/ui/inc/linkarea.hrc | 3
sc/source/ui/inc/miscdlgs.hrc | 17 --
sc/source/ui/inc/namedlg.hrc | 9 -
sc/source/ui/inc/optdlg.hrc | 19 +-
sc/source/ui/inc/optload.hrc | 4
sc/source/ui/inc/optsolver.hrc | 5
sc/source/ui/inc/simpref.hrc | 3
sc/source/ui/inc/solveroptions.hrc | 3
sc/source/ui/inc/solvrdlg.hrc | 3
sc/source/ui/inc/sortdlg.hrc | 14 --
sc/source/ui/inc/subtdlg.hrc | 10 -
sc/source/ui/inc/tabopdlg.hrc | 4
sc/source/ui/inc/tbinsert.hrc | 4
sc/source/ui/inc/tpcalc.hxx | 3
sc/source/ui/inc/validate.hrc | 5
sc/source/ui/navipi/navipi.hrc | 2
sc/source/ui/optdlg/tpcalc.cxx | 3
sc/source/ui/pagedlg/hfedtdlg.hrc | 3
sc/source/ui/src/optsolver.src | 4
46 files changed, 79 insertions(+), 392 deletions(-)
New commits:
commit de020ee8f86d0694c20622a1a1ffaef40ddeaec7
Author: Joseph Powers <jpowers27 at cox.net>
Date: Sun Nov 21 05:22:24 2010 -0800
hrc cleanup
diff --git a/chart2/source/controller/dialogs/ResourceIds.hrc b/chart2/source/controller/dialogs/ResourceIds.hrc
index 3cf9e4e..a3c8a6c 100644
--- a/chart2/source/controller/dialogs/ResourceIds.hrc
+++ b/chart2/source/controller/dialogs/ResourceIds.hrc
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
@@ -53,7 +53,6 @@
#define TP_LEGEND_POS 900
#define TP_DATA_DESCR 901
#define TP_ALIGNMENT 902
-//#define TP_SYMBOL 906
#define TP_LAYOUT 907
#define TP_OPTIONS 908
#define TP_POLAROPTIONS 909
diff --git a/chart2/source/controller/dialogs/TabPages.hrc b/chart2/source/controller/dialogs/TabPages.hrc
index a641bff..a7415e6 100644
--- a/chart2/source/controller/dialogs/TabPages.hrc
+++ b/chart2/source/controller/dialogs/TabPages.hrc
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
@@ -37,15 +37,6 @@
#define FT_LEGEND_TEXTDIR 3
#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 CBX_TEXTBREAK 2
#define CBX_TEXTOVERLAP 4
diff --git a/chart2/source/controller/inc/HelpIds.hrc b/chart2/source/controller/inc/HelpIds.hrc
index 8004b96..9532354 100644
--- a/chart2/source/controller/inc/HelpIds.hrc
+++ b/chart2/source/controller/inc/HelpIds.hrc
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
@@ -33,12 +33,6 @@
//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_LEGEND_POS (HID_SCH_START + 5)
#define HID_SCH_DATA_DESCR (HID_SCH_START + 6)
@@ -160,9 +154,4 @@
// 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
diff --git a/chart2/source/controller/inc/MenuResIds.hrc b/chart2/source/controller/inc/MenuResIds.hrc
index 6c899fc..5910606 100644
--- a/chart2/source/controller/inc/MenuResIds.hrc
+++ b/chart2/source/controller/inc/MenuResIds.hrc
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
@@ -37,5 +37,4 @@
#define RID_CONTEXTMENU_SHAPE (RID_APP_START + 1)
#define RID_CONTEXTMENU_SHAPEEDIT (RID_APP_START + 2)
-// CHART_MENURESIDS_HRC
#endif
diff --git a/chart2/source/controller/inc/ShapeController.hrc b/chart2/source/controller/inc/ShapeController.hrc
index baaf28d..d230c32 100644
--- a/chart2/source/controller/inc/ShapeController.hrc
+++ b/chart2/source/controller/inc/ShapeController.hrc
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
@@ -46,5 +46,4 @@
#define COMMAND_ID_FONT_DIALOG 15
#define COMMAND_ID_PARAGRAPH_DIALOG 16
-// CHART_SHAPECONTROLLER_HRC
#endif
diff --git a/chart2/source/controller/main/DrawCommandDispatch.hrc b/chart2/source/controller/main/DrawCommandDispatch.hrc
index 66a7294..2995d6c 100644
--- a/chart2/source/controller/main/DrawCommandDispatch.hrc
+++ b/chart2/source/controller/main/DrawCommandDispatch.hrc
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
@@ -46,5 +46,4 @@
#define COMMAND_ID_DRAWTBX_CS_CALLOUT 15
#define COMMAND_ID_DRAWTBX_CS_STAR 16
-// CHART_DRAWCOMMANDDISPATCH_HRC
#endif
diff --git a/chart2/source/inc/Strings.hrc b/chart2/source/inc/Strings.hrc
index 88c3f40..50e6f3d 100644
--- a/chart2/source/inc/Strings.hrc
+++ b/chart2/source/inc/Strings.hrc
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
@@ -33,62 +33,6 @@
//next free is 291
//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
//see Strings_ChartTypes.src
@@ -342,65 +286,6 @@
#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 >= RID_APP_START + 500 are defined in glob.hrc
diff --git a/sc/addin/inc/rot13.hrc b/sc/addin/inc/rot13.hrc
index ee87d4c..dba4340 100644
--- a/sc/addin/inc/rot13.hrc
+++ b/sc/addin/inc/rot13.hrc
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
@@ -32,4 +32,3 @@
#define ROT13_PAR1_DESC 3
#endif
-
diff --git a/sc/inc/globstr.hrc b/sc/inc/globstr.hrc
index 70f1c9a..5652cf0 100644
--- a/sc/inc/globstr.hrc
+++ b/sc/inc/globstr.hrc
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
@@ -28,7 +28,6 @@
#ifndef __GLOBSTR_HRC_
#define __GLOBSTR_HRC_
-
#define STR_UNDO_DELETECELLS 1
#define STR_UNDO_CUT 2
#define STR_UNDO_PASTE 3
@@ -92,7 +91,6 @@
#define STR_MSSG_SOLVE_4 60
#define STR_MSSG_SOLVE_5 61
#define STR_MSSG_SOLVE_6 62
-// unused: 63
#define STR_TABLE_GESAMTERGEBNIS 64
#define STR_TABLE_ERGEBNIS 65
@@ -101,7 +99,6 @@
#define STR_TABLE_ODER 68
#define STR_UNDO_INSERTCELLS 69
#define STR_TABLE_DEF 70
-//#define STR_STYLENAME_STANDARD 71 s.u.
#define STR_MOVE_TO_END 72
#define STR_BOX_YNI 73
#define STR_NO_REF_TABLE 74
@@ -166,8 +163,6 @@
#define STR_FUN_TEXT_VAR 131
#define STR_DOC_STAT 132
-//#define STR_STYLENAME_RESULT 133 s.u.
-
#define STR_DBNAME_IMPORT 134
#define STR_NOCHARTATCURSOR 135
@@ -352,7 +347,6 @@
#define STR_SCATTR_PAGE_SCALETOPAGES 277
#define STR_NOREF_STR 278 /* moved to compiler.src, keep define! */
-// unused: 279
#define STR_UNDO_CHARTDATA 280
#define STR_UNDO_ORIGINALSIZE 281
@@ -408,7 +402,6 @@
#define STR_DETINVALID_OVERFLOW 315
#define STR_GRAPHICNAME 316
#define STR_INVALIDNAME 317
-// 318 ist oben
#define STR_ERR_LINKOVERLAP 319
#define STR_VALID_MACRONOTFOUND 320
@@ -597,6 +590,6 @@
#define STR_PGNUM 457
-#define STR_COUNT 458
+#define STR_COUNT 458
#endif
diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
index 5693324..1d7d59d 100644
--- a/sc/inc/sc.hrc
+++ b/sc/inc/sc.hrc
@@ -127,11 +127,6 @@
#define HID_SC_HF_FRL ( HID_SC_CONTROL_START + 9 )
#define HID_SC_HF_FRC ( HID_SC_CONTROL_START + 10 )
#define HID_SC_HF_FRR ( HID_SC_CONTROL_START + 11 )
-// "Spalten" in Teilergebnissen: Gruppe 1/2/3 - nicht mehr!
-//#define HID_SC_SUBT_COLS_1 ( HID_SC_CONTROL_START + 12 )
-//#define HID_SC_SUBT_COLS_2 ( HID_SC_CONTROL_START + 13 )
-//#define HID_SC_SUBT_COLS_3 ( HID_SC_CONTROL_START + 14 )
-// Eintraege im Navigator
#define HID_SC_NAVIPI_ENTRIES ( HID_SC_CONTROL_START + 15 )
#define HID_SC_NAVIPI_ROW ( HID_SC_CONTROL_START + 16 )
#define HID_SC_NAVIPI_COL ( HID_SC_CONTROL_START + 17 )
@@ -143,11 +138,12 @@
#define HID_SC_NAVIPI_ROOT ( HID_SC_CONTROL_START + 23 )
#define HID_SC_NAVIPI_SCEN ( HID_SC_CONTROL_START + 24 )
#define HID_SC_NAVIPI_DROP ( HID_SC_CONTROL_START + 25 )
+
// Teilergebnisse
#define HID_SC_SUBT_GROUP ( HID_SC_CONTROL_START + 26 )
#define HID_SC_SUBT_COLS ( HID_SC_CONTROL_START + 27 )
#define HID_SC_SUBT_FUNC ( HID_SC_CONTROL_START + 28 )
-//
+
#define HID_SC_NAVIPI_TOOLBOX ( HID_SC_CONTROL_START + 29 )
// Bereich ist voll!
@@ -482,7 +478,6 @@
#define FID_TESTFUNC9 (SC_VIEW_START + 9)
#define FID_SCALESTATUS (SC_VIEW_START + 10)
#define FID_COLOR (SC_VIEW_START + 11)
-//aus sfx: #define SID_REPAINT (SC_VIEW_START + 12)
#define SID_UPDATECHART (SC_VIEW_START + 13)
#define FID_MARKLEFT (SC_VIEW_START + 14)
#define FID_MARKRIGHT (SC_VIEW_START + 15)
@@ -566,7 +561,6 @@
#define SID_CHOOSE_DESIGN (SC_VIEW_START + 82)
#define SID_EURO_CONVERTER (SC_VIEW_START + 83)
-//#define SID_CHG_PROTECT (SC_VIEW_START + 84) -> moved to SVX
#define SID_EXTERNAL_SOURCE (SC_VIEW_START + 85)
#define SID_SC_INPUT_TEXTWYSIWYG (SC_VIEW_START + 86)
@@ -653,21 +647,16 @@
#define SID_OPENDLG_FUNCTION (SC_MESSAGE_START + 52)
#define SID_OPENDLG_SOLVE (SC_MESSAGE_START + 53)
#define SID_OPENDLG_TABOP (SC_MESSAGE_START + 54)
-//#define SID_OPENDLG_CHART (SC_MESSAGE_START + 55)
#define SID_OPENDLG_EDITFUNCTION (SC_MESSAGE_START + 56)
#define SID_OPENDLG_ARGUMENT (SC_MESSAGE_START + 57)
-//#define SID_OPENDLG_MODCHART (SC_MESSAGE_START + 58)
#define SID_OPENDLG_CONDFRMT (SC_MESSAGE_START + 59)
#define SID_OPENDLG_OPTSOLVER (SC_MESSAGE_START + 60)
-//<!--Added by PengYunQuan for Validity Cell Range Picker
#define SID_VALIDITY_REFERENCE (SC_MESSAGE_START + 61)
-//-->Added by PengYunQuan for Validity Cell Range Picker
#define SC_HINT_NAVIGATOR_UPDATEALL (SC_MESSAGE_START + 65)
// Funktionen ------------------------------------------------------------
-//#define FID_PRINT_PREVIEW (SC_FUNCTION_START)
#define FID_DOC_MANAGER (SC_FUNCTION_START + 1)
#define FID_CURSOR_ENTER (SC_FUNCTION_START + 2)
#define SID_MAIL (SC_FUNCTION_START + 3)
@@ -693,7 +682,6 @@
#define SID_DEL_ROWS (EDIT_MENU_START + 16)//JN
#define SID_DEL_COLS (EDIT_MENU_START + 17)//JN
-//#define FID_CHG_RECORD (EDIT_MENU_START + 18) -> moved to SVX
#define FID_CHG_SHOW (EDIT_MENU_START + 19)
#define EDIT_MENU_END (EDIT_MENU_START + 20)
@@ -709,9 +697,7 @@
#define FID_FUNCTION_BOX (VIEW_MENU_START + 8)
#define FID_NORMALVIEWMODE (VIEW_MENU_START + 9)
#define FID_TOGGLEFORMULA (VIEW_MENU_START + 10)
-// Compare/Merge jetzt aus Sfx
-//#define FID_CHG_COMPARE (VIEW_MENU_START + 16)// DANGER DIRTY ID
-//#define FID_CHG_MERGE (VIEW_MENU_START + 17)// DANGER DIRTY ID
+
#define FID_CHG_ACCEPT (VIEW_MENU_START + 18)// DANGER DIRTY ID
#define FID_CHG_COMMENT (VIEW_MENU_START + 19)// DANGER DIRTY ID
#define VIEW_MENU_END (VIEW_MENU_START + 20)
@@ -733,8 +719,6 @@
#define FID_USE_NAME (INSERT_MENU_START + 13)
#define FID_APPLY_NAME (INSERT_MENU_START + 14)
#define FID_INS_TABLE_EXT (INSERT_MENU_START + 15)
-//#define SID_CHARMAP (INSERT_MENU_START + 15)//!!! kommt von sfx
-//aus sfx: #define SID_INSERT_POSTIT (INSERT_MENU_START + 16)
#define SID_INSERT_CLIPART (INSERT_MENU_START + 17) //!!! sollte vom Svx kommen
#define FID_INS_CELLSDOWN (INSERT_MENU_START + 18)
#define FID_INS_CELLSRIGHT (INSERT_MENU_START + 19)
@@ -799,12 +783,7 @@
#define SID_UNFILTER (DATA_MENU_START + 6)
#define SID_QUERY (DATA_MENU_START + 7)
#define SID_SUBTOTALS (DATA_MENU_START + 8)
-//aus sfx: #define SID_OUTLINE_HIDE (DATA_MENU_START + 9)
-//aus sfx: #define SID_OUTLINE_SHOW (DATA_MENU_START + 10)
-//aus sfx: #define SID_OUTLINE_MAKE (DATA_MENU_START + 11)
-//aus sfx: #define SID_OUTLINE_REMOVE (DATA_MENU_START + 12)
#define SID_AUTO_OUTLINE (DATA_MENU_START + 13)
-//aus sfx: #define SID_OUTLINE_DELETEALL (DATA_MENU_START + 14)
#define SID_IMPORT_DATA (DATA_MENU_START + 15)
#define SID_REIMPORT_DATA (DATA_MENU_START + 16)
#define SID_PIVOT_TABLE (DATA_MENU_START + 17)
@@ -817,8 +796,7 @@
#define SID_SORT_DESCENDING (DATA_MENU_START + 23)
#define SID_SORT_ASCENDING (DATA_MENU_START + 24)
-//
-//
+
#define DATA_MENU_END (DATA_MENU_START + 25)
#define TAB_POPUP_START (DATA_MENU_END)
@@ -859,12 +837,8 @@
#define DRAW_BAR_START (RID_INPUTBAR_END)
#define SID_DRAWTOABOVE (DRAW_BAR_START+15)
#define SID_DRAWTOBELOW (DRAW_BAR_START+16)
-//#define SID_GROUP (DRAW_BAR_START+17)
-//#define SID_UNGROUP (DRAW_BAR_START+18)
#define SID_FRAMETOTOP (DRAW_BAR_START+19)
#define SID_FRAMETOBOTTOM (DRAW_BAR_START+20)
-//aus sfx: #define SID_FRAME_UP (DRAW_BAR_START+21)
-//aus sfx: #define SID_FRAME_DOWN (DRAW_BAR_START+22)
#define SID_TOOL_TEXT (DRAW_BAR_START+23)
#define SID_ANCHOR_PAGE (DRAW_BAR_START+24)
#define SID_ANCHOR_CELL (DRAW_BAR_START+25)
@@ -906,7 +880,6 @@
#define DETECTIVE_END (DETECTIVE_START+20)
#define SID_API_SLOTS (DETECTIVE_END)
-//aus sfx: #define SID_ENTER_STRING (SID_API_SLOTS)
#define SID_INSERT_MATRIX (SID_API_SLOTS+1)
#define SID_DELETE_NOTE (SID_API_SLOTS+2)
@@ -994,7 +967,6 @@
#define SID_FILL_COUNT (SID_NEW_SLOTS+8)
#define SID_WITH_UNDO (SID_NEW_SLOTS+9)
#define FID_MERGE_TOGGLE (SID_NEW_SLOTS+10)
-//aus sfx: #define SID_ATTR_SECIALCHAR (SID_NEW_SLOTS+10)
#define SID_ATTR_ROWHEADERS (SID_NEW_SLOTS+11)
#define SID_ATTR_COLHEADERS (SID_NEW_SLOTS+12)
@@ -1110,16 +1082,6 @@
// idl Parameter ---------------------------------------------------------
-//aus sfx: #define FN_PARAM_1 (SC_PARAM_START)
-//aus sfx: #define FN_PARAM_2 (SC_PARAM_START+1)
-//aus sfx: #define FN_PARAM_3 (SC_PARAM_START+2)
-//aus sfx: #define FN_PARAM_4 (SC_PARAM_START+3)
-//aus sfx: #define FN_PARAM_5 (SC_PARAM_START+4)
-//aus sfx: #define FN_PARAM_6 (SC_PARAM_START+5)
-//aus sfx: #define FN_PARAM_7 (SC_PARAM_START+6)
-//aus sfx: #define FN_PARAM_8 (SC_PARAM_START+7)
-#define FN_PARAM_9 (FN_PARAM_8+1)
-
#define SID_SORT_BYROW (SC_PARAM_START)
#define SID_SORT_HASHEADER (SC_PARAM_START+1)
#define SID_SORT_CASESENS (SC_PARAM_START+2)
@@ -1139,8 +1101,6 @@
#define RID_POPUP_PREVIEW (SC_RESOURCE_START+7)
#define RID_POPUP_OLE (SC_RESOURCE_START+8)
#define RID_POPUP_CHART (SC_RESOURCE_START+9)
-//#define RID_ANCHORBITMAP (SC_RESOURCE_START+10)
-//#define RID_GRAYANCHORBITMAP (SC_RESOURCE_START+11)
#define RID_OUTLINEBITMAPS (SC_RESOURCE_START+12)
#define RID_DRAW_WIN (SC_RESOURCE_START+13)
#define RID_CNTRLR_WIN (SC_RESOURCE_START+14)
@@ -1158,29 +1118,19 @@
#define RID_POPUP_EDIT (SC_RESOURCE_START+33)
#define RID_POPUP_AUDIT (SC_RESOURCE_START+34)
#define RID_OBJECTBAR_TOOLS (SC_RESOURCE_START+35)
-// free
-// free
#define RID_TBXCTL_INSERT (SC_RESOURCE_START+38)
#define RID_TBXCTL_INSCELLS (SC_RESOURCE_START+39)
#define RID_TBXCTL_INSOBJ (SC_RESOURCE_START+40)
-// free
-// free
#define RID_SC_FUNCTION_DESCRIPTIONS1 (SC_RESOURCE_START+43)
#define RID_SC_FUNCTION_DESCRIPTIONS2 (SC_RESOURCE_START+44)
#define RID_POPUP_CONTROL (SC_RESOURCE_START+45)
#define RID_POPUP_PAGEBREAK (SC_RESOURCE_START+46)
-// free
#define RID_POPUP_DRAWFORM (SC_RESOURCE_START+48)
#define RID_SC_ADDIN_ROT13 (SC_RESOURCE_START+50)
#define RID_SC_ADDIN_DFA (SC_RESOURCE_START+51)
#define RID_IMAGELIST_NAVCONT (SC_RESOURCE_START+52)
#define RID_DRAW_OBJECTBAR (SC_RESOURCE_START+53)
#define RID_GRAPHIC_OBJECTBAR (SC_RESOURCE_START+54)
-// free
-// free
-// free
-// free
-// free
#define RID_MEDIA_OBJECTBAR (SC_RESOURCE_START+60)
#define RID_POPUP_MEDIA (SC_RESOURCE_START+61)
#define RID_FUNCTION_CATEGORIES (SC_RESOURCE_START+62)
@@ -1216,7 +1166,6 @@
#define SCSTR_APDTABLE (STR_START + 27)
#define SCSTR_RENAMETAB (STR_START + 28)
#define STR_INSERTGRAPHIC (STR_START + 29)
-//#define STR_BASIC_IDE (STR_START + 30)
#define SCSTR_APPLICATION (STR_START + 31)
#define SCSTR_DOCSHELL (STR_START + 32)
#define SCSTR_TABVIEWSHELL (STR_START + 33)
@@ -1304,7 +1253,7 @@
#define STR_PRINT_NOTHING (STR_START + 93)
#define SCSTR_ALLFILTER (STR_START + 94)
#define SCSTR_MOREBTN_MOREOPTIONS (STR_START + 95)
-#define SCSTR_MOREBTN_FEWEROPTIONS (STR_START + 96)
+#define SCSTR_MOREBTN_FEWEROPTIONS (STR_START + 96)
// Items
@@ -1337,6 +1286,7 @@
#define STR_ACC_TABLE_DESCR (STR_START + 157)
#define STR_ACC_CELL_NAME (STR_START + 158)
#define STR_ACC_CELL_DESCR (STR_START + 159)
+
// Preview
#define STR_ACC_PREVIEWDOC_NAME (STR_START + 160)
#define STR_ACC_PREVIEWDOC_DESCR (STR_START + 161)
@@ -1419,7 +1369,7 @@
#define SCSTR_FUSTAT (STR_START + 395)
#define SCSTR_FUTAB (STR_START + 396)
#define SCSTR_FUTEXT (STR_START + 397)
-//
+
#define SCSTR_COMPILER_STRINGS (STR_START + 398)
#define SCSTR_FILTER_STRINGS (STR_START + 399)
#define SCSTR_COMPILER_INTL_STR (STR_START + 400)
@@ -1533,7 +1483,6 @@
#define RID_SCDLG_CHAR (SC_DIALOGS_START + 76)
#define RID_SCDLG_PARAGRAPH (SC_DIALOGS_START + 77)
-//#define RID_SCDLG_CHARTRANGE (SC_DIALOGS_START + 78)
#define RID_SCPAGE_STAT (SC_DIALOGS_START + 79)
#define RID_SCDLG_CHARTCOLROW (SC_DIALOGS_START + 80)
@@ -1541,7 +1490,7 @@
#define RID_SCDLG_EDITCHAR (SC_DIALOGS_START + 82)
- // Popup fuer Statusbar-Controller
+// Popup fuer Statusbar-Controller
#define RID_POPUP_SUMCTL (SC_DIALOGS_START + 83)
#define RID_SUMCTL_SUM (SC_DIALOGS_START + 84)
#define RID_SUMCTL_MIN (SC_DIALOGS_START + 85)
@@ -1553,7 +1502,7 @@
#define RID_SCDLG_ASCII (SC_DIALOGS_START + 91)
- // Popup fuer Drop-Modus im Navigator
+// Popup fuer Drop-Modus im Navigator
#define RID_POPUP_DROPMODE (SC_DIALOGS_START + 92)
#define RID_DROPMODE_URL (SC_DIALOGS_START + 93)
#define RID_DROPMODE_LINK (SC_DIALOGS_START + 94)
@@ -1642,9 +1591,6 @@
#define STD_MASKCOLOR Color { Red = 0xFF00; Green = 0x0000; Blue = 0xFF00; }
#endif
-// mask color for high contrast
-#define SC_HC_MASKCOLOR STD_MASKCOLOR
-
#define MID_1 1
#define MID_2 2
#define MID_3 3
@@ -1677,4 +1623,3 @@
#endif
-
diff --git a/sc/source/ui/dbgui/asciiopt.hrc b/sc/source/ui/dbgui/asciiopt.hrc
index a251127..6e1c9ae 100644
--- a/sc/source/ui/dbgui/asciiopt.hrc
+++ b/sc/source/ui/dbgui/asciiopt.hrc
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
@@ -25,17 +25,17 @@
*
************************************************************************/
#include "sc.hrc"
-//#define RID_SCDLG_ASCII 256
-#define BTN_OK 1
-#define BTN_CANCEL 2
-#define BTN_HELP 3
-#define FL_FIELDOPT 4
-#define FT_CHARSET 5
-#define LB_CHARSET 6
-#define FT_CUSTOMLANG 7
-#define LB_CUSTOMLANG 8
-#define FT_AT_ROW 9
+#define BTN_OK 1
+#define BTN_CANCEL 2
+#define BTN_HELP 3
+
+#define FL_FIELDOPT 4
+#define FT_CHARSET 5
+#define LB_CHARSET 6
+#define FT_CUSTOMLANG 7
+#define LB_CUSTOMLANG 8
+#define FT_AT_ROW 9
#define NF_AT_ROW 10
#define FL_SEPOPT 11
@@ -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 f1f6c26..057a543 100644
--- a/sc/source/ui/dbgui/consdlg.hrc
+++ b/sc/source/ui/dbgui/consdlg.hrc
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
@@ -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 c7800ca..425491b 100644
--- a/sc/source/ui/dbgui/dapitype.hrc
+++ b/sc/source/ui/dbgui/dapitype.hrc
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
@@ -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 a75edbb..27adea3 100644
--- a/sc/source/ui/dbgui/dpgroupdlg.hrc
+++ b/sc/source/ui/dbgui/dpgroupdlg.hrc
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
@@ -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 b6f1bf5..e494269 100644
--- a/sc/source/ui/dbgui/imoptdlg.hrc
+++ b/sc/source/ui/dbgui/imoptdlg.hrc
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
@@ -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 097b093..44afc7c 100644
--- a/sc/source/ui/dbgui/pivot.hrc
+++ b/sc/source/ui/dbgui/pivot.hrc
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
@@ -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 4e155ca..570ac3f 100644
--- a/sc/source/ui/dbgui/pvfundlg.hrc
+++ b/sc/source/ui/dbgui/pvfundlg.hrc
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
@@ -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 fe01da8..8fbf9a2 100644
--- a/sc/source/ui/dbgui/scendlg.hrc
+++ b/sc/source/ui/dbgui/scendlg.hrc
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
@@ -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 5daaa8a..d783404 100644
--- a/sc/source/ui/formdlg/dwfunctr.hrc
+++ b/sc/source/ui/formdlg/dwfunctr.hrc
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
@@ -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 468c573..ae96d12 100644
--- a/sc/source/ui/inc/acredlin.hrc
+++ b/sc/source/ui/inc/acredlin.hrc
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
@@ -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 5a2cb3a..9707577 100644
--- a/sc/source/ui/inc/attrdlg.hrc
+++ b/sc/source/ui/inc/attrdlg.hrc
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
@@ -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 67d587c..190a345 100644
--- a/sc/source/ui/inc/condfrmt.hrc
+++ b/sc/source/ui/inc/condfrmt.hrc
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
@@ -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 8e8de3f..ee8f48e 100644
--- a/sc/source/ui/inc/crnrdlg.hrc
+++ b/sc/source/ui/inc/crnrdlg.hrc
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
@@ -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 8062656..d1c1724 100644
--- a/sc/source/ui/inc/dbnamdlg.hrc
+++ b/sc/source/ui/inc/dbnamdlg.hrc
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
@@ -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 9d708c9..e4865bd 100644
--- a/sc/source/ui/inc/filter.hrc
+++ b/sc/source/ui/inc/filter.hrc
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
@@ -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 726c9a8..245f814 100644
--- a/sc/source/ui/inc/highred.hrc
+++ b/sc/source/ui/inc/highred.hrc
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
@@ -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 1b33887..2386a11 100644
--- a/sc/source/ui/inc/instbdlg.hrc
+++ b/sc/source/ui/inc/instbdlg.hrc
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
@@ -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 f0e9ae7..f1dd147 100644
--- a/sc/source/ui/inc/linkarea.hrc
+++ b/sc/source/ui/inc/linkarea.hrc
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
@@ -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 160c7b0..79b5fd0 100644
--- a/sc/source/ui/inc/miscdlgs.hrc
+++ b/sc/source/ui/inc/miscdlgs.hrc
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
@@ -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 5381df4..d0560f9 100644
--- a/sc/source/ui/inc/namedlg.hrc
+++ b/sc/source/ui/inc/namedlg.hrc
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
@@ -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 d409ad3..d62819b 100644
--- a/sc/source/ui/inc/optdlg.hrc
+++ b/sc/source/ui/inc/optdlg.hrc
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
@@ -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 e43e102..6a2948c 100644
--- a/sc/source/ui/inc/optload.hrc
+++ b/sc/source/ui/inc/optload.hrc
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
@@ -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 88051ba..fe9349b 100644
--- a/sc/source/ui/inc/optsolver.hrc
+++ b/sc/source/ui/inc/optsolver.hrc
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
@@ -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 058abc2..2420ffd 100644
--- a/sc/source/ui/inc/simpref.hrc
+++ b/sc/source/ui/inc/simpref.hrc
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
@@ -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 0cf4e05..3c543e6 100644
--- a/sc/source/ui/inc/solveroptions.hrc
+++ b/sc/source/ui/inc/solveroptions.hrc
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
@@ -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 a04fa5a..2be4bd3 100644
--- a/sc/source/ui/inc/solvrdlg.hrc
+++ b/sc/source/ui/inc/solvrdlg.hrc
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
@@ -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 2e55f44..20efbef 100644
--- a/sc/source/ui/inc/sortdlg.hrc
+++ b/sc/source/ui/inc/sortdlg.hrc
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
@@ -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 9970491..bd43785 100644
--- a/sc/source/ui/inc/subtdlg.hrc
+++ b/sc/source/ui/inc/subtdlg.hrc
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
@@ -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 a2d3b76..28d8938 100644
--- a/sc/source/ui/inc/tabopdlg.hrc
+++ b/sc/source/ui/inc/tabopdlg.hrc
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
@@ -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 b80e6fb..6a426d9 100644
--- a/sc/source/ui/inc/tbinsert.hrc
+++ b/sc/source/ui/inc/tbinsert.hrc
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
@@ -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 796b6fb..76cc0a9 100644
--- a/sc/source/ui/inc/tpcalc.hxx
+++ b/sc/source/ui/inc/tpcalc.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* 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
@@ -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 0af2a14..6089255 100644
--- a/sc/source/ui/inc/validate.hrc
+++ b/sc/source/ui/inc/validate.hrc
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
@@ -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 5faab76..5672013 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 cf8f197..0a3d6ba 100644
--- a/sc/source/ui/optdlg/tpcalc.cxx
+++ b/sc/source/ui/optdlg/tpcalc.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* 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
@@ -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 11ea33d..e5b4b53 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 28ca5ae..5ce6fa7 100644
--- a/sc/source/ui/src/optsolver.src
+++ b/sc/source/ui/src/optsolver.src
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
@@ -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." ;
More information about the Libreoffice-commits
mailing list