From 0c0d24589f167f5f77f3d955ebfa3fc807ad38c4 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Fri, 10 Aug 2012 15:17:51 +0100 Subject: callcatcher: reduce Container, update unused code list Change-Id: I11733daf2668c4142052ceb4498f5500e7e291ef --- tools/inc/tools/contnr.hxx | 1 - tools/source/memtools/contnr.cxx | 140 --------------------------------------- 2 files changed, 141 deletions(-) (limited to 'tools') diff --git a/tools/inc/tools/contnr.hxx b/tools/inc/tools/contnr.hxx index 509659689a6d..bf505f0ea85d 100644 --- a/tools/inc/tools/contnr.hxx +++ b/tools/inc/tools/contnr.hxx @@ -81,7 +81,6 @@ public: void* Replace( void* pNew, void* pOld ) { return Replace( pNew, GetPos( pOld ) ); } - void SetSize( sal_uIntPtr nNewSize ); sal_uIntPtr GetSize() const { return nCount; } sal_uIntPtr Count() const { return nCount; } diff --git a/tools/source/memtools/contnr.cxx b/tools/source/memtools/contnr.cxx index 00c62aa99921..0b7c0d1479f8 100644 --- a/tools/source/memtools/contnr.cxx +++ b/tools/source/memtools/contnr.cxx @@ -953,146 +953,6 @@ void* Container::Replace( void* p, sal_uIntPtr nIndex ) } } -/************************************************************************* -|* -|* Container::SetSize() -|* -*************************************************************************/ - -void Container::SetSize( sal_uIntPtr nNewSize ) -{ - DBG_CHKTHIS( Container, DbgCheckContainer ); - - if ( nNewSize ) - { - // Unterscheiden sich die Groessen - if ( nNewSize != nCount ) - { - CBlock* pTemp; - sal_uIntPtr nTemp; - - // Wird verkleinert - if ( nNewSize < nCount ) - { - pTemp = pFirstBlock; - nTemp = 0; - while ( (nTemp+pTemp->Count()) < nNewSize ) - { - nTemp += pTemp->Count(); - pTemp = pTemp->GetNextBlock(); - } - - // Alle folgenden Bloecke loeschen - sal_Bool bLast = sal_False; - CBlock* pDelNext; - CBlock* pDelBlock = pTemp->GetNextBlock(); - while ( pDelBlock ) - { - // Muss CurrentBlock umgesetzt werden - if ( pDelBlock == pCurBlock ) - bLast = sal_True; - pDelNext = pDelBlock->GetNextBlock(); - delete pDelBlock; - pDelBlock = pDelNext; - } - - // Block in der Groesse anpassen, oder bei Groesse 0 loeschen - if ( nNewSize > nTemp ) - { - pLastBlock = pTemp; - pTemp->SetNextBlock( NULL ); - pTemp->SetSize( (sal_uInt16)(nNewSize-nTemp) ); - } - else - { - pLastBlock = pTemp->GetPrevBlock(); - pLastBlock->SetNextBlock( NULL ); - delete pTemp; - } - - nCount = nNewSize; - if ( bLast ) - { - pCurBlock = pLastBlock; - nCurIndex = pCurBlock->Count()-1; - } - } - else - { - // Auf den letzen Puffer setzen - pTemp = pLastBlock; - nTemp = nNewSize - nCount; - - if ( !pTemp ) - { - // Muss mehr als ein Block angelegt werden - if ( nNewSize <= nBlockSize ) - { - pFirstBlock = new CBlock( (sal_uInt16)nNewSize, NULL ); - pLastBlock = pFirstBlock; - } - else - { - CBlock* pBlock1; - CBlock* pBlock2; - - pFirstBlock = new CBlock( nBlockSize, NULL ); - pBlock1 = pFirstBlock; - nNewSize -= nBlockSize; - - // Solange die Blockgroesse ueberschritten wird, neue Bloecke anlegen - while ( nNewSize > nBlockSize ) - { - pBlock2 = new CBlock( nBlockSize, pBlock1 ); - pBlock1->SetNextBlock( pBlock2 ); - pBlock1 = pBlock2; - nNewSize -= nBlockSize; - } - - pLastBlock = new CBlock( (sal_uInt16)nNewSize, pBlock1 ); - pBlock1->SetNextBlock( pLastBlock ); - } - - pCurBlock = pFirstBlock; - } - // Reicht es, den letzen Puffer in der Groesse anzupassen - else if ( (nTemp+pTemp->Count()) <= nBlockSize ) - pTemp->SetSize( (sal_uInt16)(nTemp+pTemp->Count()) ); - else - { - // Puffer auf max. Blockgroesse setzen - nTemp -= nBlockSize - pTemp->GetSize(); - pTemp->SetSize( nBlockSize ); - - CBlock* pTemp2; - // Solange die Blockgroesse ueberschritten wird, - // neue Bloecke anlegen - while ( nTemp > nBlockSize ) - { - pTemp2 = new CBlock( nBlockSize, pTemp ); - pTemp->SetNextBlock( pTemp2 ); - pTemp = pTemp2; - nTemp -= nBlockSize; - } - - // Den letzten Block anlegen - if ( nTemp ) - { - pLastBlock = new CBlock( (sal_uInt16)nTemp, pTemp ); - pTemp->SetNextBlock( pLastBlock ); - } - else - pLastBlock = pTemp; - } - - nCount = nNewSize; - } - } - } - else - Clear(); -} - /************************************************************************* |* |* Container::Clear() -- cgit