diff options
author | Thomas Arnhold <thomas@arnhold.org> | 2012-08-05 20:31:14 +0200 |
---|---|---|
committer | Thomas Arnhold <thomas@arnhold.org> | 2012-08-05 20:31:14 +0200 |
commit | e238a59430ce1f2e45469faf14d9c0a4d151b60e (patch) | |
tree | 4c2b4dcef19c5ed3351eb254f0d23cc111fee116 | |
parent | f7853d70bec0e2b049e01b59511ecaae19513ba0 (diff) |
Remove unused macros
Change-Id: I494b76bfd37a255ac4a2ab1cab000ff4af485030
-rw-r--r-- | binfilter/inc/bf_basic/sbxcore.hxx | 15 | ||||
-rw-r--r-- | binfilter/inc/bf_sfx2/docfac.hxx | 128 |
2 files changed, 0 insertions, 143 deletions
diff --git a/binfilter/inc/bf_basic/sbxcore.hxx b/binfilter/inc/bf_basic/sbxcore.hxx index 64ade67df..988720dd1 100644 --- a/binfilter/inc/bf_basic/sbxcore.hxx +++ b/binfilter/inc/bf_basic/sbxcore.hxx @@ -47,11 +47,6 @@ namespace rtl { class OUString; } virtual UINT16 GetVersion() const { return nVer; } \ virtual UINT16 GetSbxId() const { return nSbxId; } -#define SBX_DECL_PERSIST_NODATA_() \ - virtual UINT32 GetCreator() const; \ - virtual UINT16 GetVersion() const; \ - virtual UINT16 GetSbxId() const; - // Diese Version des Makros definiert Load/StorePrivateData()-Methoden #define SBX_DECL_PERSIST( nCre, nSbxId, nVer ) \ @@ -59,16 +54,6 @@ namespace rtl { class OUString; } virtual BOOL StorePrivateData( SvStream& ) const; \ SBX_DECL_PERSIST_NODATA( nCre, nSbxId, nVer ) -#define SBX_DECL_PERSIST_() \ - virtual BOOL LoadPrivateData( SvStream&, USHORT ); \ - virtual BOOL StorePrivateData( SvStream& ) const; \ - SBX_DECL_PERSIST_NODATA_() - -#define SBX_IMPL_PERSIST( C, nCre, nSbxId, nVer ) \ - UINT32 C::GetCreator() const { return nCre; } \ - UINT16 C::GetVersion() const { return nVer; } \ - UINT16 C::GetSbxId() const { return nSbxId; } - namespace binfilter { class SbxBase; diff --git a/binfilter/inc/bf_sfx2/docfac.hxx b/binfilter/inc/bf_sfx2/docfac.hxx index 7b88fce0a..23018efd7 100644 --- a/binfilter/inc/bf_sfx2/docfac.hxx +++ b/binfilter/inc/bf_sfx2/docfac.hxx @@ -147,35 +147,6 @@ private: //========================================================================= -/* SFX_DECL_OBJECTFACTORY - - [Description] - - This macro declares an SfxObjectFactory for subclasses of SfxObjectShell - which are derived too from SfxInPlaceObject and are linked to an executable - or linked to a permanently loaded library. - The macro must be used in the public-area of the declaration of the - SfxObjectShell subclass. -*/ - -#define SFX_DECL_OBJECTFACTORY(Class) \ -private: \ - static SfxObjectFactory* pObjectFactory; \ -protected: \ - virtual BOOL Close(); \ -public: \ - SO2_DECL_BASIC_CLASS(Class) \ - virtual BOOL DoClose(); \ - static SfxObjectShell* CreateObject(SfxObjectCreateMode eMode = SFX_CREATE_MODE_STANDARD); \ - static void InitFactory(); \ - static SfxObjectFactory& Factory() { return *(SfxObjectFactory*)ClassFactory(); } \ - static void RegisterFactory( USHORT nPrio = USHRT_MAX );\ - virtual BOOL DoInitNew( SvStorage * ); \ - virtual void ModifyChanged(); \ - virtual SfxObjectFactory& GetFactory() const - -//------------------------------------------------------------------------- - /* SFX_DECL_OBJECTFACTORY_DLL [Description] @@ -203,107 +174,8 @@ public: \ virtual void ModifyChanged(); \ virtual SfxObjectFactory& GetFactory() const -//-------------------------------------------------------------------- - -/* SFX_DECL_SIMPLE_OBJECTFACTORY - - [Description] - - This macro declares an SfxObjectFactory for subclasses of SfxObjectShell - which are NOT derived from SfxInPlaceObject but are linked to an executable - or to permanently loaded dll. - The macro must be used in the public-area of the declaration of the - SfxObjectShell subclass. -*/ - -#define SFX_DECL_SIMPLE_OBJECTFACTORY(Class) \ -private: \ - static SfxObjectFactory* pObjectFactory; \ -public: \ - static SfxObjectShell* CreateObject(SfxObjectCreateMode eMode = SFX_CREATE_MODE_STANDARD); \ - static void InitFactory(); \ - static SfxObjectFactory& Factory(); \ - static void RegisterFactory( USHORT nPrio = USHRT_MAX );\ - virtual SfxObjectFactory& GetFactory() const - -//------------------------------------------------------------------------- - -/* SFX_DECL_SIMPLE_OBJECTFACTORY_DLL - - [Description] - - This macro declares an SfxObjectFactory for subclasses of SfxObjectShell - which are NOT derived from SfxInPlaceObject and are linked to a DLL that - is loaded on demand. - The macro must be used in the public-area of the declaration of the - SfxObjectShell subclass. -*/ - -#define SFX_DECL_SIMPLE_OBJECTFACTORY_DLL(Class ) \ -private: \ - static SfxObjectFactory* pObjectFactory; \ - static SfxObjectFactory ** GetFactoryAdress(); \ -public: \ - static SfxObjectShell* CreateObject( SfxObjectCreateMode eMode = SFX_CREATE_MODE_STANDARD); \ - static void InitFactory(); \ - static SfxObjectFactory& Factory(); \ - static void RegisterFactory( USHORT nPrio = USHRT_MAX ); \ - virtual SfxObjectFactory& GetFactory() const - //========================================================================= -/* SFX_IMPL_OBJECTFACTORY - - [Description] - - This macro implements a SfxObjectFactory for subclasses of SfxObjectShell - which are derived too from SfxInPlaceObject an are linked to an executable. - - It must be used plain in a C++ source file, perffered where ctor an dtor - of the SfxObjectShell subclass are implemented. -*/ - -#define SFX_IMPL_OBJECTFACTORY( Class, nFlags, ShortName, aGlobName ) \ - \ - SfxObjectFactory* Class::pObjectFactory = 0; \ - \ - SO2_IMPL_BASIC_CLASS1( Class, SfxObjectFactory, SfxInPlaceObject, aGlobName ) \ - \ - SfxObjectShell* Class::CreateObject(SfxObjectCreateMode eMode) \ - { return new Class(eMode); } \ - \ - void Class::RegisterFactory( USHORT nPrio ) \ - { \ - pObjectFactory = &Factory(); \ - pObjectFactory->Construct( \ - nPrio, \ - &Class::CreateObject, \ - nFlags, \ - #ShortName ); \ - pObjectFactory->RegisterInitFactory( &InitFactory ); \ - pObjectFactory->Register(); /* Ole Anmeldung */ \ - } \ - \ - BOOL Class::DoInitNew( SvStorage *pStor ) \ - { return SfxObjectShell::DoInitNew(pStor); } \ - \ - BOOL Class::DoClose() \ - { return SfxInPlaceObject::DoClose(); } \ - \ - BOOL Class::Close() \ - { SvObjectRef aRef(this); \ - SfxInPlaceObject::Close(); \ - return SfxObjectShell::Close(); } \ - \ - void Class::ModifyChanged() \ - { SfxObjectShell::ModifyChanged(); } \ - \ - SfxObjectFactory& Class::GetFactory() const \ - { return *(SfxObjectFactory*)ClassFactory(); } \ - \ - void Class::InitFactory() - -//--------------------------------------------------------------------------- /* SFX_IMPL_MODULE_LIB [Beschreibung] |