diff options
author | Thomas Arnhold <thomas@arnhold.org> | 2012-07-02 17:45:34 +0200 |
---|---|---|
committer | Thomas Arnhold <thomas@arnhold.org> | 2012-07-02 17:46:25 +0200 |
commit | 278000a28b8eceb8528ebdcf1d601de8192979e8 (patch) | |
tree | a522e5b53bca5d3e34c8a86d7bbee25a1ad15b3a /sw | |
parent | 892bb81d17b3351c196661c44fb15b29509c7115 (diff) |
Remove unused defines
Some of them were commented out for documentation purpose.
Change-Id: I29a6b2cbe774b527f0c3a0be5675160817a7f3ce
Diffstat (limited to 'sw')
-rw-r--r-- | sw/inc/cmdid.h | 78 | ||||
-rw-r--r-- | sw/source/core/doc/notxtfrm.cxx | 2 | ||||
-rw-r--r-- | sw/source/core/inc/dbg_lay.hxx | 4 | ||||
-rw-r--r-- | sw/source/core/inc/txtfrm.hxx | 8 | ||||
-rw-r--r-- | sw/source/core/text/itrform2.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/app/appenv.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/frmdlg/colex.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/index/cnttab.cxx | 5 | ||||
-rw-r--r-- | sw/source/ui/uiview/viewsrch.cxx | 4 | ||||
-rw-r--r-- | sw/source/ui/utlui/navipi.cxx | 12 | ||||
-rw-r--r-- | sw/source/ui/vba/vbaapplication.cxx | 6 |
11 files changed, 0 insertions, 125 deletions
diff --git a/sw/inc/cmdid.h b/sw/inc/cmdid.h index 91c8158ce036..eb22171228ca 100644 --- a/sw/inc/cmdid.h +++ b/sw/inc/cmdid.h @@ -50,14 +50,11 @@ included in c-context files, so c++ style stuff will cause problems. #define FN_INSERT (SID_SW_START + 300) #define FN_FORMAT (SID_SW_START + 400) #define FN_EXTRA (SID_SW_START + 600) -#define FN_WINDOW (SID_SW_START + 700) -#define FN_HELP (SID_SW_START + 800) #define FN_SELECTION (SID_SW_START + 900) #define FN_QUERY (SID_SW_START + 1000) #define FN_ENVELP (SID_SW_START + 1050) #define FN_PARAM (SID_SW_START + 1100) #define FN_STAT (SID_SW_START + 1180) -#define FN_PRNOPT (SID_SW_START + 1200) #define FN_PGPREVIEW (SID_SW_START + 1250) #define FN_FRAME (SID_SW_START + 1300) #define FN_INSERT2 (SID_SW_START + 1400) @@ -79,52 +76,24 @@ included in c-context files, so c++ style stuff will cause problems. #define FN_UNO_RANGE_BEGIN FN_FORMAT2 #define FN_UNO_RANGE_END (FN_PARAM2 + 199) -#define HELP_OFFSET 1100 -#define CMD_STR_OFFSET 2200 -#define CMDID_END 5500 - /*-------------------------------------------------------------------- Region: File --------------------------------------------------------------------*/ -#define FN_CLOSE_FILE (FN_FILE + 1 ) /* Close */ - #define FN_NEW_GLOBAL_DOC (FN_FILE + 4 ) /* Create Global Document */ -#define FN_NEW_FILE (FN_FILE + 5 ) /* New */ #define FN_OPEN_FILE (FN_FILE + 7 ) /* Open */ -#define FN_EDIT_FILE (FN_FILE + 8 ) /* Open or ToTop */ - -#define FN_INETFILE (FN_FILE + 9 ) /* Internet File-Dialog */ - -#define FN_PRINT_FILE (FN_FILE + 10) /* Print */ -#define FN_SAVE_FILE (FN_FILE + 13) /* Save */ -#define FN_EXIT (FN_FILE + 17) /* Close Writer */ - -#define FN_DOC_MGR_DLG (FN_FILE + 32) /* Document-Manager */ - -#define FN_GET_DOCSTAT (FN_FILE + 33) /* Get document statistics */ #define FN_OUTLINE_TO_IMPRESS (FN_FILE + 36) /* Send outline to impress */ #define FN_OUTLINE_TO_CLIPBOARD (FN_FILE + 37) /* Send outline to clipboard */ #define FN_NEW_HTML_DOC (FN_FILE + 40 ) /* Create HTML document */ -#define FN_APP_START (FN_FILE + 98) /* Macro for App.Start */ -#define FN_APP_END (FN_FILE + 99) /* Macro for App.End */ - /*-------------------------------------------------------------------- Region: Edit --------------------------------------------------------------------*/ -#define FN_CLEAR (FN_EDIT + 1 ) /* Clear */ -#define FN_COPY (FN_EDIT + 2 ) /* Copy */ -#define FN_CUT (FN_EDIT + 3 ) /* Cut */ #define FN_EDIT_FIELD (FN_EDIT + 4 ) /* Edit field */ -#define FN_EDIT_LINK (FN_EDIT + 8 ) /* Edit link */ #define FN_EDIT_LINK_DLG (FN_EDIT + 9 ) /* Edit link dialog */ -#define FN_GOTO (FN_EDIT + 11) /* Go to */ -#define FN_PASTE (FN_EDIT + 13) /* Paste */ #define FN_NUMBER_BULLETS (FN_EDIT + 21) /* Bullets */ -#define FN_REPEAT (FN_EDIT + 22) /* Repeat last */ #define FN_EDIT_IDX_ENTRY_DLG (FN_EDIT + 23) /* Edit Index-Entry */ #define FN_UPDATE_FIELDS (FN_EDIT + 26) /* Update fields */ #define FN_EXECUTE_MACROFIELD (FN_EDIT + 27) /* Execute macrofield */ @@ -234,7 +203,6 @@ included in c-context files, so c++ style stuff will cause problems. #define FN_SET_PAGE (FN_VIEW + 29) /* Set page template to paragraph */ // more Navigator -#define FN_CONTENT_LB (FN_VIEW + 32) /**/ #define FN_SHOW_CONTENT_BOX (FN_VIEW + 33) /**/ #define FN_SHOW_ROOT (FN_VIEW + 34) /**/ #define FN_DROP_REGION (FN_VIEW + 35) /**/ @@ -290,7 +258,6 @@ included in c-context files, so c++ style stuff will cause problems. #define FN_POSTIT (FN_INSERT + 29) /* Insert/edit PostIt */ #define FN_INSERT_TABLE (FN_INSERT + 30) /* Insert Table */ #define FN_INSERT_STRING (FN_INSERT+31) -#define FN_INSERT_COLS (FN_INSERT + 32) /* Insert Columns */ #define FN_INSERT_FRAME_INTERACT (FN_INSERT + 33) /* Insert interactive frame */ #define FN_INSERT_FRAME (FN_INSERT + 34) /* Insert Frame */ @@ -364,21 +331,13 @@ included in c-context files, so c++ style stuff will cause problems. #define FN_SET_SUPER_SCRIPT (FN_FORMAT + 11) /* superscript */ #define FN_SET_SUB_SCRIPT (FN_FORMAT + 12) /* subscript */ -#define FN_SET_CASEMAP (FN_FORMAT + 14) /* CaseMap */ -#define FN_SET_KERNING (FN_FORMAT + 16) /* Kerning */ - #define FN_FLIP_HORZ_GRAFIC (FN_FORMAT + 25) /* mirror horizontally */ #define FN_FLIP_VERT_GRAFIC (FN_FORMAT + 26) /* mirror vertically */ -#define FN_SET_ADJUST (FN_FORMAT + 28) /* parametrized alignemnt */ - -#define FN_SET_WIDOW (FN_FORMAT + 36) /* Widows */ -#define FN_SET_ORPHAN (FN_FORMAT + 37) /* Orphans */ #define FN_NUM_FORMAT_TABLE_DLG (FN_FORMAT + 45) /* number format in table */ #define FN_FORMAT_BORDER_DLG (FN_FORMAT + 48) /* */ #define FN_FORMAT_PAGE_COLUMN_DLG (FN_FORMAT + 49) /* columns per page */ #define FN_FORMAT_BACKGROUND_DLG (FN_FORMAT + 50) /* background */ -#define FN_FORMAT_PAGE (FN_FORMAT + 51) /* page */ #define FN_FORMAT_PAGE_DLG (FN_FORMAT + 52) /* page */ #define FN_FORMAT_COLUMN (FN_FORMAT + 53) /* columns */ #define FN_FORMAT_DROPCAPS (FN_FORMAT + 54) /* initials */ @@ -499,8 +458,6 @@ included in c-context files, so c++ style stuff will cause problems. #define FN_TABLE_AUTOSUM (FN_FORMAT + 195) /* */ -#define FN_IS_IMAGE (FN_FORMAT2 + 6) /* numbering: with graphic? */ - #define FN_GOTO_NEXT_REGION (FN_FORMAT2 + 9) /* */ #define FN_GOTO_PREV_REGION (FN_FORMAT2 + 10) /* */ @@ -559,21 +516,14 @@ included in c-context files, so c++ style stuff will cause problems. #define FN_LINE_NUMBERING_DLG (FN_EXTRA + 2 ) /* */ #define FN_HYPHENATE_OPT_DLG (FN_EXTRA + 5 ) /* */ #define FN_ADD_UNKNOWN (FN_EXTRA + 6 ) /* learn words */ -#define FN_NUMBERING (FN_EXTRA + 9 ) /* numbering/bullets*/ #define FN_NUMBERING_OUTLINE_DLG (FN_EXTRA + 12) /* */ #define FN_SORTING_DLG (FN_EXTRA + 14) /* */ #define FN_CALCULATE (FN_EXTRA + 15) /* */ #define FN_GLOSSARY_DLG (FN_EXTRA + 20) /* text building blocks */ -#define FN_PLAY_MACRO (FN_EXTRA + 23) /* run macro */ #define FN_EXPAND_GLOSSARY (FN_EXTRA + 28) /* expand text building blocks */ -#define FN_CONFIG_MENU (FN_EXTRA + 30) /* configure menu */ -#define FN_CONFIG_KEY (FN_EXTRA + 31) /* configure keyboard */ #define FN_CHANGE_PAGENUM (FN_EXTRA + 34) /* change page numbers*/ -#define FN_MACRO_POPUP (FN_EXTRA + 37) /* all macro functions*/ -#define FN_BULLET (FN_EXTRA + 38) /* bullet list */ - // Region: Glossary #define FN_AUTO_CORRECT (FN_EXTRA + 49 ) /* Autocorrect from Basic */ @@ -584,16 +534,6 @@ included in c-context files, so c++ style stuff will cause problems. #define FN_NAVIGATION_PI_GOTO_PAGE (FN_EXTRA + 59 ) /* goto page from navigation-PI */ -#define FN_RESERVED_9 (FN_EXTRA + 86) /* place holder */ -#define FN_RESERVED_8 (FN_EXTRA + 87) /* place holder */ -#define FN_RESERVED_7 (FN_EXTRA + 88) /* place holder */ -#define FN_RESERVED_6 (FN_EXTRA + 89) /* place holder */ -#define FN_RESERVED_5 (FN_EXTRA + 90) /* place holder */ -#define FN_RESERVED_4 (FN_EXTRA + 91) /* place holder */ -#define FN_RESERVED_3 (FN_EXTRA + 92) /* place holder */ -#define FN_RESERVED_2 (FN_EXTRA + 93) /* place holder */ -#define FN_RESERVED_1 (FN_EXTRA + 94) /* place holder */ - #define FN_COLL_TYPE (FN_EXTRA + 98) /* type for GlobalDoc-Collection*/ #define FN_COLL_ADD (FN_EXTRA + 99) @@ -824,8 +764,6 @@ included in c-context files, so c++ style stuff will cause problems. QUERY-Block --------------------------------------------------------------------*/ -#define FN_IS_MODIFIED (FN_QUERY +16) /* Was the document modified? */ - #define FN_TXTATR_INET (FN_QUERY +29) /* INet-Attribut */ #define FN_GET_PRINT_AREA (FN_QUERY +32) /* Get attribute for printable area of page */ @@ -845,7 +783,6 @@ included in c-context files, so c++ style stuff will cause problems. #define FN_ENVELOP (FN_ENVELP ) - #define FN_DELETE_NOTE_AUTHOR (FN_NOTES+1) #define FN_DELETE_ALL_NOTES (FN_NOTES+2) #define FN_HIDE_NOTE (FN_NOTES+3) @@ -872,7 +809,6 @@ included in c-context files, so c++ style stuff will cause problems. #define FN_PARAM_MOVE_SELECTION (FN_PARAM+3) #define FN_PARAM_ADDPRINTER (FN_PARAM+18) -#define FN_PARAM_GRID (FN_PARAM+19) #define FN_PARAM_DOCDISP (FN_PARAM+20) #define FN_PARAM_ELEM (FN_PARAM+21) #define FN_PARAM_SWTEST (FN_PARAM+22) @@ -886,10 +822,6 @@ included in c-context files, so c++ style stuff will cause problems. #define FN_PARAM_REGION_EDIT_IN_READONLY (FN_PARAM+28) #define FN_PARAM_INSERT_AFTER (FN_PARAM+29) -#define FN_PARAM_WIDTH (FN_PARAM+39) -#define FN_PARAM_DIR (FN_PARAM+41) -#define FN_PARAM_COUNT (FN_PARAM+42) -#define FN_PARAM_COLOR (FN_PARAM+43) #define FN_PARAM_TABLE_NAME (FN_PARAM+44) #define FN_PARAM_TABLE_HEADLINE (FN_PARAM+50) @@ -900,8 +832,6 @@ included in c-context files, so c++ style stuff will cause problems. #define FN_PARAM_FIELD_SUBTYPE (FN_PARAM+56) #define FN_PARAM_FIELD_FORMAT (FN_PARAM+57) -#define FN_PARAM_EVENT (FN_PARAM+68) -#define FN_PARAM_URL (FN_PARAM+69) #define FN_PARAM_GRF_REALSIZE (FN_PARAM+70) #define FN_PARAM_GRF_DIALOG (FN_PARAM+71) #define FN_INET_FIELD_MACRO (FN_PARAM+77) /* Id for URL-Field-Macros*/ @@ -918,12 +848,8 @@ included in c-context files, so c++ style stuff will cause problems. #define FN_PARAM_NUM_PRESET (FN_PARAM2+5) /* predefined numbering */ -#define FN_PARAM_DIST (FN_PARAM2+7) /* and width, for metric transformation */ - #define FN_PARAM_SHADOWCURSOR (FN_PARAM2+8) /* for ShadowCursor options */ -#define FN_PARAM_10 (FN_PARAM2+11) - #define FN_TEXT_RANGE (FN_PARAM2+12) /* TextRange Property*/ #define FN_PARAM_CRSR_IN_PROTECTED (FN_PARAM2+13) /* Cursor in protected areas */ @@ -1013,10 +939,6 @@ included in c-context files, so c++ style stuff will cause problems. #define MID_12 0xf9 #define MID_13 0xfa -#ifndef SID_SW_DOCMAN_PATH -#define SID_SW_DOCMAN_PATH (SID_OFASLOTS_START + 6) -#endif - // defines for Event-assignments per Macro #define MAC_EVENT_MOUSEOVER 0x01 // #define MAC_EVENT_MOUSECLICK 0x02 // diff --git a/sw/source/core/doc/notxtfrm.cxx b/sw/source/core/doc/notxtfrm.cxx index 7d45201616d8..e9e7ab889e06 100644 --- a/sw/source/core/doc/notxtfrm.cxx +++ b/sw/source/core/doc/notxtfrm.cxx @@ -79,8 +79,6 @@ using namespace com::sun::star; -#define DEFTEXTSIZE 12 - extern void ClrContourCache( const SdrObject *pObj ); // TxtFly.Cxx diff --git a/sw/source/core/inc/dbg_lay.hxx b/sw/source/core/inc/dbg_lay.hxx index fdeb6c9ec58b..b84066f035d1 100644 --- a/sw/source/core/inc/dbg_lay.hxx +++ b/sw/source/core/inc/dbg_lay.hxx @@ -60,10 +60,6 @@ #define ACT_NEXT_SECT 8 #define ACT_PREV_SECT 9 -#define SNAP_LOWER 0x00000001 -#define SNAP_FLYFRAMES 0x00000002 -#define SNAP_TABLECONT 0x00000004 - #ifdef DBG_UTIL #include "swtypes.hxx" diff --git a/sw/source/core/inc/txtfrm.hxx b/sw/source/core/inc/txtfrm.hxx index e8da527c89bc..fc292b5662c4 100644 --- a/sw/source/core/inc/txtfrm.hxx +++ b/sw/source/core/inc/txtfrm.hxx @@ -33,8 +33,6 @@ #include "cntfrm.hxx" #include "ndtxt.hxx" -#define STRSIZE(x) (sizeof(x)-1) - class SwCharRange; class SwTxtNode; class SwTxtFormatter; @@ -56,12 +54,6 @@ class SwScriptInfo; class SwViewOption; class SwWrongList; -#define GRID_ON 0 -#define GRID_HEIGHT 1 -#define RUBY_HEIGHT 2 -#define RUBY_TOP 3 -#define GRID_CELLS 4 - /// Represents the visualization of a paragraph. class SwTxtFrm: public SwCntntFrm { diff --git a/sw/source/core/text/itrform2.cxx b/sw/source/core/text/itrform2.cxx index 7a6fba1f1e6b..8cf1e079fa91 100644 --- a/sw/source/core/text/itrform2.cxx +++ b/sw/source/core/text/itrform2.cxx @@ -83,8 +83,6 @@ namespace { static bool lcl_BuildHiddenPortion( const SwTxtSizeInfo& rInf, xub_StrLen &rPos ); } -#define MAX_TXTPORLEN 300 - inline void ClearFly( SwTxtFormatInfo &rInf ) { delete rInf.GetFly(); diff --git a/sw/source/ui/app/appenv.cxx b/sw/source/ui/app/appenv.cxx index ac4fce17a23f..c290254d1e6f 100644 --- a/sw/source/ui/app/appenv.cxx +++ b/sw/source/ui/app/appenv.cxx @@ -80,8 +80,6 @@ #define ENV_NEWDOC RET_OK #define ENV_INSERT RET_USER -#define ENV_CANCEL SHRT_MAX - // Function used for labels and envelopes in applab.cxx and appenv.cxx String InsertLabEnvText( SwWrtShell& rSh, SwFldMgr& rFldMgr, const String& rText ) diff --git a/sw/source/ui/frmdlg/colex.cxx b/sw/source/ui/frmdlg/colex.cxx index cd5bdece2a91..1ad864386464 100644 --- a/sw/source/ui/frmdlg/colex.cxx +++ b/sw/source/ui/frmdlg/colex.cxx @@ -459,8 +459,6 @@ SwPageGridExample::~SwPageGridExample() delete pGridItem; } -#define MAX_ROWS 10 -#define MAX_LINES 15 void SwPageGridExample::DrawPage( const Point& rOrg, const sal_Bool bSecond, const sal_Bool bEnabled ) diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx index 4daba7a7d28d..d2aae21d9ef3 100644 --- a/sw/source/ui/index/cnttab.cxx +++ b/sw/source/ui/index/cnttab.cxx @@ -101,11 +101,6 @@ using namespace ::sfx2; static const sal_Unicode aDeliStart = '['; // for the form static const sal_Unicode aDeliEnd = ']'; // for the form -#define POS_GRF 0 -#define POS_OLE 1 -#define POS_TABLE 2 -#define POS_FRAME 3 - #define IDX_FILE_EXTENSION rtl::OUString("*.sdi") String lcl_CreateAutoMarkFileDlg( const String& rURL, diff --git a/sw/source/ui/uiview/viewsrch.cxx b/sw/source/ui/uiview/viewsrch.cxx index d0f6079f917a..ce57fca0ed5f 100644 --- a/sw/source/ui/uiview/viewsrch.cxx +++ b/sw/source/ui/uiview/viewsrch.cxx @@ -73,10 +73,6 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star::util; using namespace ::com::sun::star::i18n; -#define SRCH_ATTR_OFF 0 -#define SRCH_ATTR_ON 1 -#define SRCH_ATTR_SET 2 - /*-------------------------------------------------------------------- Beschreibung: Search Parameter --------------------------------------------------------------------*/ diff --git a/sw/source/ui/utlui/navipi.cxx b/sw/source/ui/utlui/navipi.cxx index e8136298ec38..903d6affc852 100644 --- a/sw/source/ui/utlui/navipi.cxx +++ b/sw/source/ui/utlui/navipi.cxx @@ -68,18 +68,6 @@ #define PAGE_CHANGE_TIMEOUT 1000 //Timeout fuer Seitenwechsel -#define JUMP_TYPE_TBL 0 -#define JUMP_TYPE_FRM 1 -#define JUMP_TYPE_GRF 2 -#define JUMP_TYPE_REG 3 -#define JUMP_TYPE_BKM 4 - -// Version fuer Konfiguration - -#define NAVI_VERSION0 0 -#define NAVI_VERSION1 1 -#define NAVI_VERSION2 2 // bIsGlobalActive - using namespace ::com::sun::star::uno; using namespace ::com::sun::star::frame; diff --git a/sw/source/ui/vba/vbaapplication.cxx b/sw/source/ui/vba/vbaapplication.cxx index e0e34cd5a207..7633d3a9c72b 100644 --- a/sw/source/ui/vba/vbaapplication.cxx +++ b/sw/source/ui/vba/vbaapplication.cxx @@ -52,12 +52,6 @@ using ::com::sun::star::uno::UNO_QUERY_THROW; using ::com::sun::star::uno::UNO_QUERY; using ::rtl::OUString; -// Enable our own join detection for Intersection and Union -// should be more efficient than using ScRangeList::Join ( because -// we already are testing the same things ) - -#define OWN_JOIN 1 - // #TODO is this defined somewhere else? #if ( defined UNX ) #define FILE_PATH_SEPERATOR "/" |