diff options
author | Thomas Arnhold <thomas@arnhold.org> | 2012-07-01 17:13:43 +0200 |
---|---|---|
committer | Thomas Arnhold <thomas@arnhold.org> | 2012-07-01 18:33:41 +0200 |
commit | 8ca21893e58dc9694e0e7a6c0fc52154b3ccb5f7 (patch) | |
tree | 2f9411f875e3dbad087fb7f6899c6ded663191c6 /sc | |
parent | 3dcdf30a233c7e75229b9e291901c6768265ca93 (diff) |
Remove unused defines
Change-Id: I45e1618dcff920b63b7e21ba9e842eed684114d7
Diffstat (limited to 'sc')
-rw-r--r-- | sc/inc/address.hxx | 3 | ||||
-rw-r--r-- | sc/inc/cfgids.hxx | 8 | ||||
-rw-r--r-- | sc/inc/dptabdat.hxx | 2 | ||||
-rw-r--r-- | sc/inc/global.hxx | 1 | ||||
-rw-r--r-- | sc/inc/rechead.hxx | 73 | ||||
-rw-r--r-- | sc/source/core/data/drwlayer.cxx | 7 | ||||
-rw-r--r-- | sc/source/core/tool/interpr1.cxx | 2 | ||||
-rw-r--r-- | sc/source/core/tool/interpr3.cxx | 1 | ||||
-rw-r--r-- | sc/source/ui/dbgui/dpuiglobal.hxx | 1 | ||||
-rw-r--r-- | sc/source/ui/docshell/docsh8.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/inc/output.hxx | 6 | ||||
-rw-r--r-- | sc/source/ui/view/viewfun5.cxx | 2 |
12 files changed, 0 insertions, 108 deletions
diff --git a/sc/inc/address.hxx b/sc/inc/address.hxx index 5f104b39b932..26598db91b80 100644 --- a/sc/inc/address.hxx +++ b/sc/inc/address.hxx @@ -76,9 +76,6 @@ const SCTAB SCTAB_MAX = ::std::numeric_limits<SCTAB>::max(); const SCCOLROW SCCOLROW_MAX = ::std::numeric_limits<SCCOLROW>::max(); const SCSIZE SCSIZE_MAX = ::std::numeric_limits<SCSIZE>::max(); -// A define to handle critical sections we hopefully don't need very often. -#define SC_ROWLIMIT_MORE_THAN_32K 1 /* set to 1 if we throw the switch */ - // The maximum values. Defines are needed for preprocessor checks, for example // in bcaslot.cxx, otherwise type safe constants are preferred. #define MAXROWCOUNT_DEFINE 1048576 diff --git a/sc/inc/cfgids.hxx b/sc/inc/cfgids.hxx index 839268fefdf6..6f6cd4ca4968 100644 --- a/sc/inc/cfgids.hxx +++ b/sc/inc/cfgids.hxx @@ -19,15 +19,7 @@ #ifndef _CFGID_HXX #define _CFGID_HXX -#define SCCFG_DOC SFX_ITEMTYPE_SC_BEGIN -#define SCCFG_VIEW (SFX_ITEMTYPE_SC_BEGIN + 1) -#define SCCFG_APP (SFX_ITEMTYPE_SC_BEGIN + 2) -#define SCCFG_SPELLCHECK (SFX_ITEMTYPE_SC_BEGIN + 3) -#define SCCFG_PRINT (SFX_ITEMTYPE_SC_BEGIN + 4) #define SCCFG_STATUSBAR (SFX_ITEMTYPE_SC_BEGIN + 5) -#define SCCFG_INPUT (SFX_ITEMTYPE_SC_BEGIN + 8) -#define SCCFG_NAVIPI (SFX_ITEMTYPE_SC_BEGIN + 9) - #endif diff --git a/sc/inc/dptabdat.hxx b/sc/inc/dptabdat.hxx index b11e8927d34f..1bbc4d6c70cc 100644 --- a/sc/inc/dptabdat.hxx +++ b/sc/inc/dptabdat.hxx @@ -48,8 +48,6 @@ namespace com { namespace sun { namespace star { namespace sheet { }}}} -#define SC_DAPI_DATE_HIERARCHIES 3 - #define SC_DAPI_HIERARCHY_FLAT 0 #define SC_DAPI_HIERARCHY_QUARTER 1 #define SC_DAPI_HIERARCHY_WEEK 2 diff --git a/sc/inc/global.hxx b/sc/inc/global.hxx index c4c2e877acaa..03451d1e7336 100644 --- a/sc/inc/global.hxx +++ b/sc/inc/global.hxx @@ -143,7 +143,6 @@ const SCSIZE MAXSUBTOTAL = 3; /* standard row height: text + margin - STD_ROWHEIGHT_DIFF */ #define STD_ROWHEIGHT_DIFF 23 -#define STD_FONT_HEIGHT 200 /* equates 10 points */ /// use ScGlobal::nStdRowHeight instead of STD_ROW_HEIGHT ! diff --git a/sc/inc/rechead.hxx b/sc/inc/rechead.hxx index 689228b7eb4b..151633f65ce0 100644 --- a/sc/inc/rechead.hxx +++ b/sc/inc/rechead.hxx @@ -35,83 +35,10 @@ #define SCID_SIZES 0x4200 -#define SCID_POOLS 0x4210 -#define SCID_DOCPOOL 0x4211 -#define SCID_STYLEPOOL 0x4212 -#define SCID_NEWPOOLS 0x4213 // ID for SC 3.0a -#define SCID_EDITPOOL 0x4214 - -#define SCID_DOCUMENT 0x4220 -#define SCID_DOCFLAGS 0x4221 -#define SCID_TABLE 0x4222 -#define SCID_DRAWING 0x4223 -#define SCID_RANGENAME 0x4224 -#define SCID_DBAREAS 0x4225 -#define SCID_PIVOT 0x4226 -#define SCID_CHARTS 0x4227 -#define SCID_NUMFORMAT 0x4228 -#define SCID_DOCOPTIONS 0x4229 -#define SCID_VIEWOPTIONS 0x422a -#define SCID_PRINTSETUP 0x422b -#define SCID_CHARSET 0x422c -#define SCID_NEWDOCUMENT 0x422d // ID for SC 3.0a -#define SCID_DDELINKS 0x422e -#define SCID_AREALINKS 0x422f -#define SCID_CONDFORMATS 0x4230 -#define SCID_VALIDATION 0x4231 -#define SCID_COLNAMERANGES 0x4232 -#define SCID_ROWNAMERANGES 0x4233 -#define SCID_DETOPLIST 0x4234 -#define SCID_CONSOLIDATA 0x4235 -#define SCID_CHANGETRACK 0x4236 -#define SCID_CHGVIEWSET 0x4237 -#define SCID_LINKUPMODE 0x4238 -#define SCID_DATAPILOT 0x4239 - -#define SCID_COLUMNS 0x4240 -#define SCID_COLROWFLAGS 0x4241 -#define SCID_TABOPTIONS 0x4242 -#define SCID_TABLINK 0x4243 - -#define SCID_COLDATA 0x4250 -#define SCID_COLNOTES 0x4251 -#define SCID_COLATTRIB 0x4252 - -#define SCID_DRAWPOOL 0x4260 -#define SCID_DRAWMODEL 0x4261 - - - -// file version -// if the high-byte is incremented, the document won't be opened by older SCs -#define SC_INITIAL_VERSION 0x0001 -#define SC_FORMULA_LCLVER 0x0002 // formula with local version no. -//-------------------------------- -#define SC_NEW_TOKEN_ARRAYS 0x0003 // new TokenArray format -#define SC_FORMULA_VALUES 0x0004 // values in formula cells -#define SC_FORMULA_VALUES2 0x0005 // values in formula cells -#define SC_DATABYTES 0x0006 // data bytes, small tables -#define SC_DATABYTES2 0x0007 // data bytes, small tables -#define SC_NUMFMT 0x0008 // number format of formula cell -#define SC_NEWIF 0x0009 // new coding of ocIf (komp.) -//-------------------------------- -#define SC_RELATIVE_REFS 0x0010 // relative references -#define SC_SUBTOTAL_FLAG 0x0011 // bSubTotal of formula cell -#define SC_COLROWNAME_RANGEPAIR 0x0012 // ColRowNameRanges as ScRangePair -//-------------------------------- -#define SC_31_EXPORT_VER 0x0012 // version for 3.1-export //-------------------------------- since 4.0 -#define SC_32K_ROWS 0x0100 // 32000 rows - incompatibel #define SC_FONTCHARSET 0x0101 // Font-CharSets have to be right -//-------------------------------- -#define SC_40_EXPORT_VER 0x0101 // version for 4.0-Export //-------------------------------- since 5.0 -#define SC_RECALC_MODE_BITS 0x0201 // TokenArray RecalcMode #define SC_MATRIX_DOUBLEREF 0x0202 // DoubleRef implicit intersection -#define SC_VERSION_EDITPOOL 0x0203 // EditCells with EditPool -#define SC_SUBTOTAL_BUGFIX 0x0204 // bSubTotal of formula cell (true) -//-------------------------------- since 5.2 -#define SC_CONVERT_RECALC_ON_LOAD 0x0205 // CONVERT function recalculated on each load //-------------------------------- #define SC_CURRENT_VERSION 0x0205 diff --git a/sc/source/core/data/drwlayer.cxx b/sc/source/core/data/drwlayer.cxx index 477034766061..6ec0795ddf69 100644 --- a/sc/source/core/data/drwlayer.cxx +++ b/sc/source/core/data/drwlayer.cxx @@ -87,13 +87,6 @@ #define DET_ARROW_OFFSET 1000 -// Abstand zur naechsten Zelle beim Loeschen (bShrink), damit der Anker -// immer an der richtigen Zelle angezeigt wird -// und noch etwas mehr, damit das Objekt auch sichtbar in der Zelle liegt -#define SHRINK_DIST 25 - -#define SHRINK_DIST_TWIPS 15 - using namespace ::com::sun::star; // STATIC DATA ----------------------------------------------------------- diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx index 2508b256b7e4..b65d93056447 100644 --- a/sc/source/core/tool/interpr1.cxx +++ b/sc/source/core/tool/interpr1.cxx @@ -73,8 +73,6 @@ #include "queryparam.hxx" #include "queryentry.hxx" -#define SC_DOUBLE_MAXVALUE 1.7e307 - static const sal_uInt64 n2power48 = SAL_CONST_UINT64( 281474976710656); // 2^48 IMPL_FIXEDMEMPOOL_NEWDEL( ScTokenStack ) diff --git a/sc/source/core/tool/interpr3.cxx b/sc/source/core/tool/interpr3.cxx index ebd2c362eb69..385ca9bdd85d 100644 --- a/sc/source/core/tool/interpr3.cxx +++ b/sc/source/core/tool/interpr3.cxx @@ -50,7 +50,6 @@ using namespace formula; // STATIC DATA ----------------------------------------------------------- #define SCdEpsilon 1.0E-7 -#define SC_MAX_ITERATION_COUNT 20 #define MAX_ANZ_DOUBLE_FOR_SORT 100000 const double ScInterpreter::fMaxGammaArgument = 171.624376956302; // found experimental diff --git a/sc/source/ui/dbgui/dpuiglobal.hxx b/sc/source/ui/dbgui/dpuiglobal.hxx index d1125807a431..6734c09e7472 100644 --- a/sc/source/ui/dbgui/dpuiglobal.hxx +++ b/sc/source/ui/dbgui/dpuiglobal.hxx @@ -34,7 +34,6 @@ #define DATA_FIELD_BTN_GAP 2 // must be an even number #define ROW_FIELD_BTN_GAP 2 // must be an even number #define FIELD_BTN_HEIGHT 23 -#define SELECT_FIELD_BTN_SPACE 2 #define FIELD_AREA_GAP 3 // gap between row/column/data/page areas #define TEXT_INFO_GAP 5 // gap between the row/data areas and the text notice below. diff --git a/sc/source/ui/docshell/docsh8.cxx b/sc/source/ui/docshell/docsh8.cxx index ba1c7839f6da..d42cf70fda91 100644 --- a/sc/source/ui/docshell/docsh8.cxx +++ b/sc/source/ui/docshell/docsh8.cxx @@ -106,8 +106,6 @@ using ::std::vector; #define SC_DBPROP_EXTENSION "Extension" #define SC_DBPROP_CHARSET "CharSet" -#define SC_ROWCOUNT_ERROR (-1) - namespace { sal_uLong lcl_getDBaseConnection(uno::Reference<sdbc::XDriverManager>& _rDrvMgr,uno::Reference<sdbc::XConnection>& _rConnection,String& _rTabName,const String& rFullFileName,rtl_TextEncoding eCharSet) diff --git a/sc/source/ui/inc/output.hxx b/sc/source/ui/inc/output.hxx index 8bd076146242..295a129405da 100644 --- a/sc/source/ui/inc/output.hxx +++ b/sc/source/ui/inc/output.hxx @@ -60,12 +60,6 @@ class SdrPaintWindow; // --------------------------------------------------------------------------- -#define SC_OBJECTS_NONE 0 -#define SC_OBJECTS_DRAWING 1 -#define SC_OBJECTS_OLE 2 -#define SC_OBJECTS_CHARTS 4 -#define SC_OBJECTS_ALL ( SC_OBJECTS_DRAWING | SC_OBJECTS_OLE | SC_OBJECTS_CHARTS ) - enum ScOutputType { OUTTYPE_WINDOW, OUTTYPE_PRINTER }; class ScFieldEditEngine; diff --git a/sc/source/ui/view/viewfun5.cxx b/sc/source/ui/view/viewfun5.cxx index 61e672d813d7..6f7e890bec72 100644 --- a/sc/source/ui/view/viewfun5.cxx +++ b/sc/source/ui/view/viewfun5.cxx @@ -58,8 +58,6 @@ #include <comphelper/storagehelper.hxx> #include <comphelper/string.hxx> -#define SOT_FORMATSTR_ID_STARCALC_CURRENT SOT_FORMATSTR_ID_STARCALC_50 - #include "viewfunc.hxx" #include "docsh.hxx" #include "drawview.hxx" |