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 /sfx2 | |
parent | 892bb81d17b3351c196661c44fb15b29509c7115 (diff) |
Remove unused defines
Some of them were commented out for documentation purpose.
Change-Id: I29a6b2cbe774b527f0c3a0be5675160817a7f3ce
Diffstat (limited to 'sfx2')
-rw-r--r-- | sfx2/inc/sfx2/evntconf.hxx | 2 | ||||
-rw-r--r-- | sfx2/inc/sfx2/msg.hxx | 15 | ||||
-rw-r--r-- | sfx2/inc/sfx2/prnmon.hxx | 4 | ||||
-rw-r--r-- | sfx2/inc/sfx2/sfxbasemodel.hxx | 2 | ||||
-rw-r--r-- | sfx2/source/appl/newhelp.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/inc/doctemplates.hxx | 1 | ||||
-rw-r--r-- | sfx2/source/inc/eventsupplier.hxx | 2 | ||||
-rw-r--r-- | sfx2/source/inc/sfxtypes.hxx | 7 | ||||
-rw-r--r-- | sfx2/source/view/sfxbasecontroller.cxx | 3 |
9 files changed, 1 insertions, 37 deletions
diff --git a/sfx2/inc/sfx2/evntconf.hxx b/sfx2/inc/sfx2/evntconf.hxx index 5bb5f17453e9..d11154971b79 100644 --- a/sfx2/inc/sfx2/evntconf.hxx +++ b/sfx2/inc/sfx2/evntconf.hxx @@ -48,8 +48,6 @@ class SfxObjectShell; class SvxMacroTableDtor; -#define SFX_NO_EVENT USHRT_MAX - struct SFX2_DLLPUBLIC SfxEventName { sal_uInt16 mnId; diff --git a/sfx2/inc/sfx2/msg.hxx b/sfx2/inc/sfx2/msg.hxx index 2a6980a6069a..70d3468f2c52 100644 --- a/sfx2/inc/sfx2/msg.hxx +++ b/sfx2/inc/sfx2/msg.hxx @@ -196,21 +196,6 @@ SFX_DECL_TYPE(18); // for SvxSearchItem 0, 0, 0, 0, 0, 0, 0 \ } -#define SFX_SLOT_ATTR( id, GroupId, Dummy, ExecMethodPtr, StateMethodPtr, Flags, ItemClass ) \ - { id, GroupId, id, Flags, \ - USHRT_MAX, 0, \ - ExecMethodPtr, \ - StateMethodPtr, \ - (const SfxType*) &a##ItemClass##_Impl, \ - 0, 0, 0, 0, 0, 0, 0 \ - } - -#define SFX_SLOT_ENUM( SlaveId, GroupId, MasterId, Value, Flags ) \ - { SlaveId, GroupId, id, Flags, \ - MasterId, Value, 0, 0, \ - (const SfxType*) &aSfxBoolItem_Impl, \ - 0, 0, 0, 0, 0, 0, 0 \ - } #define SFX_NEW_SLOT_ARG( aShellClass, id, hid, GroupId, pLinked, pNext, ExecMethodPtr, StateMethodPtr, Flags, DisableFlags, ItemClass, nArg0, nArgs, Name, Prop, UnoName ) \ { id, GroupId, hid, Flags | Prop, \ USHRT_MAX, 0, \ diff --git a/sfx2/inc/sfx2/prnmon.hxx b/sfx2/inc/sfx2/prnmon.hxx index 48273cdea55c..180b6418d0c4 100644 --- a/sfx2/inc/sfx2/prnmon.hxx +++ b/sfx2/inc/sfx2/prnmon.hxx @@ -41,10 +41,6 @@ struct SfxPrintProgress_Impl; // ------------------------------------------------------------------------ -#define PAGE_MAX 9999 // max. Number of pages to be printed - -// ------------------------------------------------------------------------ - struct SfxPrintOptDlg_Impl; class SfxPrintOptionsDialog : public ModalDialog { diff --git a/sfx2/inc/sfx2/sfxbasemodel.hxx b/sfx2/inc/sfx2/sfxbasemodel.hxx index 444445115d04..3b9cd64f5b2c 100644 --- a/sfx2/inc/sfx2/sfxbasemodel.hxx +++ b/sfx2/inc/sfx2/sfxbasemodel.hxx @@ -119,7 +119,6 @@ #define XCOMPONENT ::com::sun::star::lang::XComponent #define XMODEL ::com::sun::star::frame::XModel #define XMODEL2 ::com::sun::star::frame::XModel2 -#define XMODIFIABLE ::com::sun::star::util::XModifiable #define XMODIFIABLE2 ::com::sun::star::util::XModifiable2 #define XMODIFYBROADCASTER ::com::sun::star::util::XModifyBroadcaster #define XMODIFYLISTENER ::com::sun::star::util::XModifyListener @@ -161,7 +160,6 @@ #define MUTEX ::osl::Mutex #define UNOTYPE ::com::sun::star::uno::Type #define XVIEWDATASUPPLIER ::com::sun::star::document::XViewDataSupplier -#define XINDEXACCESS ::com::sun::star::container::XIndexAccess #define XTRANSFERABLE ::com::sun::star::datatransfer::XTransferable #define DATAFLAVOR ::com::sun::star::datatransfer::DataFlavor diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx index 09b242d8ce28..2af76a236f98 100644 --- a/sfx2/source/appl/newhelp.cxx +++ b/sfx2/source/appl/newhelp.cxx @@ -149,7 +149,7 @@ using namespace ::comphelper; #define TBI_SEARCHDIALOG 1008 #define TBI_SOURCEVIEW 1009 #define TBI_SELECTIONMODE 1010 -#define TBI_ONSTARTUP 1011 +// TBI_ONSTARTUP 1011 #define CONFIGNAME_HELPWIN DEFINE_CONST_UNICODE("OfficeHelp") #define CONFIGNAME_INDEXWIN DEFINE_CONST_UNICODE("OfficeHelpIndex") diff --git a/sfx2/source/inc/doctemplates.hxx b/sfx2/source/inc/doctemplates.hxx index 48db15ed5369..390d2b722b47 100644 --- a/sfx2/source/inc/doctemplates.hxx +++ b/sfx2/source/inc/doctemplates.hxx @@ -49,7 +49,6 @@ #define XLOCALIZABLE ::com::sun::star::lang::XLocalizable #define XMODEL ::com::sun::star::frame::XModel #define XMULTISERVICEFACTORY ::com::sun::star::lang::XMultiServiceFactory -#define XNAMEACCESS ::com::sun::star::container::XNameAccess #define XSERVICEINFO ::com::sun::star::lang::XServiceInfo #define XSTORABLE ::com::sun::star::frame::XStorable diff --git a/sfx2/source/inc/eventsupplier.hxx b/sfx2/source/inc/eventsupplier.hxx index 4a43c1f88854..63184fe1fb3f 100644 --- a/sfx2/source/inc/eventsupplier.hxx +++ b/sfx2/source/inc/eventsupplier.hxx @@ -70,13 +70,11 @@ namespace comphelper #define XEVENTBROADCASTER ::com::sun::star::document::XEventBroadcaster #define XDOCEVENTLISTENER ::com::sun::star::document::XEventListener #define XEVENTSSUPPLIER ::com::sun::star::document::XEventsSupplier -#define XJOBEXECUTOR ::com::sun::star::task::XJobExecutor #define EVENTOBJECT ::com::sun::star::lang::EventObject #define ILLEGALARGUMENTEXCEPTION ::com::sun::star::lang::IllegalArgumentException #define WRAPPEDTARGETEXCEPTION ::com::sun::star::lang::WrappedTargetException #define ANY ::com::sun::star::uno::Any #define REFERENCE ::com::sun::star::uno::Reference -#define WEAKREFERENCE ::com::sun::star::uno::WeakReference #define RUNTIMEEXCEPTION ::com::sun::star::uno::RuntimeException #define SEQUENCE ::com::sun::star::uno::Sequence #define UNOTYPE ::com::sun::star::uno::Type diff --git a/sfx2/source/inc/sfxtypes.hxx b/sfx2/source/inc/sfxtypes.hxx index 980ae1fa9783..4dd20fead15b 100644 --- a/sfx2/source/inc/sfxtypes.hxx +++ b/sfx2/source/inc/sfxtypes.hxx @@ -148,13 +148,6 @@ struct StringList_Impl : private Resource }; -#define SFX_DEL_PTRARR(pArr) \ - { \ - for ( sal_uInt16 n = (pArr)->Count(); n--; ) \ - delete (pArr)->GetObject(n); \ - DELETEX(pArr); \ - } - class SfxBoolResetter { sal_Bool& _rVar; diff --git a/sfx2/source/view/sfxbasecontroller.cxx b/sfx2/source/view/sfxbasecontroller.cxx index f4b1a7d93d13..9848c94cafb2 100644 --- a/sfx2/source/view/sfxbasecontroller.cxx +++ b/sfx2/source/view/sfxbasecontroller.cxx @@ -98,9 +98,6 @@ #define EVENTOBJECT ::com::sun::star::lang::EventObject #define OTYPECOLLECTION ::cppu::OTypeCollection #define OIMPLEMENTATIONID ::cppu::OImplementationId -#define MUTEXGUARD ::osl::MutexGuard -#define UNOQUERY ::com::sun::star::uno::UNO_QUERY -#define MAPPING ::com::sun::star::uno::Mapping #define XCOMPONENT ::com::sun::star::lang::XComponent #define XINTERFACE ::com::sun::star::uno::XInterface #define XKEYHANDLER ::com::sun::star::awt::XKeyHandler |