diff options
author | Thomas Arnhold <thomas@arnhold.org> | 2012-06-25 10:52:10 +0200 |
---|---|---|
committer | Thomas Arnhold <thomas@arnhold.org> | 2012-06-25 14:12:57 +0200 |
commit | 66cd9eeb90869b88ab883eab367a39041f21aef0 (patch) | |
tree | 5626a9f3422d5bd36d026ab0570228e57c94e01e /svx | |
parent | Remove OLD_TAB_STYLE (diff) | |
download | core-66cd9eeb90869b88ab883eab367a39041f21aef0.tar.gz core-66cd9eeb90869b88ab883eab367a39041f21aef0.zip |
Remove various commented out defines
Most of them in hrc files.
Change-Id: I3944f6ed9befd2b498385f61b851790362221a4f
Diffstat (limited to 'svx')
-rw-r--r-- | svx/inc/svx/fmresids.hrc | 22 | ||||
-rw-r--r-- | svx/inc/svx/svdobj.hxx | 3 | ||||
-rw-r--r-- | svx/inc/svx/svdstr.hrc | 1 | ||||
-rw-r--r-- | svx/inc/svx/svxdlg.hxx | 1 | ||||
-rw-r--r-- | svx/inc/svx/svxids.hrc | 51 |
5 files changed, 0 insertions, 78 deletions
diff --git a/svx/inc/svx/fmresids.hrc b/svx/inc/svx/fmresids.hrc index a0d1371dbcdb..1ead07243f50 100644 --- a/svx/inc/svx/fmresids.hrc +++ b/svx/inc/svx/fmresids.hrc @@ -28,7 +28,6 @@ #define RID_SVXIMGLIST_FMEXPL (RID_FORMS_START + 0) // Image-Id's ----------------------------------------------------------- -//#define SID_FMSLOTS_START (SID_SVX_START + 592) -> svxids.hrc #define RID_SVXIMG_FORM SID_FM_CONFIG #define RID_SVXIMG_CONTROL SID_CHOOSE_CONTROLS #define RID_SVXIMG_COLLAPSEDNODE (RID_FORMS_START + 2) @@ -183,27 +182,6 @@ #define RID_STR_PROPTITLE_SPINBUTTON (RID_FORMS_START + 100) #define RID_STR_PROPTITLE_HIDDEN (RID_FORMS_START + 101) // FREE - // FREE - // FREE - // FREE - // FREE - // FREE - // FREE - // FREE - // FREE - // FREE - // FREE - // FREE - // FREE - // FREE - // FREE - // FREE - // FREE - // FREE - // FREE - // FREE - // FREE - // FREE #define RID_STR_DATANAVIGATOR (RID_FORMS_START + 124) #define RID_STR_DATANAV_SUBM_PARENT (RID_FORMS_START + 125) #define RID_STR_DATANAV_SUBM_ID (RID_FORMS_START + 126) diff --git a/svx/inc/svx/svdobj.hxx b/svx/inc/svx/svdobj.hxx index 857556030cb3..d3282c1584ff 100644 --- a/svx/inc/svx/svdobj.hxx +++ b/svx/inc/svx/svdobj.hxx @@ -159,9 +159,6 @@ enum SdrUserCallType {SDRUSERCALL_MOVEONLY, // Nur verschoben, Groesse u SDRUSERCALL_CHILD_INSERTED, // Ein Child einer Gruppe hat sich veraendert SDRUSERCALL_CHILD_REMOVED}; // Ein Child einer Gruppe hat sich veraendert -/* nur voruebergehend, weil sonst MUSS-Aenderung */ -// #define nLayerID nLayerId - //************************************************************ // Hilfsklasse SdrObjUserCall //************************************************************ diff --git a/svx/inc/svx/svdstr.hrc b/svx/inc/svx/svdstr.hrc index 5f223fd3b3c4..bd52c5e38dc5 100644 --- a/svx/inc/svx/svdstr.hrc +++ b/svx/inc/svx/svdstr.hrc @@ -181,7 +181,6 @@ #define STR_ObjNameSingulMEDIA (STR_ObjNameBegin + 143) #define STR_ObjNamePluralMEDIA (STR_ObjNameBegin + 144) -//#define STR_ObjNameEnd (STR_ObjNamePluralMEDIA) //IAccessibility2 Implementation 2009----- #define STR_ObjNameSingulFONTWORK (STR_ObjNameBegin+145) #define STR_ObjNamePluralFONTWORK (STR_ObjNameBegin+146) diff --git a/svx/inc/svx/svxdlg.hxx b/svx/inc/svx/svxdlg.hxx index b7aee5f4d843..3dd452d471cc 100644 --- a/svx/inc/svx/svxdlg.hxx +++ b/svx/inc/svx/svxdlg.hxx @@ -70,7 +70,6 @@ namespace svx{ class SpellDialogChildWindow;} #define EMPTY_FRAME_REF com::sun::star::uno::Reference < com::sun::star::frame::XFrame >() -//#define SVX_DIALOGFACTORY_CLASSID 0xf8e5fd97, 0x49e2, 0x4ae5, 0xac, 0x31, 0x4, 0xcb, 0xf7, 0xf3, 0xcf, 0x69 class AbstractSvxDistributeDialog :public VclAbstractDialog //add for SvxDistributeDialog { public: diff --git a/svx/inc/svx/svxids.hrc b/svx/inc/svx/svxids.hrc index 685b3453e384..fca583186b5f 100644 --- a/svx/inc/svx/svxids.hrc +++ b/svx/inc/svx/svxids.hrc @@ -17,7 +17,6 @@ */ #ifndef _SVX_SVXIDS_HRC #define _SVX_SVXIDS_HRC -// include ------------------------------------------------------------------ #include <svl/memberid.hrc> #include <svl/solar.hrc> @@ -236,20 +235,6 @@ // Calc-Id's // -------------------------------------------------------------------------- -//! moved to sfx2, still in use: -//#ifndef SC_FUNCTION_START -//#define SC_FUNCTION_START (SID_SC_START + 200) -//#endif -//#ifndef FILE_MENU_END -//#define FILE_MENU_END (SC_FUNCTION_START + 20) -//#endif -//#ifndef EDIT_MENU_START -//#define EDIT_MENU_START (FILE_MENU_END) -//#endif -//#ifndef SC_VIEW_START -//#define SC_VIEW_START (SID_SC_START) -//#endif - #define SID_OUTLINE_HIDE (SID_SC_START + 329) #define SID_OUTLINE_SHOW (SID_SC_START + 330) #define SID_OUTLINE_MAKE (SID_SC_START + 331) @@ -259,10 +244,6 @@ #define SID_ENTER_STRING (SID_SC_START + 476) #define SID_ATTR_SPECIALCHAR (SID_SC_START + 581) -//! moved to sfx2, still in use: -//#define FID_CHG_RECORD (EDIT_MENU_START + 18) -//#define SID_CHG_PROTECT (SC_VIEW_START + 84) - // -------------------------------------------------------------------------- // Writer-Id's // -------------------------------------------------------------------------- @@ -296,18 +277,12 @@ #define FN_PGPREVIEW (SID_SW_START + 1250) #define FN_SHOW_MULTIPLE_PAGES (FN_PGPREVIEW + 2) -//! moved to sfx2, still in use: -//#define FN_EDIT2 (SID_SW_START + 1800) -//#define FN_REDLINE_PROTECT (FN_EDIT2 + 23) -//#define FN_REDLINE_ON (FN_EDIT2 + 25) - // -------------------------------------------------------------------------- // Svx-Id's // -------------------------------------------------------------------------- #define SID_ATTR_BORDER_INNER ( SID_SVX_START + 23 ) - #define SID_ATTR_POSTIT_AUTHOR ( SID_SVX_START + 44 ) #define SID_ATTR_POSTIT_DATE ( SID_SVX_START + 45 ) #define SID_ATTR_POSTIT_TEXT ( SID_SVX_START + 46 ) @@ -342,11 +317,6 @@ #define SID_RULER_PAGE_POS ( SID_SVX_START + 82 ) #define SID_RULER_ACT_LINE_ONLY ( SID_SVX_START + 83 ) #define SID_RULER_LR_MIN_MAX ( SID_SVX_START + 84 ) -//#define SID_ZOOM_TOOLBOX ( SID_SVX_START + 96 ) -> sfxsids.hrc -//#define SID_ZOOM_OUT ( SID_SVX_START + 97 ) -> sfxsids.hrc -//#define SID_ZOOM_IN ( SID_SVX_START + 98 ) -> sfxsids.hrc -//#define SID_SIZE_REAL ( SID_SVX_START + 99 ) -> sfxsids.hrc -//#define SID_SIZE_PAGE ( SID_SVX_START + 100 ) -> sfxsids.hrc #define SID_SIZE_ALL ( SID_SVX_START + 101 ) #define SID_DRAW_LINE ( SID_SVX_START + 102 ) #define SID_DRAW_XLINE ( SID_SVX_START + 103 ) @@ -395,7 +365,6 @@ #define SID_REHEARSE_TIMINGS ( SID_SVX_START + 159 ) #define SID_HIDE_SLIDE ( SID_SVX_START + 161 ) #define SID_CHOOSE_POLYGON ( SID_SVX_START + 162 ) -//#define SID_SHOW_BROWSER ( SID_SVX_START + 163 ) -> sfxsids.hrc #define SID_ATTR_FILL_STYLE ( SID_SVX_START + 164 ) #define SID_ATTR_FILL_COLOR ( SID_SVX_START + 165 ) #define SID_ATTR_FILL_GRADIENT ( SID_SVX_START + 166 ) @@ -445,8 +414,6 @@ #define SID_ATTR_POSITION ( SID_SVX_START + 223 ) #define SID_ATTR_SIZE ( SID_SVX_START + 224 ) #define SID_TABLE_CELL ( SID_SVX_START + 225 ) -//#define SID_ATTR_ALIGN_HOR_JUSTIFY ( SID_SVX_START + 226 ) -//#define SID_ATTR_ALIGN_VER_JUSTIFY ( SID_SVX_START + 227 ) #define SID_ATTR_ALIGN_MARGIN ( SID_SVX_START + 228 ) #define SID_ATTR_ALIGN_STACKED ( SID_SVX_START + 229 ) #define SID_ATTR_ALIGN_LINEBREAK ( SID_SVX_START + 230 ) @@ -483,9 +450,7 @@ #define SID_GALLERY_ENABLE_ADDCOPY ( SID_SVX_START + 276 ) #define SID_GALLERY_IMPORTTHEME ( SID_SVX_START + 277 ) #define SID_GALLERY_BG_POS ( SID_SVX_START + 278 ) -//#define SID_GALLERY_BG_BRUSH ( SID_SVX_START + 279 ) -> sfxsids.hrc #define SID_GALLERY_FORMATS ( SID_SVX_START + 280 ) -//#define SID_SEARCH_OPTIONS ( SID_SVX_START + 281 ) -> sfxsids.hrc #define SID_OBJECT_HELL ( SID_SVX_START + 282 ) #define SID_OBJECT_HEAVEN ( SID_SVX_START + 283 ) #define SID_ATTR_LONG_ULSPACE ( SID_SVX_START + 284 ) @@ -493,8 +458,6 @@ #define SID_FRAME_TO_TOP ( SID_SVX_START + 286 ) #define SID_FRAME_TO_BOTTOM ( SID_SVX_START + 287 ) #define SID_POSTIT ( SID_SVX_START + 288 ) -//#define SID_ZOOM ( SID_SVX_START + 289 ) -> sfxsids.hrc -//#define SID_SEARCH_ITEM ( SID_SVX_START + 291 ) -> sfxsids.hrc #define SID_SEARCH_SEARCHSET ( SID_SVX_START + 292 ) #define SID_SEARCH_REPLACESET ( SID_SVX_START + 293 ) #define SID_SET_SUPER_SCRIPT ( SID_SVX_START + 294 ) @@ -531,13 +494,9 @@ #define SID_BMPMASK ( SID_SVX_START + 350 ) #define SID_BMPMASK_PIPETTE ( SID_SVX_START + 351 ) #define SID_BMPMASK_EXEC ( SID_SVX_START + 353 ) -//#define SID_HYPERLINK_GETLINK ( SID_SVX_START + 361 ) -> sfxsids.hrc -//#define SID_HYPERLINK_SETLINK ( SID_SVX_START + 362 ) -> sfxsids.hrc -//#define SID_NAVIGATOR ( SID_SVX_START + 366 ) -> sfxsids.hrc #define SID_ATTR_TEXT_FITTOSIZE ( SID_SVX_START + 367 ) #define SID_ATTR_BRUSH_ROW ( SID_SVX_START + 368 ) #define SID_OPTFILTER_MSOFFICE ( SID_SVX_START + 369 ) -//#define SID_TASKPANE ( SID_SVX_START + 370 ) -> sfxsids.hrc #define SID_IMAP ( SID_SVX_START + 371 ) #define SID_IMAP_EXEC ( SID_SVX_START + 374 ) #define SID_SHOW_HIDDEN ( SID_SVX_START + 375 ) @@ -566,19 +525,13 @@ #define SID_DRAWTBX_RECTANGLES ( SID_SVX_START + 399 ) #define SID_DRAWTBX_ELLIPSES ( SID_SVX_START + 400 ) #define SID_DRAWTBX_LINES ( SID_SVX_START + 401 ) -//#define SID_ZOOM_NEXT ( SID_SVX_START + 402 ) -> sfxsids.hrc -//#define SID_ZOOM_PREV ( SID_SVX_START + 403 ) -> sfxsids.hrc #define SID_BACKGRND_DESTINATION ( SID_SVX_START + 404 ) #define SID_ATTR_FLASH ( SID_SVX_START + 406 ) #define SID_ATTR_3D_LIGHT ( SID_SVX_START + 407 ) /* Slots mit --> koennen demnaechst entfallen */ #define SID_ATTR_3D_START SID_ATTR_3D_LIGHT #define SID_ATTR_3D_AMBIENTCOLOR ( SID_SVX_START + 411 ) -//! moved to sfx2, still in use: -//#define SID_HTML_MODE ( SID_SVX_START + 414 ) - #define SID_RULER_PROTECT ( SID_SVX_START + 415 ) -//#define SID_INET_DLG ( SID_SVX_START + 416 ) -> sfxsids.hrc #define SID_COLOR_CONTROL ( SID_SVX_START + 417 ) #define SID_ATTR_3D_PERSPECTIVE ( SID_SVX_START + 418 ) #define SID_ATTR_3D_DEPTH ( SID_SVX_START + 419 ) @@ -586,9 +539,7 @@ #define SID_ATTR_3D_FOCAL_LENGTH ( SID_SVX_START + 421 ) #define SID_ATTR_3D_INTERN ( SID_SVX_START + 422 ) #define SID_PSZ_FUNCTION ( SID_SVX_START + 423 ) -//#define SID_AUTO_CORRECT_DLG ( SID_SVX_START + 424 ) -> sfxsids.hrc #define SID_OFASLOTS_START ( SID_SVX_START + 425 ) -//#define SID_SD_AUTOPILOT ( SID_SVX_START + 425 ) -> sfxsids.hrc #define SID_AUTOPILOT SID_SD_AUTOPILOT #define SID_TABLE_INSERT_COL_DLG ( SID_SVX_START + 426 ) @@ -805,7 +756,6 @@ #define SID_ATTR_GRAF_TRANSPARENCE ( SID_SVX_START + 869 ) #define SID_ATTR_GRAF_INVERT ( SID_SVX_START + 870 ) #define SID_ATTR_GRAF_MODE ( SID_SVX_START + 871 ) -//#define SID_COMP_BIBLIOGRAPHY ( SID_SVX_START + 880 ) -> sfxsids.hrc #define SID_ATTR_GRAF_KEEP_ZOOM ( SID_SVX_START + 882 ) #define SID_ATTR_GRAF_CROP ( SID_SVX_START + 883 ) #define SID_ATTR_GRAF_FRMSIZE ( SID_SVX_START + 884 ) @@ -834,7 +784,6 @@ #define SID_ATTR_ALIGN_HYPHENATION ( SID_SVX_START + 931 ) #define SID_ATTR_NUMBERFORMAT_SOURCE ( SID_SVX_START + 932 ) #define SID_ATTR_AUTO_COLOR_INVALID ( SID_SVX_START + 933 ) -//#define SID_ADDRESS_DATA_SOURCE ( SID_SVX_START + 934 ) -> sfxsids.hrc #define SID_RULER_BORDER_DISTANCE ( SID_SVX_START + 935 ) #define SID_INSERT_DATEFIELD ( SID_SVX_START + 936 ) #define SID_INSERT_TIMEFIELD ( SID_SVX_START + 937 ) |