callcatcher: remove unused methods

rsc/inc/rsctree.hxx

@@ -79,8 +79,6 @@ public:
                         // return ist neue Root
             NameNode*   Remove( NameNode * );
             void        OrderTree();
-            sal_Bool        IsOrderTree() const;
-
 };
 
 /*************************************************************************/

rsc/source/tools/rsctree.cxx

@@ -381,12 +381,6 @@ IMPL_LINK_INLINE_START( OrderCtrl, CallBackFunc, NameNode *, pNext )
 }
 IMPL_LINK_INLINE_END( OrderCtrl, CallBackFunc, NameNode *, pNext )
 
-sal_Bool NameNode::IsOrderTree() const{
-    OrderCtrl aOrder;
-
-    return aOrder.IsOrder( this );
-}
-
 /****************** I d N o d e ******************************************/
 /*************************************************************************
 |*

unusedcode.easy

@@ -114,7 +114,6 @@ FileStream::FileStream(rtl::OString const&, FileAccessMode)
 FixedBorder::FixedBorder(Window*, long)
 FixedBorder::SetBorderType(unsigned short)
 FixedBorder::SetTransparent(unsigned char)
-FixedImage::CalcImagePos(Point const&, Size const&, Size const&)
 FmEntryDataArray::DeleteAndDestroy(unsigned short, unsigned short)
 FmEntryDataArray::Insert(FmEntryData* const&, unsigned short&)
 FmEntryDataArray::Insert(FmEntryData* const*, unsigned short)
@@ -132,14 +131,7 @@ FontStyleMenu::Fill(String const&, FontList const*)
 FontStyleMenu::FontStyleMenu()
 FormattedField::SetValidateText(String const&, String const*)
 FormatterBase::SetFieldText(String const&, unsigned char)
-GDIMetaFile::CopyAction(unsigned long) const
-GDIMetaFile::GetActionPos(String const&)
-GDIMetaFile::GetLabel(unsigned long)
-GDIMetaFile::GetLabelCount() const
-GDIMetaFile::InsertLabel(String const&, unsigned long)
 GDIMetaFile::IsEqual(GDIMetaFile const&) const
-GDIMetaFile::RemoveLabel(String const&)
-GDIMetaFile::RenameLabel(String const&, String const&)
 GDIMetaFile::ReplaceColors(Color const&, Color const&, unsigned long)
 GDIMetaFile::SaveStatus()
 GDIMetaFile::Wind(unsigned long)
@@ -236,7 +228,6 @@ MultiLineEdit::IsFocusSelectionHideEnabled() const
 MultiLineEdit::IsRightToLeft() const
 MultiSelection::Append(long)
 MultiSelection::PrevSelected()
-NameNode::IsOrderTree() const
 NativeNumberWrapper::isValidNatNum(com::sun::star::lang::Locale const&, short) const
 NfCurrencyEntry::ApplyVariableInformation(NfCurrencyEntry const&)
 NfCurrencyEntry::NfCurrencyEntry()

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

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; }

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: */

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 )