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 | c2359da8bb2b1cf78726b130cadfd86b490b8cfb (patch) | |
tree | a65ae99f814de453dbe40099ae754c2b9c423f20 | |
parent | 6891707ddffeb647adb18c4f0d869d59106a7a4e (diff) |
callcatcher: remove unused methods
-rw-r--r-- | svtools/inc/svtools/ctrltool.hxx | 1 | ||||
-rw-r--r-- | svtools/inc/svtools/fileview.hxx | 1 | ||||
-rw-r--r-- | svtools/inc/svtools/helpopt.hxx | 2 | ||||
-rw-r--r-- | svtools/inc/svtools/inettbc.hxx | 1 | ||||
-rw-r--r-- | svtools/source/config/helpopt.cxx | 14 | ||||
-rw-r--r-- | svtools/source/contnr/fileview.cxx | 6 | ||||
-rw-r--r-- | svtools/source/control/ctrltool.cxx | 11 | ||||
-rw-r--r-- | svtools/source/control/inettbc.cxx | 5 | ||||
-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 | ||||
-rw-r--r-- | vcl/inc/unx/i18n_xkb.hxx | 4 | ||||
-rw-r--r-- | vcl/inc/vcl/metric.hxx | 4 | ||||
-rw-r--r-- | vcl/source/gdi/metric.cxx | 30 | ||||
-rw-r--r-- | vcl/source/gdi/textlayout.cxx | 4 | ||||
-rw-r--r-- | vcl/unx/generic/app/i18n_xkb.cxx | 16 |
22 files changed, 2 insertions, 235 deletions
diff --git a/svtools/inc/svtools/ctrltool.hxx b/svtools/inc/svtools/ctrltool.hxx index 5375d757e7..1261f63906 100644 --- a/svtools/inc/svtools/ctrltool.hxx +++ b/svtools/inc/svtools/ctrltool.hxx @@ -190,7 +190,6 @@ public: OutputDevice* GetDevice() const { return mpDev; } OutputDevice* GetDevice2() const { return mpDev2; } XubString GetFontMapText( const FontInfo& rInfo ) const; - sal_uInt16 GetFontNameType( const XubString& rFontName ) const; const XubString& GetNormalStr() const { return maNormal; } const XubString& GetItalicStr() const { return maNormalItalic; } diff --git a/svtools/inc/svtools/fileview.hxx b/svtools/inc/svtools/fileview.hxx index b3678d7852..fb83e0a048 100644 --- a/svtools/inc/svtools/fileview.hxx +++ b/svtools/inc/svtools/fileview.hxx @@ -209,7 +209,6 @@ public: void SetConfigString( const String& rCfgStr ); void SetUrlFilter( const IUrlFilter* _pFilter ); - const IUrlFilter* GetUrlFilter( ) const; void EndInplaceEditing( bool _bCancel ); diff --git a/svtools/inc/svtools/helpopt.hxx b/svtools/inc/svtools/helpopt.hxx index bd265fade6..c0f7565dab 100644 --- a/svtools/inc/svtools/helpopt.hxx +++ b/svtools/inc/svtools/helpopt.hxx @@ -58,8 +58,6 @@ public: sal_Bool IsHelpAgentAutoStartMode() const; void SetHelpAgentTimeoutPeriod( sal_Int32 _nSeconds ); sal_Int32 GetHelpAgentTimeoutPeriod( ) const; - void SetHelpAgentRetryLimit( sal_Int32 _nTrials ); - sal_Int32 GetHelpAgentRetryLimit( ) const; const String& GetHelpStyleSheet()const; void SetHelpStyleSheet(const String& rStyleSheet); diff --git a/svtools/inc/svtools/inettbc.hxx b/svtools/inc/svtools/inettbc.hxx index dc08730152..597fc49586 100644 --- a/svtools/inc/svtools/inettbc.hxx +++ b/svtools/inc/svtools/inettbc.hxx @@ -97,7 +97,6 @@ public: void SetFilter(const String& _sFilter); void SetUrlFilter( const IUrlFilter* _pFilter ); - const IUrlFilter* GetUrlFilter( ) const; inline void EnableAutocompletion( sal_Bool _bEnable = sal_True ) { bIsAutoCompleteEnabled = _bEnable; } diff --git a/svtools/source/config/helpopt.cxx b/svtools/source/config/helpopt.cxx index 6badfff726..fd30552456 100644 --- a/svtools/source/config/helpopt.cxx +++ b/svtools/source/config/helpopt.cxx @@ -648,20 +648,6 @@ sal_Bool SvtHelpOptions::IsHelpTips() const // ----------------------------------------------------------------------- -void SvtHelpOptions::SetHelpAgentRetryLimit( sal_Int32 _nTrials ) -{ - pImp->SetHelpAgentRetryLimit( _nTrials ); -} - -// ----------------------------------------------------------------------- - -sal_Int32 SvtHelpOptions::GetHelpAgentRetryLimit( ) const -{ - return pImp->GetHelpAgentRetryLimit( ); -} - -// ----------------------------------------------------------------------- - void SvtHelpOptions::SetHelpAgentTimeoutPeriod( sal_Int32 _nSeconds ) { pImp->SetHelpAgentTimeoutPeriod( _nSeconds ); diff --git a/svtools/source/contnr/fileview.cxx b/svtools/source/contnr/fileview.cxx index e8f6f9cc5b..f9267dea72 100644 --- a/svtools/source/contnr/fileview.cxx +++ b/svtools/source/contnr/fileview.cxx @@ -1790,12 +1790,6 @@ void SvtFileView::SetUrlFilter( const IUrlFilter* _pFilter ) } // ----------------------------------------------------------------------- -const IUrlFilter* SvtFileView::GetUrlFilter( ) const -{ - return mpImp->mpUrlFilter; -} - -// ----------------------------------------------------------------------- void SvtFileView::StateChanged( StateChangedType nStateChange ) { if ( nStateChange == STATE_CHANGE_ENABLE ) diff --git a/svtools/source/control/ctrltool.cxx b/svtools/source/control/ctrltool.cxx index b5cfc98f15..768ddd6428 100644 --- a/svtools/source/control/ctrltool.cxx +++ b/svtools/source/control/ctrltool.cxx @@ -598,17 +598,6 @@ XubString FontList::GetFontMapText( const FontInfo& rInfo ) const // ----------------------------------------------------------------------- -sal_uInt16 FontList::GetFontNameType( const XubString& rFontName ) const -{ - ImplFontListNameInfo* pData = ImplFindByName( rFontName ); - if ( pData ) - return pData->mnType; - else - return 0; -} - -// ----------------------------------------------------------------------- - FontInfo FontList::Get( const XubString& rName, const XubString& rStyleName ) const { ImplFontListNameInfo* pData = ImplFindByName( rName ); diff --git a/svtools/source/control/inettbc.cxx b/svtools/source/control/inettbc.cxx index 0dcb4fb4ce..50739d84c0 100644 --- a/svtools/source/control/inettbc.cxx +++ b/svtools/source/control/inettbc.cxx @@ -1352,11 +1352,6 @@ void SvtURLBox::SetUrlFilter( const IUrlFilter* _pFilter ) pImp->pUrlFilter = _pFilter; } -//------------------------------------------------------------------------- -const IUrlFilter* SvtURLBox::GetUrlFilter( ) const -{ - return pImp->pUrlFilter; -} // ----------------------------------------------------------------------------- void SvtURLBox::SetFilter(const String& _sFilter) { diff --git a/tools/inc/tools/cachestr.hxx b/tools/inc/tools/cachestr.hxx index 4126ab3922..0c00e34208 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 7defdef5e5..78a19a1e8a 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 d9c304fb9a..59b352be6c 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 10b464548b..280d74852b 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 dfce665ca5..4433ba2c2a 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 95d3dda750..331628d15e 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 1a136aa9ca..6c34ba7a09 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 ba3c691e85..2dd3b1149b 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 e609c3a82b..aed9a6ff8c 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 ); diff --git a/vcl/inc/unx/i18n_xkb.hxx b/vcl/inc/unx/i18n_xkb.hxx index 210b323821..dc0bf87aad 100644 --- a/vcl/inc/unx/i18n_xkb.hxx +++ b/vcl/inc/unx/i18n_xkb.hxx @@ -54,10 +54,6 @@ public: void Dispatch( XEvent *pEvent ); // keep track of group changes - sal_uInt32 LookupKeysymInGroup( sal_uInt32 nKeyCode, - sal_uInt32 nShiftState, - sal_uInt32 nGroup ) const ; - inline sal_uInt32 GetGroup() const ; // the current keyboard group inline sal_uInt32 GetDefaultGroup() const ; // base group, usually group 1 inline int GetEventBase() const ; diff --git a/vcl/inc/vcl/metric.hxx b/vcl/inc/vcl/metric.hxx index 8061d98c06..32fd7be664 100644 --- a/vcl/inc/vcl/metric.hxx +++ b/vcl/inc/vcl/metric.hxx @@ -54,10 +54,6 @@ public: ~FontInfo(); FontType GetType() const; - sal_Bool IsDeviceFont() const; - sal_Bool SupportsLatin() const; - sal_Bool SupportsCJK() const; - sal_Bool SupportsCTL() const; FontInfo& operator=( const FontInfo& ); sal_Bool operator==( const FontInfo& ) const; diff --git a/vcl/source/gdi/metric.cxx b/vcl/source/gdi/metric.cxx index 09d9bb2765..c3b0f68d51 100644 --- a/vcl/source/gdi/metric.cxx +++ b/vcl/source/gdi/metric.cxx @@ -145,36 +145,6 @@ FontType FontInfo::GetType() const return (mpImplMetric->IsScalable() ? TYPE_SCALABLE : TYPE_RASTER); } -// ----------------------------------------------------------------------- - -sal_Bool FontInfo::IsDeviceFont() const -{ - return mpImplMetric->IsDeviceFont(); -} - -// ----------------------------------------------------------------------- - -sal_Bool FontInfo::SupportsLatin() const -{ - return mpImplMetric->SupportsLatin(); -} - -// ----------------------------------------------------------------------- - -sal_Bool FontInfo::SupportsCJK() const -{ - return mpImplMetric->SupportsCJK(); -} - -// ----------------------------------------------------------------------- - -sal_Bool FontInfo::SupportsCTL() const -{ - return mpImplMetric->SupportsCTL(); -} - -// ======================================================================= - FontMetric::FontMetric( const FontMetric& rMetric ) : FontInfo( rMetric ) {} diff --git a/vcl/source/gdi/textlayout.cxx b/vcl/source/gdi/textlayout.cxx index 2b6d458800..39c13ff3f0 100644 --- a/vcl/source/gdi/textlayout.cxx +++ b/vcl/source/gdi/textlayout.cxx @@ -304,10 +304,6 @@ namespace vcl n /= (double)_zoom.GetDenominator(); return (long)::rtl::math::round( n ); } - long unzoomBy( long _value, const Fraction& _zoom ) - { - return zoomBy( _value, Fraction( _zoom.GetDenominator(), _zoom.GetNumerator() ) ); - } } //-------------------------------------------------------------------- diff --git a/vcl/unx/generic/app/i18n_xkb.cxx b/vcl/unx/generic/app/i18n_xkb.cxx index d7650cc007..30799a18a2 100644 --- a/vcl/unx/generic/app/i18n_xkb.cxx +++ b/vcl/unx/generic/app/i18n_xkb.cxx @@ -118,20 +118,4 @@ SalI18N_KeyboardExtension::Dispatch( XEvent* pEvent ) } } -sal_uInt32 -SalI18N_KeyboardExtension::LookupKeysymInGroup( sal_uInt32 nKeyCode, - sal_uInt32 nShiftState, - sal_uInt32 nGroup ) const -{ - if ( !mbUseExtension ) - return NoSymbol; - - nShiftState &= ShiftMask; - - KeySym nKeySymbol; - nKeySymbol = XkbKeycodeToKeysym( mpDisplay, nKeyCode, nGroup, nShiftState ); - return nKeySymbol; -} - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |