diff options
author | Thomas Arnhold <thomas@arnhold.org> | 2012-07-01 18:24:05 +0200 |
---|---|---|
committer | Thomas Arnhold <thomas@arnhold.org> | 2012-07-01 18:33:42 +0200 |
commit | 00240d049790d11c4ef35de7a294819107197efd (patch) | |
tree | 6479f4fee0eac540ca6d0b80552834f2b19e4364 /sfx2 | |
parent | d341aca7f68bc082cdefe4b1176f56c2c14a0322 (diff) |
Remove unused defines
Change-Id: Ic36b131ee9964a6671f7f41e1cad1631c43ad565
Diffstat (limited to 'sfx2')
-rw-r--r-- | sfx2/inc/sfx2/childwin.hxx | 8 | ||||
-rw-r--r-- | sfx2/inc/sfx2/htmlmode.hxx | 20 | ||||
-rw-r--r-- | sfx2/inc/sfx2/linksrc.hxx | 4 | ||||
-rw-r--r-- | sfx2/inc/sfx2/msg.hxx | 5 | ||||
-rw-r--r-- | sfx2/inc/sfx2/sfx.hrc | 11 | ||||
-rw-r--r-- | sfx2/inc/sfx2/sfxbasemodel.hxx | 1 | ||||
-rw-r--r-- | sfx2/inc/sfx2/sfxdefs.hxx | 5 | ||||
-rw-r--r-- | sfx2/inc/sfx2/shell.hxx | 3 | ||||
-rw-r--r-- | sfx2/inc/sfx2/viewsh.hxx | 3 | ||||
-rw-r--r-- | sfx2/source/dialog/templdlg.cxx | 7 | ||||
-rw-r--r-- | sfx2/source/inc/workwin.hxx | 1 | ||||
-rw-r--r-- | sfx2/source/view/impframe.hxx | 7 |
12 files changed, 3 insertions, 72 deletions
diff --git a/sfx2/inc/sfx2/childwin.hxx b/sfx2/inc/sfx2/childwin.hxx index ca6d279c29d1..1911d68641fb 100644 --- a/sfx2/inc/sfx2/childwin.hxx +++ b/sfx2/inc/sfx2/childwin.hxx @@ -339,14 +339,6 @@ public: ((SfxFloatingWindow*)GetWindow())->FillInfo( aInfo ); \ return aInfo; } -#define SFX_IMPL_MODELESSDIALOG(Class, MyID) \ - SFX_IMPL_CHILDWINDOW(Class, MyID) \ - SfxChildWinInfo Class::GetInfo() const \ - { \ - SfxChildWinInfo aInfo = SfxChildWindow::GetInfo(); \ - ((SfxModelessDialog*)GetWindow())->FillInfo( aInfo ); \ - return aInfo; } - #define SFX_IMPL_MODELESSDIALOG_WITHID(Class, MyID) \ SFX_IMPL_CHILDWINDOW_WITHID(Class, MyID) \ SfxChildWinInfo Class::GetInfo() const \ diff --git a/sfx2/inc/sfx2/htmlmode.hxx b/sfx2/inc/sfx2/htmlmode.hxx index 7589dbc3baca..4d5393ce602f 100644 --- a/sfx2/inc/sfx2/htmlmode.hxx +++ b/sfx2/inc/sfx2/htmlmode.hxx @@ -19,7 +19,6 @@ #ifndef _SFX_HTMLMODE_HXX_ #define _SFX_HTMLMODE_HXX_ - #define HTMLMODE_ON 0x0001 #define HTMLMODE_PARA_DISTANCE 0x0004 #define HTMLMODE_FRM_COLUMNS 0x0010 @@ -30,25 +29,6 @@ #define HTMLMODE_RESERVED1 0x4000 #define HTMLMODE_RESERVED0 0x8000 - #endif - - - - - - - - - - - - - - - - - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/inc/sfx2/linksrc.hxx b/sfx2/inc/sfx2/linksrc.hxx index 1a90ec51b525..add2759f8b39 100644 --- a/sfx2/inc/sfx2/linksrc.hxx +++ b/sfx2/inc/sfx2/linksrc.hxx @@ -48,9 +48,9 @@ class String; #ifndef ADVISEMODE_NODATA // Must be the same value as Ole2 ADVF_* #define ADVISEMODE_NODATA 0x01 -//#define ADVISEMODE_PRIMEFIRST 0x02 +// ADVISEMODE_PRIMEFIRST 0x02 #define ADVISEMODE_ONLYONCE 0x04 -//#define ADVISEMODE_DATAONSTOP 0x40 +// ADVISEMODE_DATAONSTOP 0x40 #endif namespace sfx2 diff --git a/sfx2/inc/sfx2/msg.hxx b/sfx2/inc/sfx2/msg.hxx index c4d914b93453..2a6980a6069a 100644 --- a/sfx2/inc/sfx2/msg.hxx +++ b/sfx2/inc/sfx2/msg.hxx @@ -234,11 +234,6 @@ SFX_DECL_TYPE(18); // for SvxSearchItem 0, 0, DisableFlags, UnoName \ } -#define SFX_SLOTMAP_NONE(ShellClass) \ - static SfxFormalArgument a##ShellClass##Args_Impl[1]; \ - static SfxSlot a##ShellClass##Slots_Impl[] = \ - { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } } - #define SFX_ARGUMENT( ArgSlotId, ArgName, ArgTypeId ) \ { (const SfxType*) &a##ArgTypeId##_Impl, ArgName, ArgSlotId } diff --git a/sfx2/inc/sfx2/sfx.hrc b/sfx2/inc/sfx2/sfx.hrc index b975648c4484..64611dcaa1f0 100644 --- a/sfx2/inc/sfx2/sfx.hrc +++ b/sfx2/inc/sfx2/sfx.hrc @@ -43,13 +43,8 @@ // EVENT_APP_END 29999 #define EVENT_OBJ_START 30000 -#define EVENT_OBJ0_START (EVENT_OBJ_START+0x0000) -#define EVENT_OBJ2_START (EVENT_OBJ_START+0x0100) -#define EVENT_OBJ1_START (EVENT_OBJ_START+0x0200) -#define EVENT_OBJ3_START (EVENT_OBJ_START+0x0300) -#define EVENT_OBJ4_START (EVENT_OBJ_START+0x0400) -#define EVENT_SVX_START EVENT_OBJ4_START +#define EVENT_SVX_START (EVENT_OBJ_START+0x0400) // Warning: the following are simultaneously SID_ON_ ... #define SFX_EVENT_CLOSEAPP (EVENT_SFX_START + 1) @@ -112,10 +107,6 @@ //-------------------------------------------------------------------- - -#define SFX_MSG_ENABLEDBMP 1 -#define SFX_MSG_DISABLEDBMP 2 - #define SFX_OBJECTBAR_APPLICATION 0 #define SFX_OBJECTBAR_OBJECT 1 #define SFX_OBJECTBAR_TOOLS 2 diff --git a/sfx2/inc/sfx2/sfxbasemodel.hxx b/sfx2/inc/sfx2/sfxbasemodel.hxx index 82a27c96c75d..b8c4ad481db4 100644 --- a/sfx2/inc/sfx2/sfxbasemodel.hxx +++ b/sfx2/inc/sfx2/sfxbasemodel.hxx @@ -137,7 +137,6 @@ #define ELEMENTEXISTEXCEPTION ::com::sun::star::container::ElementExistException #define XNAMEREPLACE ::com::sun::star::container::XNameReplace #define XINDEXCONTAINER ::com::sun::star::container::XIndexContainer -#define DISPOSEDEXCEPTION ::com::sun::star::lang::DisposedException #define DOCEVENTOBJECT ::com::sun::star::document::EventObject #define XDOCEVENTLISTENER ::com::sun::star::document::XEventListener #define XDOCUMENTINFO ::com::sun::star::document::XDocumentInfo diff --git a/sfx2/inc/sfx2/sfxdefs.hxx b/sfx2/inc/sfx2/sfxdefs.hxx index 8fd9b75cbf33..cca545f7e2f7 100644 --- a/sfx2/inc/sfx2/sfxdefs.hxx +++ b/sfx2/inc/sfx2/sfxdefs.hxx @@ -20,12 +20,7 @@ #ifndef _SFXDEFS_HXX #define _SFXDEFS_HXX -#define MESSAGEFILE_SDM_EXT "sdm" // Extension for the new Formats -#define MESSAGEFILE_EXT "smd" // Extension for Single-Mail/News-Files -#define MESSAGETEMPFILE_EXT "sd~" // Extension for Mail/News-TempFiles - #define SfxFilterFlags sal_uLong -#define PRODUCT_VERSION "5.0" #endif diff --git a/sfx2/inc/sfx2/shell.hxx b/sfx2/inc/sfx2/shell.hxx index 0d51c20ac10b..1dec7628c4ea 100644 --- a/sfx2/inc/sfx2/shell.hxx +++ b/sfx2/inc/sfx2/shell.hxx @@ -381,9 +381,6 @@ inline void SfxShell::SetPool #define SFX_POPUPMENU_REGISTRATION(rResId) \ GetStaticInterface()->RegisterPopupMenu( rResId ) -#define SFX_OBJECTMENU_REGISTRATION(nPos,rResId) \ - GetStaticInterface()->RegisterObjectMenu( nPos, rResId ) - #define SFX_STATUSBAR_REGISTRATION(rResId) \ GetStaticInterface()->RegisterStatusBar( rResId ) diff --git a/sfx2/inc/sfx2/viewsh.hxx b/sfx2/inc/sfx2/viewsh.hxx index d2da4cbe7312..f2a1841b34d2 100644 --- a/sfx2/inc/sfx2/viewsh.hxx +++ b/sfx2/inc/sfx2/viewsh.hxx @@ -131,9 +131,6 @@ public: \ #define SFX_VIEW_REGISTRATION(DocClass) \ DocClass::Factory().RegisterViewFactory( Factory() ) -#define SFX_REGISTER_VIEW(ViewShellClass) \ - Factory().RegisterViewFactory( ViewShellClass::Factory() ) - class SfxInPlaceClient; typedef ::std::vector< SfxInPlaceClient* > SfxInPlaceClientList; diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx index 5bfc0028f355..8991589f1690 100644 --- a/sfx2/source/dialog/templdlg.cxx +++ b/sfx2/source/dialog/templdlg.cxx @@ -96,13 +96,6 @@ static sal_uInt16 nLastItemId = USHRT_MAX; // filter box has maximum 12 entries visible #define MAX_FILTER_ENTRIES 12 -// Special constant to save hierarchical mode -// We've to use this hack since this is not the -// index in the filter listbox that is saved but the -// index in the filters list and hierarchical is not -// in it -#define HIERARCHICAL_FILTER_INDEX 0xfffe // 0xffff is reserved - //========================================================================= TYPEINIT0(SfxCommonTemplateDialog_Impl); diff --git a/sfx2/source/inc/workwin.hxx b/sfx2/source/inc/workwin.hxx index f4dd3c5d45f2..cf159a6dbceb 100644 --- a/sfx2/source/inc/workwin.hxx +++ b/sfx2/source/inc/workwin.hxx @@ -97,7 +97,6 @@ struct SfxStatBar_Impl #define CHILD_NOT_HIDDEN 2 // not disabled through HideChildWindow #define CHILD_FITS_IN 4 // not too large for output size of the parent #define CHILD_VISIBLE (CHILD_NOT_HIDDEN | CHILD_ACTIVE | CHILD_FITS_IN) -#define CHILD_ISVISIBLE (CHILD_NOT_HIDDEN | CHILD_ACTIVE) struct SfxChild_Impl { diff --git a/sfx2/source/view/impframe.hxx b/sfx2/source/view/impframe.hxx index ed28436493c4..32eefc6fa810 100644 --- a/sfx2/source/view/impframe.hxx +++ b/sfx2/source/view/impframe.hxx @@ -34,13 +34,6 @@ class SfxObjectShell; #include <sfx2/viewsh.hxx> #include <sfx2/sfxuno.hxx> -#ifndef FRAME_SEARCH_PARENT -#define FRAME_SEARCH_PARENT 0x00000001 -#define FRAME_SEARCH_SELF 0x00000002 -#define FRAME_SEARCH_CHILDREN 0x00000004 -#define FRAME_SEARCH_CREATE 0x00000008 -#endif - class SfxFrame_Impl : public SfxBroadcaster, public SvCompatWeakBase { public: |