diff options
author | Caolán McNamara <caolanm@redhat.com> | 2011-11-27 20:54:05 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2011-11-28 09:55:03 +0000 |
commit | 963fd1696cb3563ed434a0af8b13d99145e43073 (patch) | |
tree | 1c2bde4c2b259d056162e87d4f4f548186a0ad31 /vcl | |
parent | 6f33482f8f4329b6c9874397bdb67c1b958b69c2 (diff) |
callcatcher: remove unused methods
Diffstat (limited to 'vcl')
-rw-r--r-- | vcl/inc/vcl/fixed.hxx | 4 | ||||
-rw-r--r-- | vcl/inc/vcl/gdimtf.hxx | 10 | ||||
-rw-r--r-- | vcl/source/control/fixed.cxx | 8 | ||||
-rw-r--r-- | vcl/source/gdi/gdimtf.cxx | 203 |
4 files changed, 1 insertions, 224 deletions
diff --git a/vcl/inc/vcl/fixed.hxx b/vcl/inc/vcl/fixed.hxx index 769a61cd9212..a89490594aff 100644 --- a/vcl/inc/vcl/fixed.hxx +++ b/vcl/inc/vcl/fixed.hxx @@ -186,9 +186,7 @@ public: sal_Bool SetModeImage( const Image& rImage ); const Image& GetModeImage( ) const; - - Point CalcImagePos( const Point& rPos, - const Size& rObjSize, const Size& rWinSize ); +; }; #endif // _SV_FIXED_HXX diff --git a/vcl/inc/vcl/gdimtf.hxx b/vcl/inc/vcl/gdimtf.hxx index e15a536ced0f..aaf0012bb5e1 100644 --- a/vcl/inc/vcl/gdimtf.hxx +++ b/vcl/inc/vcl/gdimtf.hxx @@ -37,7 +37,6 @@ #include <vector> class OutputDevice; -class ImpLabelList; class MetaAction; class MetaCommentAction; class SvStream; @@ -114,7 +113,6 @@ private: GDIMetaFile* pPrev; GDIMetaFile* pNext; OutputDevice* pOutDev; - ImpLabelList* pLabelList; sal_Bool bPause; sal_Bool bRecord; sal_Bool bUseCanvas; @@ -215,7 +213,6 @@ public: void WindNext(); size_t GetActionSize() const; - size_t GetActionPos( const String& rLabel ); void AddAction( MetaAction* pAction ); void AddAction( MetaAction* pAction, size_t nPos ); @@ -225,16 +222,9 @@ public: MetaAction* FirstAction(); MetaAction* NextAction(); MetaAction* GetAction( size_t nAction ) const; - MetaAction* CopyAction( size_t nPos ) const; MetaAction* GetCurAction() const { return GetAction( nCurrentActionElement ); } MetaAction* ReplaceAction( MetaAction* pAction, size_t nAction ); - sal_Bool InsertLabel( const String& rLabel, size_t nActionPos ); - void RemoveLabel( const String& rLabel ); - void RenameLabel( const String& rLabel, const String& rNewLabel ); - size_t GetLabelCount() const; - String GetLabel( size_t nLabel ); - sal_Bool SaveStatus(); const Size& GetPrefSize() const { return aPrefSize; } diff --git a/vcl/source/control/fixed.cxx b/vcl/source/control/fixed.cxx index 29d582db3a75..06060734f02c 100644 --- a/vcl/source/control/fixed.cxx +++ b/vcl/source/control/fixed.cxx @@ -1138,12 +1138,4 @@ const Image& FixedImage::GetModeImage( ) const return maImage; } -// ----------------------------------------------------------------------- - -Point FixedImage::CalcImagePos( const Point& rPos, - const Size& rObjSize, const Size& rWinSize ) -{ - return ImplCalcPos( GetStyle(), rPos, rObjSize, rWinSize ); -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/gdi/gdimtf.cxx b/vcl/source/gdi/gdimtf.cxx index 309c9e2e1fe7..bd6abfba465d 100644 --- a/vcl/source/gdi/gdimtf.cxx +++ b/vcl/source/gdi/gdimtf.cxx @@ -132,106 +132,6 @@ struct ImplBmpReplaceParam const sal_uLong* pTols; }; - -// --------- -// - Label - -// --------- - -struct ImpLabel -{ - String aLabelName; - sal_uLong nActionPos; - - ImpLabel( const String& rLabelName, sal_uLong _nActionPos ) : - aLabelName( rLabelName ), - nActionPos( _nActionPos ) {} -}; - -// ------------- -// - LabelList - -// ------------- - -typedef ::std::vector< ImpLabel* > ImpLabelVector; - -class ImpLabelList -{ -private: - ImpLabelVector aList; - size_t nListPos; - -public: - - ImpLabelList() {} - ImpLabelList( const ImpLabelList& rList ); - ~ImpLabelList(); - - void ImplInsert( ImpLabel* p ) { aList.push_back( p ); } - - ImpLabel* ImplGetLabel( size_t nPos ) const; - ImpLabel* ImplRemove( size_t nPos ); - - size_t ImplGetLabelPos( const String& rLabelName ); - size_t ImplCount() const { return aList.size(); } -}; - -// ------------------------------------------------------------------------ - -ImpLabelList::ImpLabelList( const ImpLabelList& rList ) -{ - for( size_t i = 0, n = rList.ImplCount(); i < n; ++i ) - aList.push_back( new ImpLabel( *rList.ImplGetLabel( i ) ) ); - nListPos = 0; -} - -// ------------------------------------------------------------------------ - -ImpLabelList::~ImpLabelList() -{ - for( size_t i = 0, n = aList.size(); i < n; ++i ) - delete aList[ i ]; - aList.clear(); -} - -// ------------------------------------------------------------------------ - -ImpLabel* ImpLabelList::ImplGetLabel( size_t nPos ) const -{ - return ( nPos < aList.size() ) ? aList[ nPos ] : NULL; -} - -// ------------------------------------------------------------------------ - -ImpLabel* ImpLabelList::ImplRemove( size_t nPos ) -{ - ImpLabel* return_value = NULL; - if ( nPos < aList.size() ) - { - ImpLabelVector::iterator it = aList.begin(); - ::std::advance( it, nPos ); - return_value = *it; - aList.erase( it ); - } - return return_value; -} - -// ------------------------------------------------------------------------ - -size_t ImpLabelList::ImplGetLabelPos( const String& rLabelName ) -{ - size_t nLabelPos = METAFILE_LABEL_NOTFOUND; - - for ( size_t i = 0, n = aList.size(); i < n; ++i ) - { - if ( rLabelName == aList[ i ]->aLabelName ) - { - nLabelPos = i; - break; - } - } - - return nLabelPos; -} - // --------------- // - GDIMetaFile - // --------------- @@ -242,7 +142,6 @@ GDIMetaFile::GDIMetaFile() : pPrev ( NULL ), pNext ( NULL ), pOutDev ( NULL ), - pLabelList ( NULL ), bPause ( sal_False ), bRecord ( sal_False ), bUseCanvas ( sal_False ) @@ -269,11 +168,6 @@ GDIMetaFile::GDIMetaFile( const GDIMetaFile& rMtf ) : aList.push_back( rMtf.GetAction( i ) ); } - if( rMtf.pLabelList ) - pLabelList = new ImpLabelList( *rMtf.pLabelList ); - else - pLabelList = NULL; - if( rMtf.bRecord ) { Record( rMtf.pOutDev ); @@ -346,11 +240,6 @@ GDIMetaFile& GDIMetaFile::operator=( const GDIMetaFile& rMtf ) aList.push_back( rMtf.GetAction( i ) ); } - if( rMtf.pLabelList ) - pLabelList = new ImpLabelList( *rMtf.pLabelList ); - else - pLabelList = NULL; - aPrefMapMode = rMtf.aPrefMapMode; aPrefSize = rMtf.aPrefSize; aHookHdlLink = rMtf.aHookHdlLink; @@ -439,9 +328,6 @@ void GDIMetaFile::Clear() for( size_t i = 0, n = aList.size(); i < n; ++i ) aList[ i ]->Delete(); aList.clear(); - - delete pLabelList; - pLabelList = NULL; } // ------------------------------------------------------------------------ @@ -943,95 +829,6 @@ void GDIMetaFile::RemoveAction( size_t nPos ) // ------------------------------------------------------------------------ -MetaAction* GDIMetaFile::CopyAction( size_t nPos ) const -{ - return ( nPos < aList.size() ) ? aList[ nPos ]->Clone() : NULL; -} - -// ------------------------------------------------------------------------ - -size_t GDIMetaFile::GetActionPos( const String& rLabel ) -{ - ImpLabel* pLabel = NULL; - - if( pLabelList ) - pLabel = pLabelList->ImplGetLabel( pLabelList->ImplGetLabelPos( rLabel ) ); - else - pLabel = NULL; - - return( pLabel ? pLabel->nActionPos : METAFILE_LABEL_NOTFOUND ); -} - -// ------------------------------------------------------------------------ - -sal_Bool GDIMetaFile::InsertLabel( const String& rLabel, size_t nActionPos ) -{ - sal_Bool bRet = sal_False; - - if( !pLabelList ) - pLabelList = new ImpLabelList; - - if( pLabelList->ImplGetLabelPos( rLabel ) == METAFILE_LABEL_NOTFOUND ) - { - pLabelList->ImplInsert( new ImpLabel( rLabel, nActionPos ) ); - bRet = sal_True; - } - - return bRet; -} - -// ------------------------------------------------------------------------ - -void GDIMetaFile::RemoveLabel( const String& rLabel ) -{ - if( pLabelList ) - { - const sal_uLong nLabelPos = pLabelList->ImplGetLabelPos( rLabel ); - - if( nLabelPos != METAFILE_LABEL_NOTFOUND ) - delete pLabelList->ImplRemove( nLabelPos ); - } -} - -// ------------------------------------------------------------------------ - -void GDIMetaFile::RenameLabel( const String& rLabel, const String& rNewLabel ) -{ - if( pLabelList ) - { - const sal_uLong nLabelPos = pLabelList->ImplGetLabelPos( rLabel ); - - if ( nLabelPos != METAFILE_LABEL_NOTFOUND ) - pLabelList->ImplGetLabel( nLabelPos )->aLabelName = rNewLabel; - } -} - -// ------------------------------------------------------------------------ - -size_t GDIMetaFile::GetLabelCount() const -{ - return( pLabelList ? pLabelList->ImplCount() : 0UL ); -} - -// ------------------------------------------------------------------------ - -String GDIMetaFile::GetLabel( size_t nLabel ) -{ - String aString; - - if( pLabelList ) - { - const ImpLabel* pLabel = pLabelList->ImplGetLabel( nLabel ); - - if( pLabel ) - aString = pLabel->aLabelName; - } - - return aString; -} - -// ------------------------------------------------------------------------ - sal_Bool GDIMetaFile::SaveStatus() { if ( bRecord ) |