diff options
| author | Thomas Arnhold <thomas@arnhold.org> | 2012-02-24 05:33:40 +0100 |
|---|---|---|
| committer | Thomas Arnhold <thomas@arnhold.org> | 2012-02-24 05:33:40 +0100 |
| commit | 323fd82da0738b126335d4458f8a38abb26fa722 (patch) | |
| tree | 823cba947c87102b498ff00a3aa6bf2c1a48a419 /sot/inc | |
| parent | 29b1914fad754ed94e61179f09aac50f1657f2e0 (diff) | |
unusedcode.easy: Remove SotFactory::TestInvariant()
Also CALL_TEST_INVARIANT is never used again.
Diffstat (limited to 'sot/inc')
| -rw-r--r-- | sot/inc/sot/factory.hxx | 1 | ||||
| -rw-r--r-- | sot/inc/sot/object.hxx | 101 | ||||
| -rw-r--r-- | sot/inc/sot/storage.hxx | 2 |
3 files changed, 0 insertions, 104 deletions
diff --git a/sot/inc/sot/factory.hxx b/sot/inc/sot/factory.hxx index 28f4cd687f06..4655d2644247 100644 --- a/sot/inc/sot/factory.hxx +++ b/sot/inc/sot/factory.hxx @@ -58,7 +58,6 @@ public: TYPEINFO(); static void IncSvObjectCount( SotObject * = NULL ); static void DecSvObjectCount( SotObject * = NULL ); - static void TestInvariant(); static const SotFactory * Find( const SvGlobalName & ); diff --git a/sot/inc/sot/object.hxx b/sot/inc/sot/object.hxx index 45c317c2ebff..1d98d44f916b 100644 --- a/sot/inc/sot/object.hxx +++ b/sot/inc/sot/object.hxx @@ -37,106 +37,6 @@ /************************************************************************* *************************************************************************/ -#define TEST_INVARIANT -#ifdef TEST_INVARIANT -#define SO2_DECL_INVARIANT() \ - virtual void TestObjRef(); \ - void TestMemberObjRef(); \ - virtual void TestInvariant(); \ - void TestMemberInvariant(); - -#define SO2_IMPL_INVARIANT(ClassName) \ -void ClassName::TestObjRef() \ -{ \ - TestMemberObjRef(); \ -} \ -void ClassName::TestInvariant() \ -{ \ - TestMemberInvariant(); \ -} - -#define SO2_IMPL_INVARIANT1(ClassName,Super1) \ -void ClassName::TestObjRef() \ -{ \ - TestMemberObjRef(); \ - Super1::TestObjRef(); \ -} \ -void ClassName::TestInvariant() \ -{ \ - TestMemberInvariant(); \ - Super1::TestInvariant(); \ -} - -#define SO2_IMPL_INVARIANT2(ClassName,Super1,Super2) \ -void ClassName::TestObjRef() \ -{ \ - TestMemberObjRef(); \ - Super1::TestObjRef(); \ - Super2::TestObjRef(); \ -} \ -void ClassName::TestInvariant() \ -{ \ - TestMemberInvariant(); \ - Super1::TestInvariant(); \ - Super2::TestInvariant(); \ -} - -#define SO2_IMPL_INVARIANT3(ClassName,Super1,Super2,Super3) \ -void ClassName::TestObjRef() \ -{ \ - TestMemberObjRef(); \ - Super1::TestObjRef(); \ - Super2::TestObjRef(); \ - Super3::TestObjRef(); \ -} \ -void ClassName::TestInvariant() \ -{ \ - TestMemberInvariant(); \ - Super1::TestInvariant(); \ - Super2::TestInvariant(); \ - Super3::TestInvariant(); \ -} - -#define SO2_IMPL_INVARIANT4(ClassName,Super1,Super2,Super3,Super4) \ -void ClassName::TestObjRef() \ -{ \ - TestMemberObjRef(); \ - Super1::TestObjRef(); \ - Super2::TestObjRef(); \ - Super3::TestObjRef(); \ - Super4::TestObjRef(); \ -} \ -void ClassName::TestInvariant() \ -{ \ - TestMemberInvariant(); \ - Super1::TestInvariant(); \ - Super2::TestInvariant(); \ - Super3::TestInvariant(); \ - Super4::TestInvariant(); \ -} - -#ifdef DBG_UTIL -#define CALL_TEST_INVARIANT() SotFactory::TestInvariant() -#else -#define CALL_TEST_INVARIANT() -#endif // DBG_UTIL - -#else // TEST_INVARIANT - -#define SO2_DECL_INVARIANT() - -#define SO2_IMPL_INVARIANT(ClassName) -#define SO2_IMPL_INVARIANT1(ClassName,Super1) -#define SO2_IMPL_INVARIANT2(ClassName,Super1,Super2) -#define SO2_IMPL_INVARIANT3(ClassName,Super1,Super2,Super3) -#define SO2_IMPL_INVARIANT4(ClassName,Super1,Super2,Super3,Super4) - -#define CALL_TEST_INVARIANT() - -#endif // TEST_INVARIANT - -/************************************************************************** -**************************************************************************/ #define SO2_DECL_BASIC_CLASS_DLL(ClassName,FacName) \ private: \ static SotFactory ** GetFactoryAdress() \ @@ -400,7 +300,6 @@ protected: public: SotObject(); SO2_DECL_BASIC_CLASS_DLL(SotObject,SOTDATA()) - SO2_DECL_INVARIANT() // Nur damit die Makros in So3 nicht ganz ausufern virtual IUnknown * GetInterface( const SvGlobalName & ); diff --git a/sot/inc/sot/storage.hxx b/sot/inc/sot/storage.hxx index 2057bacdca54..b77d6dd13a31 100644 --- a/sot/inc/sot/storage.hxx +++ b/sot/inc/sot/storage.hxx @@ -79,7 +79,6 @@ public: SotStorageStream( BaseStorageStream *pStm ); SotStorageStream(); SO2_DECL_BASIC_CLASS_DLL(SotStorageStream,SOTDATA()) - SO2_DECL_INVARIANT() using SvStream::SyncSvStream; virtual void SyncSvStream(); @@ -143,7 +142,6 @@ public: SotStorage( SvStream * pStm, sal_Bool bDelete ); SotStorage(); SO2_DECL_BASIC_CLASS_DLL(SotStorage,SOTDATA()) - SO2_DECL_INVARIANT() SvMemoryStream * CreateMemoryStream(); const SvStream * GetSvStream(); |