summaryrefslogtreecommitdiff
path: root/svl
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2014-07-24 13:42:00 +0200
committerMichael Stahl <mstahl@redhat.com>2014-07-24 13:45:55 +0200
commit81b594afa7162552fc2489ba0c7e1e8b5addb4f2 (patch)
tree1c15d8269b4c0f9892baf62965de20593fde3651 /svl
parente904562af54545684b32d2042ded6bdb9459edca (diff)
svl: remove some odd and obsolete debugging code related to MI_HATS_REPARIERT
This was apparently disabled before the MI_HATS_REPARIERT check was removed in f03a3edf2523c208948059861e0df48567834d0d, and then yesterday something in the header inclusions changed to enable the DBG macros that still used the removed stuff, but _only_ on Windows... now clean this up. Change-Id: I4222db252f4a886b3497ca0c22dbec26eaa6c994
Diffstat (limited to 'svl')
-rw-r--r--svl/source/inc/poolio.hxx12
-rw-r--r--svl/source/items/itemset.cxx13
2 files changed, 0 insertions, 25 deletions
diff --git a/svl/source/inc/poolio.hxx b/svl/source/inc/poolio.hxx
index 80eaa18f60f8..eca801cf4038 100644
--- a/svl/source/inc/poolio.hxx
+++ b/svl/source/inc/poolio.hxx
@@ -168,18 +168,6 @@ struct SfxItemPool_Impl
};
-
-// IBM-C-Set mag keine doppelten Defines
-#ifdef DBG
-# undef DBG
-#endif
-
-#if defined(DBG_UTIL) && defined(_MSC_VER)
-#define DBG(x) x
-#else
-#define DBG(x)
-#endif
-
#define CHECK_FILEFORMAT( rStream, nTag ) \
{ sal_uInt16 nFileTag; \
rStream.ReadUInt16( nFileTag ); \
diff --git a/svl/source/items/itemset.cxx b/svl/source/items/itemset.cxx
index f773fb5afee7..5a1e64ab7a58 100644
--- a/svl/source/items/itemset.cxx
+++ b/svl/source/items/itemset.cxx
@@ -94,7 +94,6 @@ SfxItemSet::SfxItemSet
_nCount( 0 )
{
DBG_ASSERTWARNING( _pPool == _pPool->GetMasterPool(), "no Master Pool" );
- DBG( _pChildCountCtor; *_pChildCount(this) = 0 );
// DBG_ASSERT( bTotalRanges || abs( &bTotalRanges - this ) < 1000,
// "please use suitable ranges" );
#if defined DBG_UTIL && defined SFX_ITEMSET_NO_DEFAULT_CTOR
@@ -123,7 +122,6 @@ SfxItemSet::SfxItemSet( SfxItemPool& rPool, sal_uInt16 nWhich1, sal_uInt16 nWhic
{
DBG_ASSERT( nWhich1 <= nWhich2, "Invalid range" );
DBG_ASSERTWARNING( _pPool == _pPool->GetMasterPool(), "no Master Pool" );
- DBG( _pChildCountCtor; *_pChildCount(this) = 0 );
InitRanges_Impl(nWhich1, nWhich2);
}
@@ -161,7 +159,6 @@ SfxItemSet::SfxItemSet( SfxItemPool& rPool,
{
DBG_ASSERT( nWh1 <= nWh2, "Invalid range" );
DBG_ASSERTWARNING( _pPool == _pPool->GetMasterPool(), "no Master Pool" );
- DBG( _pChildCountCtor; *_pChildCount(this) = 0 );
if(!nNull)
InitRanges_Impl(
@@ -213,7 +210,6 @@ SfxItemSet::SfxItemSet( SfxItemPool& rPool, const sal_uInt16* pWhichPairTable )
, _nCount(0)
{
DBG_ASSERTWARNING( _pPool == _pPool->GetMasterPool(), "no Master Pool" );
- DBG( _pChildCountCtor; *_pChildCount(this) = 0 );
// pWhichPairTable == 0 ist f"ur das SfxAllEnumItemSet
if ( pWhichPairTable )
@@ -226,8 +222,6 @@ SfxItemSet::SfxItemSet( const SfxItemSet& rASet ):
_nCount( rASet._nCount )
{
DBG_ASSERTWARNING( _pPool == _pPool->GetMasterPool(), "no Master Pool" );
- DBG( _pChildCountCtor; *_pChildCount(this) = 0 );
- DBG( ++*_pChildCount(_pParent) );
// Calculate the attribute count
sal_uInt16 nCnt = 0;
@@ -273,10 +267,6 @@ SfxItemSet::SfxItemSet( const SfxItemSet& rASet ):
SfxItemSet::~SfxItemSet()
{
-#ifdef DBG_UTIL
- DBG( DBG_ASSERT( 0 == *_pChildCount(this), "SfxItemSet: deleting parent-itemset" ) )
-#endif
-
sal_uInt16 nCount = TotalCount();
if( Count() )
{
@@ -303,9 +293,6 @@ SfxItemSet::~SfxItemSet()
if ( _pWhichRanges != _pPool->GetFrozenIdRanges() )
delete[] _pWhichRanges;
_pWhichRanges = 0; // for invariant-testing
-
- DBG( --*_pChildCount(_pParent) );
- DBG( delete _pChildCount(this); _pChildCountDtor );
}