Skip to content

C
core
Kaydet (Commit) 323fd82d authored tarafından Thomas Arnhold's avatar Thomas Arnhold
Dosyalara gözat
Seçenekler

unusedcode.easy: Remove SotFactory::TestInvariant() 

Also CALL_TEST_INVARIANT is never used again.
üst 29b1914f
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 161 deletions
sot/inc/sot/factory.hxx
Dosyayı görüntüle @ 323fd82d
......@@ -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 & );
......
sot/inc/sot/object.hxx
Dosyayı görüntüle @ 323fd82d
......@@ -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 & );
......
sot/inc/sot/storage.hxx
Dosyayı görüntüle @ 323fd82d
......@@ -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();
......
sot/source/base/factory.cxx
Dosyayı görüntüle @ 323fd82d
......@@ -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()
|*
......
sot/source/base/object.cxx
Dosyayı görüntüle @ 323fd82d
......@@ -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()
......
sot/source/sdstor/storage.cxx
Dosyayı görüntüle @ 323fd82d
......@@ -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
/************************************************************************
|*
......
unusedcode.easy
Dosyayı görüntüle @ 323fd82d
......@@ -165,7 +165,6 @@ SortedPositions_SAR::Replace(unsigned int const&, unsigned short)
SortedPositions_SAR::Replace(unsigned int const*, unsigned short, unsigned short)
SortedPositions_SAR::_ForEach(unsigned short, unsigned short, unsigned char (*)(unsigned int const&, void*), void*)
SotExchange::GetExchangeAction(com::sun::star::uno::Reference<com::sun::star::datatransfer::XTransferable> const&, unsigned short, unsigned short, unsigned short, unsigned long&, unsigned short&, unsigned long)
SotFactory::TestInvariant()
SotObject::RemoveOwnerLock()
SotStorage::GetProperty(String const&, String const&, com::sun::star::uno::Any&)
SpanStyleManager::get(WPXString const&) const
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment