diff options
author | Caolán McNamara <caolanm@redhat.com> | 2011-08-03 22:25:06 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2011-08-04 09:36:47 +0100 |
commit | 9c0bcbaa53871c1f416828b21695e8ce6eb82e7e (patch) | |
tree | 4fbc555aa7d09f8cb7c611809aca5f3338cb03f1 /tools | |
parent | 7ffcbeb77bc40517a86c3e86b07034f5ee42cf6b (diff) |
callcatcher: remove unused methods
Diffstat (limited to 'tools')
-rw-r--r-- | tools/inc/tools/cachestr.hxx | 7 | ||||
-rw-r--r-- | tools/inc/tools/stream.hxx | 1 | ||||
-rw-r--r-- | tools/inc/tools/unqid.hxx | 2 | ||||
-rw-r--r-- | tools/inc/tools/zcodec.hxx | 1 | ||||
-rw-r--r-- | tools/source/memtools/unqidx.cxx | 37 | ||||
-rw-r--r-- | tools/source/stream/cachestr.cxx | 55 | ||||
-rw-r--r-- | tools/source/stream/strmunx.cxx | 12 | ||||
-rw-r--r-- | tools/source/stream/strmwnt.cxx | 12 | ||||
-rw-r--r-- | tools/source/zcodec/zcodec.cxx | 11 |
9 files changed, 2 insertions, 136 deletions
diff --git a/tools/inc/tools/cachestr.hxx b/tools/inc/tools/cachestr.hxx index adb9aacc28d2..0d88bca455d4 100644 --- a/tools/inc/tools/cachestr.hxx +++ b/tools/inc/tools/cachestr.hxx @@ -50,8 +50,6 @@ private: SvStream* pCurrentStream; TempFile* pTempFile; - Link aFilenameLinkHdl; - TOOLS_DLLPRIVATE virtual sal_uIntPtr GetData( void* pData, sal_uIntPtr nSize ); TOOLS_DLLPRIVATE virtual sal_uIntPtr PutData( const void* pData, sal_uIntPtr nSize ); TOOLS_DLLPRIVATE virtual sal_uIntPtr SeekPos( sal_uIntPtr nPos ); @@ -60,13 +58,8 @@ private: public: SvCacheStream( sal_uIntPtr nMaxMemSize = 0 ); - SvCacheStream( const String &rFileName, - sal_uIntPtr nExpectedSize = 0, - sal_uIntPtr nMaxMemSize = 0 ); ~SvCacheStream(); - void SetFilenameHdl( const Link& rLink); - const Link& GetFilenameHdl() const; void SetFilename( const String& rFN ) { aFileName = rFN; } // darf nur vom FilenameHdl gerufen werden! const String& GetFilename() const { return aFileName; } diff --git a/tools/inc/tools/stream.hxx b/tools/inc/tools/stream.hxx index 0bd7fb654136..5323e3cca40d 100644 --- a/tools/inc/tools/stream.hxx +++ b/tools/inc/tools/stream.hxx @@ -608,7 +608,6 @@ public: void Open( const String& rFileName, StreamMode eOpenMode ); void Close(); - void ReOpen(); // Aufruf nach Close, FilePointer == 0 sal_Bool IsOpen() const { return bIsOpen; } sal_Bool IsLocked() const { return ( nLockCounter!=0 ); } virtual sal_uInt16 IsA() const; diff --git a/tools/inc/tools/unqid.hxx b/tools/inc/tools/unqid.hxx index 9e05b44b4437..1ae6fa4344ae 100644 --- a/tools/inc/tools/unqid.hxx +++ b/tools/inc/tools/unqid.hxx @@ -85,7 +85,6 @@ class TOOLS_DLLPUBLIC UniqueIdContainer : private UniqueIndex public: // Irgend etwas mit protected falsch void Clear( sal_Bool bAll ); - UniqueItemId CreateIdProt( sal_uIntPtr nId ); public: UniqueIdContainer( sal_uIntPtr _nStartIndex, @@ -104,7 +103,6 @@ public: { return UniqueIndex::IsIndexValid( nIndex ); } UniqueItemId CreateId(); - static UniqueItemId CreateFreeId( sal_uIntPtr nId ); // freies Id }; #endif // _UNQID_HXX diff --git a/tools/inc/tools/zcodec.hxx b/tools/inc/tools/zcodec.hxx index 578f367b4cdd..644a225f0c7a 100644 --- a/tools/inc/tools/zcodec.hxx +++ b/tools/inc/tools/zcodec.hxx @@ -112,7 +112,6 @@ public: void SetBreak( sal_uIntPtr ); sal_uIntPtr GetBreak( void ); void SetCRC( sal_uIntPtr nCurrentCRC ); - sal_uIntPtr UpdateCRC( sal_uIntPtr nLatestCRC, sal_uIntPtr nSource ); sal_uIntPtr UpdateCRC( sal_uIntPtr nLatestCRC, sal_uInt8* pSource, long nDatSize ); sal_uIntPtr GetCRC(); }; diff --git a/tools/source/memtools/unqidx.cxx b/tools/source/memtools/unqidx.cxx index 278199333e37..9195c820dc6c 100644 --- a/tools/source/memtools/unqidx.cxx +++ b/tools/source/memtools/unqidx.cxx @@ -468,41 +468,4 @@ UniqueItemId UniqueIdContainer::CreateId() return UniqueItemId( pId ); } -/************************************************************************* -|* -|* UniqueIdContainer::CreateIdProt() -|* -*************************************************************************/ - -UniqueItemId UniqueIdContainer::CreateFreeId( sal_uIntPtr nId ) -{ - // Einfach erzeugen, fuer abgeleitete Klasse - ImpUniqueId * pId = new ImpUniqueId; - pId->nRefCount = 0; - pId->nId = nId; - return UniqueItemId( pId ); -} - -/************************************************************************* -|* -|* UniqueIdContainer::CreateIdProt() -|* -*************************************************************************/ - -UniqueItemId UniqueIdContainer::CreateIdProt( sal_uIntPtr nId ) -{ - if ( IsIndexValid( nId ) ) - return UniqueItemId( (ImpUniqueId *)Get( nId ) ); - - ImpUniqueId * pId; - do - { - pId = new ImpUniqueId; - pId->nRefCount = 1; - pId->nId = Insert( pId ); - } - while( pId->nId != nId ); - return UniqueItemId( pId ); -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/tools/source/stream/cachestr.cxx b/tools/source/stream/cachestr.cxx index ab8a2e7c7806..ae3f0cee8b47 100644 --- a/tools/source/stream/cachestr.cxx +++ b/tools/source/stream/cachestr.cxx @@ -54,33 +54,6 @@ SvCacheStream::SvCacheStream( sal_uIntPtr nMaxMemSize ) /************************************************************************* |* -|* SvCacheStream::SvCacheStream() -|* -*************************************************************************/ - -SvCacheStream::SvCacheStream( const String &rFileName, - sal_uIntPtr nExpectedSize, - sal_uIntPtr nMaxMemSize ) -{ - if( !nMaxMemSize ) - nMaxMemSize = 20480; - - if( nExpectedSize > nMaxMemSize ) - nExpectedSize = nMaxMemSize; // oder gleich in File schreiben - else if( !nExpectedSize ) - nExpectedSize = 4096; - - SvStream::bIsWritable = sal_True; - nMaxSize = nMaxMemSize; - bPersistent = sal_True; - aFileName = rFileName; - pSwapStream = 0; - pCurrentStream = new SvMemoryStream( nExpectedSize ); - pTempFile = 0; -} - -/************************************************************************* -|* |* SvCacheStream::~SvCacheStream() |* *************************************************************************/ @@ -112,22 +85,8 @@ void SvCacheStream::SwapOut() { if( !pSwapStream && !aFileName.Len() ) { - if (aFilenameLinkHdl.IsSet()) - { - // pSwapStream wird zum Schutz gegen Reentranz genutzt - pSwapStream = pCurrentStream; - Link aLink( aFilenameLinkHdl ); - aFilenameLinkHdl = Link(); - aLink.Call(this); - // pSwapStream nur zuruecksetzen, wenn nicht ueber - // SetSwapStream geaendert - if( pSwapStream == pCurrentStream ) pSwapStream = 0; - } - else - { - pTempFile = new TempFile; - aFileName = pTempFile->GetName(); - } + pTempFile = new TempFile; + aFileName = pTempFile->GetName(); } sal_uIntPtr nPos = pCurrentStream->Tell(); @@ -236,14 +195,4 @@ sal_uIntPtr SvCacheStream::GetSize() return nLength; } -void SvCacheStream::SetFilenameHdl( const Link& rLink) -{ - aFilenameLinkHdl = rLink; -} - -const Link& SvCacheStream::GetFilenameHdl() const -{ - return aFilenameLinkHdl; -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/tools/source/stream/strmunx.cxx b/tools/source/stream/strmunx.cxx index 9c84eeae54f8..5c7412208905 100644 --- a/tools/source/stream/strmunx.cxx +++ b/tools/source/stream/strmunx.cxx @@ -728,18 +728,6 @@ void SvFileStream::Open( const String& rFilename, StreamMode nOpenMode ) /************************************************************************* |* -|* SvFileStream::ReOpen() -|* -*************************************************************************/ - -void SvFileStream::ReOpen() -{ - if ( !bIsOpen && aFilename.Len() ) - Open( aFilename, eStreamMode ); -} - -/************************************************************************* -|* |* SvFileStream::Close() |* *************************************************************************/ diff --git a/tools/source/stream/strmwnt.cxx b/tools/source/stream/strmwnt.cxx index 0e2caca40f62..5ccaf4123493 100644 --- a/tools/source/stream/strmwnt.cxx +++ b/tools/source/stream/strmwnt.cxx @@ -508,18 +508,6 @@ void SvFileStream::Open( const String& rFilename, StreamMode nMode ) /************************************************************************* |* -|* SvFileStream::ReOpen() -|* -*************************************************************************/ - -void SvFileStream::ReOpen() -{ - if( !bIsOpen && aFilename.Len() ) - Open( aFilename, eStreamMode ); -} - -/************************************************************************* -|* |* SvFileStream::Close() |* *************************************************************************/ diff --git a/tools/source/zcodec/zcodec.cxx b/tools/source/zcodec/zcodec.cxx index 2386415a4266..a00957ba78f4 100644 --- a/tools/source/zcodec/zcodec.cxx +++ b/tools/source/zcodec/zcodec.cxx @@ -463,17 +463,6 @@ void ZCodec::ImplInitBuf ( sal_Bool nIOFlag ) // ------------------------------------------------------------------------ -sal_uIntPtr ZCodec::UpdateCRC ( sal_uIntPtr nLatestCRC, sal_uIntPtr nNumber ) -{ - -#ifdef OSL_LITENDIAN - nNumber = SWAPLONG( nNumber ); -#endif - return rtl_crc32( nLatestCRC, &nNumber, 4 ); -} - -// ------------------------------------------------------------------------ - sal_uIntPtr ZCodec::UpdateCRC ( sal_uIntPtr nLatestCRC, sal_uInt8* pSource, long nDatSize) { return rtl_crc32( nLatestCRC, pSource, nDatSize ); |