summaryrefslogtreecommitdiff
path: root/sot
diff options
context:
space:
mode:
authorThomas Arnhold <thomas@arnhold.org>2012-02-24 05:33:40 +0100
committerThomas Arnhold <thomas@arnhold.org>2012-02-24 05:33:40 +0100
commit323fd82da0738b126335d4458f8a38abb26fa722 (patch)
tree823cba947c87102b498ff00a3aa6bf2c1a48a419 /sot
parent29b1914fad754ed94e61179f09aac50f1657f2e0 (diff)
unusedcode.easy: Remove SotFactory::TestInvariant()
Also CALL_TEST_INVARIANT is never used again.
Diffstat (limited to 'sot')
-rw-r--r--sot/inc/sot/factory.hxx1
-rw-r--r--sot/inc/sot/object.hxx101
-rw-r--r--sot/inc/sot/storage.hxx2
-rw-r--r--sot/source/base/factory.cxx17
-rw-r--r--sot/source/base/object.cxx17
-rw-r--r--sot/source/sdstor/storage.cxx22
6 files changed, 0 insertions, 160 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();
diff --git a/sot/source/base/factory.cxx b/sot/source/base/factory.cxx
index 830c6beaaf10..b9e29e510cbe 100644
--- a/sot/source/base/factory.cxx
+++ b/sot/source/base/factory.cxx
@@ -189,23 +189,6 @@ void SotFactory::DecSvObjectCount( SotObject * pObj )
}
}
-
-/*************************************************************************
-|* SotFactory::TestInvariant()
-|*
-|* Beschreibung
-*************************************************************************/
-void SotFactory::TestInvariant()
-{
-#ifdef TEST_INVARIANT
- SotData_Impl * pSotData = SOTDATA();
-
- std::list<SotObject*>::iterator it;
- for( it = pSotData->aObjectList.begin(); it != pSotData->aObjectList.end(); ++it )
- (*it)->TestInvariant();
-#endif
-}
-
/*************************************************************************
|* SotFactory::CreateInstance()
|*
diff --git a/sot/source/base/object.cxx b/sot/source/base/object.cxx
index ac8e1287a431..e1d3f67571a7 100644
--- a/sot/source/base/object.cxx
+++ b/sot/source/base/object.cxx
@@ -49,23 +49,6 @@ TYPEINIT1(SotObjectFactory,SotFactory);
SO2_IMPL_BASIC_CLASS_DLL(SotObject,SotObjectFactory,
SvGlobalName( 0xf44b7830, 0xf83c, 0x11d0,
0xaa, 0xa1, 0x0, 0xa0, 0x24, 0x9d, 0x55, 0x90 ) )
-SO2_IMPL_INVARIANT(SotObject)
-
-/*************************************************************************
-|* SotObject::TestMemberObjRef()
-|*
-|* Beschreibung:
-*************************************************************************/
-void SotObject::TestMemberObjRef() {}
-
-/*************************************************************************
-|* SotObject::TestMemberObjRef()
-|*
-|* Beschreibung:
-*************************************************************************/
-#ifdef TEST_INVARIANT
-void SotObject::TestMemberInvariant() {}
-#endif
/*************************************************************************
|* SotObject::SotObject()
diff --git a/sot/source/sdstor/storage.cxx b/sot/source/sdstor/storage.cxx
index 8b7cb30e449f..1006b7c1e5b1 100644
--- a/sot/source/sdstor/storage.cxx
+++ b/sot/source/sdstor/storage.cxx
@@ -67,14 +67,6 @@ TYPEINIT1(SotStorageStreamFactory,SotFactory);
SO2_IMPL_BASIC_CLASS1_DLL(SotStorageStream,SotStorageStreamFactory,SotObject,
SvGlobalName( 0xd7deb420, 0xf902, 0x11d0,
0xaa, 0xa1, 0x0, 0xa0, 0x24, 0x9d, 0x55, 0x90 ) )
-SO2_IMPL_INVARIANT(SotStorageStream)
-
-
-void SotStorageStream::TestMemberObjRef() {}
-
-#ifdef TEST_INVARIANT
-void SotStorageStream::TestMemberInvariant() {}
-#endif
/************************************************************************
|* SotStorageStream::SotStorageStream()
@@ -435,20 +427,6 @@ TYPEINIT1(SotStorageFactory,SotFactory);
SO2_IMPL_BASIC_CLASS1_DLL(SotStorage,SotStorageFactory,SotObject,
SvGlobalName( 0x980ce7e0, 0xf905, 0x11d0,
0xaa, 0xa1, 0x0, 0xa0, 0x24, 0x9d, 0x55, 0x90 ) )
-SO2_IMPL_INVARIANT(SotStorage)
-
-
-/************************************************************************
-|*
-|* SotStorage::Tes*()
-|*
-|* Beschreibung
-*************************************************************************/
-void SotStorage::TestMemberObjRef() {}
-
-#ifdef TEST_INVARIANT
-void SotStorage::TestMemberInvariant() {}
-#endif
/************************************************************************
|*