diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-03-26 12:24:58 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-03-26 12:24:58 +0100 |
| commit | 622e9d9030d436b1f1be4aeb7facb9553a3f63f5 (patch) | |
| tree | 9dfd9f2b3e7afb02150740ecfa9e3e5942c82640 /include/sot | |
| parent | 5fb78604c1c3e91beb867c352928af9e1ef57a26 (diff) | |
Expand uses of SO2_DECL_BASIC_CLASS_DLL macro
Change-Id: I6bee19954e930248058128c9e01cc23b3395bf20
Diffstat (limited to 'include/sot')
| -rw-r--r-- | include/sot/object.hxx | 23 | ||||
| -rw-r--r-- | include/sot/storage.hxx | 20 |
2 files changed, 27 insertions, 16 deletions
diff --git a/include/sot/object.hxx b/include/sot/object.hxx index 7360789ff6c3..734ea3e97218 100644 --- a/include/sot/object.hxx +++ b/include/sot/object.hxx @@ -25,19 +25,6 @@ #include <tools/ref.hxx> #include <sot/sotdllapi.h> -/************************************************************************* -*************************************************************************/ - -#define SO2_DECL_BASIC_CLASS_DLL(ClassName,FacName) \ -private: \ - static SotFactory ** GetFactoryAdress() \ - { return &(FacName->p##ClassName##Factory); } \ -public: \ - static void * CreateInstance( SotObject ** = NULL ); \ - static SotFactory * ClassFactory(); \ - virtual const SotFactory * GetSvFactory() const; \ - virtual void * Cast( const SotFactory * ); - #define SO2_DECL_BASIC_CLASS(ClassName) \ private: \ static SotFactory * pFactory; \ @@ -280,7 +267,15 @@ protected: virtual bool Close(); public: SotObject(); - SO2_DECL_BASIC_CLASS_DLL(SotObject,SOTDATA()) + +private: + static SotFactory ** GetFactoryAdress() + { return &(SOTDATA()->pSotObjectFactory); } +public: + static void * CreateInstance( SotObject ** = NULL ); + static SotFactory * ClassFactory(); + virtual const SotFactory * GetSvFactory() const; + virtual void * Cast( const SotFactory * ); // Nur damit die Makros in So3 nicht ganz ausufern virtual IUnknown * GetInterface( const SvGlobalName & ); diff --git a/include/sot/storage.hxx b/include/sot/storage.hxx index 38a334e1a804..9613b457d32e 100644 --- a/include/sot/storage.hxx +++ b/include/sot/storage.hxx @@ -65,7 +65,15 @@ public: StorageMode = 0 ); SotStorageStream( BaseStorageStream *pStm ); SotStorageStream(); - SO2_DECL_BASIC_CLASS_DLL(SotStorageStream,SOTDATA()) + +private: + static SotFactory ** GetFactoryAdress() + { return &(SOTDATA()->pSotStorageStreamFactory); } +public: + static void * CreateInstance( SotObject ** = NULL ); + static SotFactory * ClassFactory(); + virtual const SotFactory * GetSvFactory() const; + virtual void * Cast( const SotFactory * ); virtual void ResetError(); @@ -120,7 +128,15 @@ public: SotStorage( bool bUCBStorage, SvStream & rStm ); SotStorage( SvStream * pStm, bool bDelete ); SotStorage(); - SO2_DECL_BASIC_CLASS_DLL(SotStorage,SOTDATA()) + +private: + static SotFactory ** GetFactoryAdress() + { return &(SOTDATA()->pSotStorageFactory); } +public: + static void * CreateInstance( SotObject ** = NULL ); + static SotFactory * ClassFactory(); + virtual const SotFactory * GetSvFactory() const; + virtual void * Cast( const SotFactory * ); SvMemoryStream * CreateMemoryStream(); |