[Libreoffice-commits] core.git: 2 commits - include/sot
Stephan Bergmann
sbergman at redhat.com
Wed Mar 26 05:22:03 PDT 2014
include/sot/object.hxx | 180 ++----------------------------------------------
include/sot/storage.hxx | 20 ++++-
2 files changed, 27 insertions(+), 173 deletions(-)
New commits:
commit 12d30ef0ca9418d6dfa75e2a95f5213961b2fa21
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Mar 26 12:28:00 2014 +0100
Remove unused macros
Change-Id: Ib4838eacd9240664327292bf12c7a14a8cdfbcf1
diff --git a/include/sot/object.hxx b/include/sot/object.hxx
index 734ea3e..fb34846 100644
--- a/include/sot/object.hxx
+++ b/include/sot/object.hxx
@@ -25,18 +25,6 @@
#include <tools/ref.hxx>
#include <sot/sotdllapi.h>
-#define SO2_DECL_BASIC_CLASS(ClassName) \
-private: \
- static SotFactory * pFactory; \
- static SotFactory ** GetFactoryAdress() { return &pFactory; } \
-public: \
- static void * CreateInstance( SotObject ** = NULL ); \
- static SotFactory * ClassFactory(); \
- virtual const SotFactory * GetSvFactory() const; \
- virtual void * Cast( const SotFactory * );
-
-/**************************************************************************
-**************************************************************************/
#define SO2_IMPL_BASIC_CLASS_DLL(ClassName,FactoryName,GlobalName) \
SotFactory * ClassName::ClassFactory() \
{ \
@@ -67,12 +55,6 @@ void * ClassName::Cast( const SotFactory * pFact ) \
return pRet; \
}
-#define SO2_IMPL_BASIC_CLASS(ClassName,FactoryName,GlobalName) \
-SotFactory * ClassName::pFactory = NULL; \
- SO2_IMPL_BASIC_CLASS_DLL(ClassName,FactoryName,GlobalName)
-
-/**************************************************************************
-**************************************************************************/
#define SO2_IMPL_BASIC_CLASS1_DLL(ClassName,FactoryName,Super1,GlobalName)\
SotFactory * ClassName::ClassFactory() \
{ \
@@ -108,145 +90,6 @@ void * ClassName::Cast( const SotFactory * pFact ) \
return pRet; \
}
-#define SO2_IMPL_BASIC_CLASS1(ClassName,FactoryName,Super1,GlobalName) \
-SotFactory * ClassName::pFactory = NULL; \
- SO2_IMPL_BASIC_CLASS1_DLL(ClassName,FactoryName,Super1,GlobalName)
-
-/**************************************************************************
-**************************************************************************/
-#define SO2_IMPL_BASIC_CLASS2_DLL(ClassName,FactoryName,Super1,Super2,GlobalName) \
-SotFactory * ClassName::ClassFactory() \
-{ \
- SotFactory **ppFactory = GetFactoryAdress(); \
- if( !*ppFactory ) \
- { \
- *ppFactory = new FactoryName( GlobalName, \
- OUString( #ClassName ), ClassName::CreateInstance ); \
- (*ppFactory)->PutSuperClass( Super1::ClassFactory() ); \
- (*ppFactory)->PutSuperClass( Super2::ClassFactory() ); \
- } \
- return *ppFactory; \
-} \
-void * ClassName::CreateInstance( SotObject ** ppObj ) \
-{ \
- ClassName * p = new ClassName(); \
- if( ppObj ) \
- *ppObj = p; \
- return p; \
-} \
-const SotFactory * ClassName::GetSvFactory() const \
-{ \
- return ClassFactory(); \
-} \
-void * ClassName::Cast( const SotFactory * pFact ) \
-{ \
- void * pRet = NULL; \
- if( !pFact || pFact == ClassFactory() ) \
- pRet = this; \
- if( !pRet ) \
- pRet = Super1::Cast( pFact ); \
- if( !pRet ) \
- pRet = Super2::Cast( pFact ); \
- return pRet; \
-}
-#define SO2_IMPL_BASIC_CLASS2(ClassName,FactoryName,Super1,Super2,GlobalName) \
-SotFactory * ClassName::pFactory = NULL; \
- SO2_IMPL_BASIC_CLASS2_DLL(ClassName,FactoryName,Super1,Super2,GlobalName)
-
-/**************************************************************************
-**************************************************************************/
-#define SO2_IMPL_BASIC_CLASS3_DLL(ClassName,FactoryName,Super1,Super2,Super3,GlobalName) \
-SotFactory * ClassName::ClassFactory() \
-{ \
- SotFactory **ppFactory = GetFactoryAdress(); \
- if( !*ppFactory ) \
- { \
- *ppFactory = new FactoryName( GlobalName, \
- OUString( #ClassName ), ClassName::CreateInstance ); \
- (*ppFactory)->PutSuperClass( Super1::ClassFactory() ); \
- (*ppFactory)->PutSuperClass( Super2::ClassFactory() ); \
- (*ppFactory)->PutSuperClass( Super3::ClassFactory() ); \
- } \
- return *pFactory; \
-} \
-void * ClassName::CreateInstance( SotObject ** ppObj ) \
-{ \
- ClassName * p = new ClassName(); \
- if( ppObj ) \
- *ppObj = p; \
- return p; \
-} \
-const SotFactory * ClassName::GetSvFactory() const \
-{ \
- return ClassFactory(); \
-} \
-void * ClassName::Cast( const SotFactory * pFact ) \
-{ \
- void * pRet = NULL; \
- if( !pFact || pFact == ClassFactory() ) \
- pRet = this; \
- if( !pRet ) \
- pRet = Super1::Cast( pFact ); \
- if( !pRet ) \
- pRet = Super2::Cast( pFact ); \
- if( !pRet ) \
- pRet = Super3::Cast( pFact ); \
- return pRet; \
-}
-
-#define SO2_IMPL_BASIC_CLASS3(ClassName,FactoryName,Super1,Super2,Super3,GlobalName) \
-SotFactory * ClassName::pFactory = NULL; \
- SO2_IMPL_BASIC_CLASS3_DLL(ClassName,FactoryName,Super1,Super2,Super3,GlobalName)
-
-/**************************************************************************
-**************************************************************************/
-#define SO2_IMPL_BASIC_CLASS4_DLL(ClassName,FactoryName,Super1,Super2,Super3,Super4,GlobalName) \
-SotFactory * ClassName::ClassFactory() \
-{ \
- SotFactory **ppFactory = GetFactoryAdress(); \
- if( !*ppFactory ) \
- { \
- *ppFactory = new SotFactory( GlobalName, \
- OUString( #ClassName ), ClassName::CreateInstance ); \
- (*ppFactory)->PutSuperClass( Super1::ClassFactory() ); \
- (*ppFactory)->PutSuperClass( Super2::ClassFactory() ); \
- (*ppFactory)->PutSuperClass( Super3::ClassFactory() ); \
- (*ppFactory)->PutSuperClass( Super4::ClassFactory() ); \
- } \
- return *ppFactory; \
-} \
-void * ClassName::CreateInstance( SotObject ** ppObj ) \
-{ \
- ClassName * p = new ClassName(); \
- if( ppObj ) \
- *ppObj = p; \
- return p; \
-} \
-const SotFactory * ClassName::GetSvFactory() const \
-{ \
- return ClassFactory(); \
-} \
-void * ClassName::Cast( const SotFactory * pFact ) \
-{ \
- void * pRet = NULL; \
- if( !pFact || pFact == ClassFactory() ) \
- pRet = this; \
- if( !pRet ) \
- pRet = Super1::Cast( pFact ); \
- if( !pRet ) \
- pRet = Super2::Cast( pFact ); \
- if( !pRet ) \
- pRet = Super3::Cast( pFact ); \
- if( !pRet ) \
- pRet = Super4::Cast( pFact ); \
- return pRet; \
-}
-
-#define SO2_IMPL_BASIC_CLASS4(ClassName,FactoryName,Super1,Super2,Super3,Super4,GlobalName) \
-SotFactory * ClassName::pFactory = NULL; \
- SO2_IMPL_BASIC_CLASS4_DLL(ClassName,FactoryName,Super1,Super2,Super3,Super4,GlobalName)
-
-//==================class SotObject========================================
#ifdef _MSC_VER
#pragma warning(disable: 4250)
#endif
commit 622e9d9030d436b1f1be4aeb7facb9553a3f63f5
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Mar 26 12:24:58 2014 +0100
Expand uses of SO2_DECL_BASIC_CLASS_DLL macro
Change-Id: I6bee19954e930248058128c9e01cc23b3395bf20
diff --git a/include/sot/object.hxx b/include/sot/object.hxx
index 7360789..734ea3e 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 38a334e..9613b45 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();
More information about the Libreoffice-commits
mailing list