[Libreoffice-commits] .: binfilter/bf_sfx2

David Tardon dtardon at kemper.freedesktop.org
Mon Jan 9 22:25:31 PST 2012


 binfilter/bf_sfx2/source/bastyp/sfx2_bitset.cxx   |   10 ----------
 binfilter/bf_sfx2/source/bastyp/sfx2_minarray.cxx |    6 ------
 2 files changed, 16 deletions(-)

New commits:
commit 6c61a9ba2e9f996dc8c94a7104be8f332bafddcb
Author: Marcel Metz <mmetz at adrian-broher.net>
Date:   Tue Jan 10 07:24:43 2012 +0100

    Remove cruft in debug tools

diff --git a/binfilter/bf_sfx2/source/bastyp/sfx2_bitset.cxx b/binfilter/bf_sfx2/source/bastyp/sfx2_bitset.cxx
index 9fcdce7..042eaa3 100644
--- a/binfilter/bf_sfx2/source/bastyp/sfx2_bitset.cxx
+++ b/binfilter/bf_sfx2/source/bastyp/sfx2_bitset.cxx
@@ -26,7 +26,6 @@
  *
  ************************************************************************/
 
-#include <tools/debug.hxx>
 #ifdef _MSC_VER
 #pragma hdrstop
 #endif
@@ -42,7 +41,6 @@ namespace binfilter {
 
 /*N*/ BitSet BitSet::operator<<( USHORT nOffset ) const
 /*N*/ {
-/*N*/   DBG_MEMTEST();
 /*N*/   // create a work-copy, return it if nothing to shift
 /*N*/   BitSet aSet(*this);
 /*N*/   if ( nOffset == 0 )
@@ -97,12 +95,10 @@ namespace binfilter {
 
 /*N*/ void BitSet::CopyFrom( const BitSet& rSet )
 /*N*/ {
-/*N*/   DBG_MEMTEST();
 /*N*/   nCount = rSet.nCount;
 /*N*/   nBlocks = rSet.nBlocks;
 /*N*/   if ( rSet.nBlocks )
 /*N*/   {
-/*N*/       DBG_MEMTEST();
 /*N*/       pBitmap = new ULONG[nBlocks];
 /*N*/       memcpy( pBitmap, rSet.pBitmap, 4 * nBlocks );
 /*N*/   }
@@ -116,7 +112,6 @@ namespace binfilter {
 
 /*N*/ BitSet::BitSet()
 /*N*/ {
-/*N*/   DBG_MEMTEST();
 /*N*/   nCount = 0;
 /*N*/   nBlocks = 0;
 /*N*/   pBitmap = 0;
@@ -128,7 +123,6 @@ namespace binfilter {
 
 /*N*/ BitSet::BitSet( const BitSet& rOrig )
 /*N*/ {
-/*N*/   DBG_MEMTEST();
 /*N*/   CopyFrom(rOrig);
 /*N*/ }
 
@@ -143,7 +137,6 @@ namespace binfilter {
 
 /*N*/ BitSet::~BitSet()
 /*N*/ {
-/*N*/   DBG_MEMTEST();
 /*N*/     delete [] pBitmap;
 /*N*/ }
 
@@ -168,7 +161,6 @@ namespace binfilter {
 
 /*N*/ BitSet& BitSet::operator-=(USHORT nBit)
 /*N*/ {
-/*N*/   DBG_MEMTEST();
 /*N*/   USHORT nBlock = nBit / 32;
 /*N*/   ULONG nBitVal = 1L << (nBit % 32);
 /*N*/
@@ -190,7 +182,6 @@ namespace binfilter {
 
 /*N*/ BitSet& BitSet::operator|=( const BitSet& rSet )
 /*N*/ {
-/*N*/   DBG_MEMTEST();
 /*N*/   USHORT nMax = Min(nBlocks, rSet.nBlocks);
 /*N*/
 /*N*/   // expand the bitmap
@@ -227,7 +218,6 @@ namespace binfilter {
 
 /*N*/ BitSet& BitSet::operator|=( USHORT nBit )
 /*N*/ {
-/*N*/   DBG_MEMTEST();
 /*N*/   USHORT nBlock = nBit / 32;
 /*N*/   ULONG nBitVal = 1L << (nBit % 32);
 /*N*/
diff --git a/binfilter/bf_sfx2/source/bastyp/sfx2_minarray.cxx b/binfilter/bf_sfx2/source/bastyp/sfx2_minarray.cxx
index bb2a1e5..366d692 100644
--- a/binfilter/bf_sfx2/source/bastyp/sfx2_minarray.cxx
+++ b/binfilter/bf_sfx2/source/bastyp/sfx2_minarray.cxx
@@ -40,7 +40,6 @@ namespace binfilter {
 /*N*/   nGrow( nGrowSize ? nGrowSize : 1 ),
 /*N*/   nUnused( nInitSize )
 /*N*/ {
-/*N*/   DBG_MEMTEST();
 /*N*/   USHORT nMSCBug = nInitSize;
 /*N*/
 /*N*/   if ( nMSCBug > 0 )
@@ -53,7 +52,6 @@ namespace binfilter {
 
 /*N*/ SfxPtrArr::SfxPtrArr( const SfxPtrArr& rOrig )
 /*N*/ {
-/*N*/   DBG_MEMTEST();
 /*N*/   nUsed = rOrig.nUsed;
 /*N*/   nGrow = rOrig.nGrow;
 /*N*/   nUnused = rOrig.nUnused;
@@ -71,7 +69,6 @@ namespace binfilter {
 
 /*N*/ SfxPtrArr::~SfxPtrArr()
 /*N*/ {
-/*N*/   DBG_MEMTEST();
 /*N*/   delete [] pData;
 /*N*/ }
 
@@ -79,7 +76,6 @@ namespace binfilter {
 
 /*N*/ USHORT SfxPtrArr::Remove( USHORT nPos, USHORT nLen )
 /*N*/ {
-/*N*/   DBG_MEMTEST();
 /*N*/   // nLen adjustieren, damit nicht ueber das Ende hinaus geloescht wird
 /*N*/   nLen = Min( (USHORT)(nUsed-nPos), nLen );
 /*N*/
@@ -133,7 +129,6 @@ namespace binfilter {
 
 /*N*/ BOOL SfxPtrArr::Remove( void* aElem )
 /*N*/ {
-/*N*/   DBG_MEMTEST();
 /*N*/   // einfache Aufgaben ...
 /*N*/   if ( nUsed == 0 )
 /*N*/       return FALSE;
@@ -153,7 +148,6 @@ namespace binfilter {
 
 /*N*/ void SfxPtrArr::Insert( USHORT nPos, void* rElem )
 /*N*/ {
-/*N*/   DBG_MEMTEST();
 /*N*/   DBG_ASSERT( sal_Int32(nUsed+1) < sal_Int32( USHRT_MAX / sizeof(void*) ), "array too large" );
 /*N*/   // musz das Array umkopiert werden?
 /*N*/   if ( nUnused == 0 )


More information about the Libreoffice-commits mailing list