[Libreoffice-commits] .: binfilter/bf_sfx2 binfilter/bf_so3 binfilter/inc
Thomas Arnhold
tarnhold at kemper.freedesktop.org
Thu Feb 23 20:34:42 PST 2012
binfilter/bf_sfx2/source/doc/sfx2_interno.cxx | 2 -
binfilter/bf_so3/source/data/pseudo.cxx | 23 ------------
binfilter/bf_so3/source/inplace/client.cxx | 8 ----
binfilter/bf_so3/source/inplace/embobj.cxx | 6 ---
binfilter/bf_so3/source/inplace/ipclient.cxx | 8 ----
binfilter/bf_so3/source/inplace/ipobj.cxx | 6 ---
binfilter/bf_so3/source/misc/iface.cxx | 17 ---------
binfilter/bf_so3/source/persist/persist.cxx | 49 --------------------------
binfilter/bf_so3/source/persist/svstor.cxx | 13 ------
binfilter/inc/bf_so3/iface.hxx | 21 +++--------
10 files changed, 7 insertions(+), 146 deletions(-)
New commits:
commit 281bc6d11b637b0a99e98d80800c733018687955
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Fri Feb 24 02:10:28 2012 +0100
remove SotFactory::TestInvariant()
diff --git a/binfilter/bf_sfx2/source/doc/sfx2_interno.cxx b/binfilter/bf_sfx2/source/doc/sfx2_interno.cxx
index d8e21a2..9b13fcd 100644
--- a/binfilter/bf_sfx2/source/doc/sfx2_interno.cxx
+++ b/binfilter/bf_sfx2/source/doc/sfx2_interno.cxx
@@ -50,8 +50,6 @@ namespace binfilter {
/*N*/ TYPEINIT1(SfxInPlaceObjectFactory,SvFactory);
/*N*/ SO2_IMPL_CLASS1(SfxInPlaceObject,SfxInPlaceObjectFactory,SvInPlaceObject,
/*N*/ SvGlobalName(0x3C8A87D0L,0x9B53,0x11d3,0x9E,0xCE,0x00,0x50,0x04,0xD7,0x6C,0x4E))
-/*?*/ void SfxInPlaceObject::TestMemberObjRef(){}
-/*?*/ void SfxInPlaceObject::TestMemberInvariant(){}
/*?*/ ::IUnknown* SfxInPlaceObject::GetMemberInterface( const SvGlobalName & ){ return 0L; }
/*N*/ SfxInPlaceObject::SfxInPlaceObject()
diff --git a/binfilter/bf_so3/source/data/pseudo.cxx b/binfilter/bf_so3/source/data/pseudo.cxx
index 170220e..bd35cd2 100644
--- a/binfilter/bf_so3/source/data/pseudo.cxx
+++ b/binfilter/bf_so3/source/data/pseudo.cxx
@@ -155,29 +155,6 @@ SvPseudoObject::~SvPseudoObject()
}
//=========================================================================
-#ifdef TEST_INVARIANT
-
-void SvPseudoObject::TestMemberObjRef()
-/* [Beschreibung]
-
- Siehe <So Debugging>.
-*/
-{}
-
-//=========================================================================
-
-void SvPseudoObject::TestMemberInvariant()
-/* [Beschreibung]
-
- Siehe <So Debugging>.
-*/
-{}
-#endif
-
-
-
-
-//=========================================================================
void SvPseudoObject::FillClass
(
SvGlobalName * pClassName, /* Der Typ der Klasse */
diff --git a/binfilter/bf_so3/source/inplace/client.cxx b/binfilter/bf_so3/source/inplace/client.cxx
index 6866a16..5c4f930 100644
--- a/binfilter/bf_so3/source/inplace/client.cxx
+++ b/binfilter/bf_so3/source/inplace/client.cxx
@@ -243,14 +243,6 @@ SO2_IMPL_STANDARD_CLASS1_DLL(SvEmbeddedClient,SvEmbeddedClientFactory,SvObject,
return NULL;
}
-void SvEmbeddedClient::TestMemberObjRef() {}
-
-#ifdef TEST_INVARIANT
-void SvEmbeddedClient::TestMemberInvariant()
-{
-}
-#endif
-
/************************************************************************
|* SvEmbeddedClient::SvEmbeddedClient()
*************************************************************************/
diff --git a/binfilter/bf_so3/source/inplace/embobj.cxx b/binfilter/bf_so3/source/inplace/embobj.cxx
index c6e7d33..ff7987d 100644
--- a/binfilter/bf_so3/source/inplace/embobj.cxx
+++ b/binfilter/bf_so3/source/inplace/embobj.cxx
@@ -198,12 +198,6 @@ SO2_IMPL_CLASS2_DLL(SvEmbeddedObject,SvFactory,SvPersist,SvPseudoObject,
return NULL;
}
-void SvEmbeddedObject::TestMemberObjRef() {}
-
-#ifdef TEST_INVARIANT
-void SvEmbeddedObject::TestMemberInvariant() {}
-#endif
-
/************************************************************************
|* SvEmbeddedObject::SvEmbeddedObject()
|*
diff --git a/binfilter/bf_so3/source/inplace/ipclient.cxx b/binfilter/bf_so3/source/inplace/ipclient.cxx
index 0409e78..8ad223d 100644
--- a/binfilter/bf_so3/source/inplace/ipclient.cxx
+++ b/binfilter/bf_so3/source/inplace/ipclient.cxx
@@ -96,14 +96,6 @@ SvInPlaceClient::~SvInPlaceClient()
}
//=========================================================================
-void SvInPlaceClient::TestMemberObjRef() {}
-
-//=========================================================================
-#ifdef TEST_INVARIANT
-void SvInPlaceClient::TestMemberInvariant() {}
-#endif
-
-//=========================================================================
BOOL SvInPlaceClient::CanInPlaceActivate() const
/* [Beschreibung]
diff --git a/binfilter/bf_so3/source/inplace/ipobj.cxx b/binfilter/bf_so3/source/inplace/ipobj.cxx
index 21c0c74..3d8ef04 100644
--- a/binfilter/bf_so3/source/inplace/ipobj.cxx
+++ b/binfilter/bf_so3/source/inplace/ipobj.cxx
@@ -56,12 +56,6 @@ SO2_IMPL_STANDARD_CLASS1_DLL(SvInPlaceObject,SvInPlaceObjectFactory,SvEmbeddedOb
return NULL;
}
-void SvInPlaceObject::TestMemberObjRef() {}
-
-#ifdef TEST_INVARIANT
-void SvInPlaceObject::TestMemberInvariant() {}
-#endif
-
/************************************************************************
|* SvInPlaceObject::SvInPlaceObject()
|*
diff --git a/binfilter/bf_so3/source/misc/iface.cxx b/binfilter/bf_so3/source/misc/iface.cxx
index d00b35b..829087d 100644
--- a/binfilter/bf_so3/source/misc/iface.cxx
+++ b/binfilter/bf_so3/source/misc/iface.cxx
@@ -62,23 +62,6 @@ SO2_IMPL_CLASS1_DLL(SvObject,SvObjectFactory,SotObject,
}
/*************************************************************************
-|* SvObject::TestMemberObjRef()
-|*
-|* Beschreibung:
-*************************************************************************/
-void SvObject::TestMemberObjRef() {}
-
-/*************************************************************************
-|* SvObject::TestMemberObjRef()
-|*
-|* Beschreibung:
-*************************************************************************/
-
-#ifdef TEST_INVARIANT
-void SvObject::TestMemberInvariant() {}
-#endif
-
-/*************************************************************************
|* SvObject::SvObject()
|*
|* Beschreibung
diff --git a/binfilter/bf_so3/source/persist/persist.cxx b/binfilter/bf_so3/source/persist/persist.cxx
index 351907e..1b74712 100644
--- a/binfilter/bf_so3/source/persist/persist.cxx
+++ b/binfilter/bf_so3/source/persist/persist.cxx
@@ -242,12 +242,6 @@ SO2_IMPL_STANDARD_CLASS1_DLL(SvObjectContainer,SvObjectContainerFactory,SvObject
return NULL;
}
-#ifdef TEST_INVARIANT
-void SvObjectContainer::TestMemberObjRef() {}
-
-void SvObjectContainer::TestMemberInvariant() {}
-#endif
-
SvObjectContainer::SvObjectContainer()
/* [Beschreibung]
@@ -282,49 +276,6 @@ SO2_IMPL_STANDARD_CLASS1_DLL(SvPersist,SvPersistFactory,SvObjectContainer,
return NULL;
}
-#ifdef TEST_INVARIANT
-void SvPersist::TestMemberObjRef()
-{
- if( pChildList )
- {
- ULONG nCount = pChildList->Count();
- for( ULONG i = 0; i < nCount; i++ )
- {
- SvInfoObject * pEle = pChildList->GetObject( i );
- if( pEle->GetObj() )
- {
- ByteString aTest( "\t\tpChildList[ " );
- aTest += ByteString::CreateFromInt32( i );
- aTest += " ] == ";
- aTest += ByteString::CreateFromInt32( (ULONG)pEle->GetObj() );
- OSL_TRACE( "%s", aTest.GetBuffer() );
- }
- }
- }
- if( aStorage.Is() )
- {
- ByteString aTest( "\t\taStorage == " );
- aTest += ByteString::CreateFromInt32( (ULONG)&aStorage );
- OSL_TRACE( "%s", aTest.GetBuffer() );
- }
-}
-
-void SvPersist::TestMemberInvariant()
-{
-#ifdef DBG_UTIL
- DBG_ASSERT( !(bOpSave || bOpSaveAs), "bOpSave && bOpSaveAs" );
- if( !bIsInit )
- {
- if ( !bCreateTempStor )
- {
- DBG_ASSERT( bOpHandsOff && !aStorage.Is(), "failed: bOpHandsOff && !aStorage.Is()" );
- DBG_ASSERT( !bOpHandsOff && aStorage.Is(), "failed: !bOpHandsOff && aStorage.Is()" );
- }
- }
-#endif
-}
-#endif
-
SvPersist::SvPersist()
: bIsModified ( FALSE )
, bIsInit ( FALSE )
diff --git a/binfilter/bf_so3/source/persist/svstor.cxx b/binfilter/bf_so3/source/persist/svstor.cxx
index 268781e..51d7da8 100644
--- a/binfilter/bf_so3/source/persist/svstor.cxx
+++ b/binfilter/bf_so3/source/persist/svstor.cxx
@@ -64,13 +64,6 @@ SO2_IMPL_STANDARD_CLASS2_DLL(SvStorageStream,SvStorageStreamFactory,SvObject,Sot
return NULL;
}
-void SvStorageStream::TestMemberObjRef() {}
-
-#ifdef TEST_INVARIANT
-void SvStorageStream::TestMemberInvariant() {}
-#endif
-
-
/************************************************************************
|* SvStorageStream::SvStorageStream()
|*
@@ -166,12 +159,6 @@ SO2_IMPL_STANDARD_CLASS2_DLL(SvStorage,SvStorageFactory,SvObject,SotStorage,
return NULL;
}
-void SvStorage::TestMemberObjRef() {}
-
-#ifdef TEST_INVARIANT
-void SvStorage::TestMemberInvariant() {}
-#endif
-
/************************************************************************
|*
|* SvStorage::SvStorage()
diff --git a/binfilter/inc/bf_so3/iface.hxx b/binfilter/inc/bf_so3/iface.hxx
index 9c7c377..e81e5ee 100644
--- a/binfilter/inc/bf_so3/iface.hxx
+++ b/binfilter/inc/bf_so3/iface.hxx
@@ -62,13 +62,11 @@ class SvSoIPCService;
#define SO2_DECL_STANDARD_CLASS_DLL(ClassName,FacName) \
SO2_DECL_BASIC_CLASS_DLL(ClassName,FacName) \
- SO2_DECL_INTERFACE() \
- SO2_DECL_INVARIANT()
+ SO2_DECL_INTERFACE()
#define SO2_DECL_STANDARD_CLASS(ClassName) \
SO2_DECL_BASIC_CLASS(ClassName) \
- SO2_DECL_INTERFACE() \
- SO2_DECL_INVARIANT()
+ SO2_DECL_INTERFACE()
/**************************************************************************
**************************************************************************/
@@ -82,8 +80,7 @@ class SvSoIPCService;
#define SO2_IMPL_CLASS_DLL(ClassName,FactoryName,GlobalName) \
SO2_IMPL_BASIC_CLASS_DLL(ClassName,FactoryName,GlobalName) \
-SO2_IMPL_INTERFACE(ClassName) \
-SO2_IMPL_INVARIANT(ClassName)
+SO2_IMPL_INTERFACE(ClassName)
#define SO2_IMPL_CLASS(ClassName,FactoryName,GlobalName) \
SotFactory * ClassName::pFactory = NULL; \
@@ -102,8 +99,7 @@ SotFactory * ClassName::pFactory = NULL; \
#define SO2_IMPL_CLASS1_DLL(ClassName,FactoryName,Super1,GlobalName) \
SO2_IMPL_BASIC_CLASS1_DLL(ClassName,FactoryName,Super1,GlobalName) \
-SO2_IMPL_INTERFACE1(ClassName,Super1) \
-SO2_IMPL_INVARIANT1(ClassName,Super1)
+SO2_IMPL_INTERFACE1(ClassName,Super1)
#define SO2_IMPL_CLASS1(ClassName,FactoryName,Super1,GlobalName) \
SotFactory * ClassName::pFactory = NULL; \
@@ -132,8 +128,7 @@ SO2_IMPL_CLASS1_DLL(ClassName,FactoryName,Super1, \
#define SO2_IMPL_CLASS2_DLL(ClassName,FactoryName,Super1,Super2,GlobalName) \
SO2_IMPL_BASIC_CLASS2_DLL(ClassName,FactoryName,Super1,Super2,GlobalName) \
-SO2_IMPL_INTERFACE2(ClassName,Super1,Super2) \
-SO2_IMPL_INVARIANT2(ClassName,Super1,Super2)
+SO2_IMPL_INTERFACE2(ClassName,Super1,Super2)
#define SO2_IMPL_CLASS2(ClassName,FactoryName,Super1,Super2,GlobalName) \
SotFactory * ClassName::pFactory = NULL; \
@@ -164,8 +159,7 @@ SotFactory * ClassName::pFactory = NULL; \
#define SO2_IMPL_CLASS3_DLL(ClassName,FactoryName,Super1,Super2,Super3,GlobalName) \
SO2_IMPL_BASIC_CLASS3_DLL(ClassName,FactoryName,Super1,Super2,Super3,GlobalName) \
-SO2_IMPL_INTERFACE3(ClassName,Super1,Super2,Super3) \
-SO2_IMPL_INVARIANT3(ClassName,Super1,Super2,Super3)
+SO2_IMPL_INTERFACE3(ClassName,Super1,Super2,Super3)
#define SO2_IMPL_CLASS3(ClassName,FactoryName,Super1,Super2,Super3,GlobalName) \
SotFactory * ClassName::pFactory = NULL; \
@@ -198,8 +192,7 @@ SotFactory * ClassName::pFactory = NULL; \
#define SO2_IMPL_CLASS4_DLL(ClassName,FactoryName,Super1,Super2,Super3,Super4,GlobalName ) \
SO2_IMPL_BASIC_CLASS4_DLL(ClassName,FactoryName,Super1,Super2,Super3,Super4,GlobalName ) \
-SO2_IMPL_INTERFACE4(ClassName,Super1,Super2,Super3,Super4) \
-SO2_IMPL_INVARIANT4(ClassName,Super1,Super2,Super3,Super4)
+SO2_IMPL_INTERFACE4(ClassName,Super1,Super2,Super3,Super4)
#define SO2_IMPL_CLASS4(ClassName,FactoryName,Super1,Super2,Super3,Super4,GlobalName) \
SotFactory * ClassName::pFactory = NULL; \
More information about the Libreoffice-commits
mailing list