callcatcher: remove various unused methods

9 files changed, 1 insertions, 206 deletions

diff --git a/tools/inc/tools/contnr.hxx b/tools/inc/tools/contnr.hxx
index ea70c1756f3a..d086d32ba2f4 100644
--- a/tools/inc/tools/contnr.hxx
+++ b/tools/inc/tools/contnr.hxx
@@ -69,7 +69,6 @@ protected:
     void*       ImpGetObject( sal_uIntPtr nIndex ) const;
     void**      ImpGetOnlyNodes() const;
 #endif
-    void**      GetObjectPtr( sal_uIntPtr nIndex );
 
 public:
                 Container( sal_uInt16 nBlockSize,
@@ -81,14 +80,12 @@ public:
 
     void        Insert( void* p );
     void        Insert( void* p, sal_uIntPtr nIndex );
-    void        Insert( void* pNew, void* pOld );
 
     void*       Remove();
     void*       Remove( sal_uIntPtr nIndex );
     void*       Remove( void* p )
                     { return Remove( GetPos( p ) ); }
 
-    void*       Replace( void* p );
     void*       Replace( void* p, sal_uIntPtr nIndex );
     void*       Replace( void* pNew, void* pOld )
                     { return Replace( pNew, GetPos( pOld ) ); }
@@ -103,8 +100,6 @@ public:
     sal_uIntPtr       GetCurPos() const;
     void*       GetObject( sal_uIntPtr nIndex ) const;
     sal_uIntPtr       GetPos( const void* p ) const;
-    sal_uIntPtr       GetPos( const void* p, sal_uIntPtr nStartIndex,
-                        sal_Bool bForward = sal_True ) const;
 
     void*       Seek( sal_uIntPtr nIndex );
     void*       Seek( void* p ) { return Seek( GetPos( p ) ); }
diff --git a/tools/inc/tools/dynary.hxx b/tools/inc/tools/dynary.hxx
index fb2fcce0d17b..7e174555c1eb 100644
--- a/tools/inc/tools/dynary.hxx
+++ b/tools/inc/tools/dynary.hxx
@@ -55,9 +55,6 @@ public:
 
     sal_uIntPtr       GetIndex( const void* p ) const
                     { return Container::GetPos( p ); }
-    sal_uIntPtr       GetIndex( const void* p, sal_uIntPtr nStartIndex,
-                          sal_Bool bForward = sal_True ) const
-                    { return Container::GetPos( p, nStartIndex, bForward ); }
 
     DynArray&   operator =( const DynArray& rAry )
                     { Container::operator =( rAry ); return *this; }
@@ -92,11 +89,6 @@ public:                                                                 \
                                                                         \
     sal_uIntPtr       GetIndex( const Type p ) const                          \
                     { return DynArray::GetIndex( (const void*)p ); }    \
-    sal_uIntPtr       GetIndex( const Type p, sal_uIntPtr nStartIndex,              \
-                          sal_Bool bForward = sal_True ) const                  \
-                    { return DynArray::GetIndex( (const void*)p,        \
-                                                 nStartIndex,           \
-                                                 bForward ); }          \
                                                                         \
     ClassName&  operator =( const ClassName& rClassName )               \
                     { DynArray::operator =( rClassName );               \
diff --git a/tools/inc/tools/list.hxx b/tools/inc/tools/list.hxx
index 9f920356b489..22cb0be6a340 100644
--- a/tools/inc/tools/list.hxx
+++ b/tools/inc/tools/list.hxx
@@ -105,8 +105,6 @@ public:                                                                 \
                     { return (Type)List::Remove( nIndex ); }            \
     Type        Remove( Type p )                                        \
                     { return (Type)List::Remove( (void*)p ); }          \
-    Type        Replace( Type p )                                       \
-                    { return (Type)List::Replace( (void*)p ); }         \
     Type        Replace( Type p, sal_uIntPtr nIndex )                         \
                     { return (Type)List::Replace( (void*)p, nIndex ); } \
     Type        Replace( Type pNew, Type pOld )                         \
@@ -119,10 +117,6 @@ public:                                                                 \
                     { return (Type)List::GetObject( nIndex ); }         \
     sal_uIntPtr       GetPos( const Type p ) const                            \
                     { return List::GetPos( (const void*)p ); }          \
-    sal_uIntPtr       GetPos( const Type p, sal_uIntPtr nStartIndex,                \
-                        sal_Bool bForward = sal_True ) const                    \
-                    { return List::GetPos( (const void*)p, nStartIndex, \
-                                           bForward ); }                \
                                                                         \
     Type        Seek( sal_uIntPtr nIndex )                                    \
                     { return (Type)List::Seek( nIndex ); }              \
diff --git a/tools/inc/tools/ref.hxx b/tools/inc/tools/ref.hxx
index 9ef9fd0d1776..6629a4f162a6 100644
--- a/tools/inc/tools/ref.hxx
+++ b/tools/inc/tools/ref.hxx
@@ -127,14 +127,11 @@ inline void Insert( EN p )\
 { CN##List::Insert( p ); p->AddRef();}\
 inline void Insert( EN p, sal_uIntPtr nIndex )\
 { CN##List::Insert( p, nIndex ); p->AddRef();}\
-inline void Insert( EN p, EN pOld )\
-{ CN##List::Insert( p, pOld ); p->AddRef();}\
 inline void Append( EN p )\
 { Insert( p, LIST_APPEND );}\
 inline EN   Remove();\
 inline EN   Remove( sal_uIntPtr nIndex );\
 inline EN   Remove( EN p );\
-inline EN   Replace( EN p );\
 inline EN   Replace( EN p, sal_uIntPtr nIndex );\
 inline EN   Replace( EN pNew, EN pOld );\
 inline void Append( const CN##MemberList & );\
@@ -197,11 +194,6 @@ inline EN CN##MemberList::Remove( EN p ) \
     p = CN##List::Remove( p ); \
     if( p ) p->ReleaseReference(); return p; \
 }\
-inline EN CN##MemberList::Replace( EN p ) \
-{\
-    p->AddRef(); p = CN##List::Replace( p ); \
-    if( p ) p->ReleaseReference(); return p; \
-}\
 inline EN CN##MemberList::Replace( EN p, sal_uIntPtr nIndex ) \
 {\
     p->AddRef(); p = CN##List::Replace( p, nIndex ); \
@@ -229,19 +221,15 @@ inline void CN##MemberList::Append( const CN##MemberList & rList )\
 inline Class##MemberList(sal_uInt16 nInitSz,sal_uInt16 nResize);\
 inline void Insert( EntryName p );                      \
 inline void Insert( EntryName p, sal_uIntPtr nIndex );        \
-inline void Insert( EntryName p, EntryName pOld );      \
 inline void Append( EntryName p );                      \
 inline EntryName   Remove();                            \
 inline EntryName   Remove( sal_uIntPtr nIndex );              \
 inline EntryName   Remove( EntryName p );               \
-inline EntryName   Replace( EntryName p );              \
 inline EntryName   Replace( EntryName p, sal_uIntPtr nIndex );\
 inline EntryName   Replace( EntryName pNew, EntryName pOld );\
 inline EntryName   GetCurObject() const;\
 inline EntryName   GetObject( sal_uIntPtr nIndex ) const;\
 inline sal_uIntPtr       GetPos( const EntryName ) const;\
-inline sal_uIntPtr       GetPos( const EntryName, sal_uIntPtr nStartIndex,\
-                           sal_Bool bForward = sal_True ) const;\
 inline EntryName Seek( sal_uIntPtr nIndex );\
 inline EntryName Seek( EntryName p );\
 inline EntryName First();\
@@ -258,8 +246,6 @@ inline void ClassName##MemberList::Insert( EntryName p )\
             {BaseList::Insert(p);}\
 inline void ClassName##MemberList::Insert( EntryName p, sal_uIntPtr nIdx )\
             {BaseList::Insert(p,nIdx);}\
-inline void ClassName##MemberList::Insert( EntryName p, EntryName pOld )\
-            {BaseList::Insert(p,pOld);}\
 inline void ClassName##MemberList::Append( EntryName p )\
             {BaseList::Append(p);}\
 inline EntryName ClassName##MemberList::Remove()\
@@ -268,8 +254,6 @@ inline EntryName ClassName##MemberList::Remove( sal_uIntPtr nIdx )\
             {return (EntryName)BaseList::Remove(nIdx);}\
 inline EntryName ClassName##MemberList::Remove( EntryName p )\
             {return (EntryName)BaseList::Remove(p);}\
-inline EntryName ClassName##MemberList::Replace( EntryName p )\
-            {return (EntryName)BaseList::Replace(p);}\
 inline EntryName ClassName##MemberList::Replace( EntryName p, sal_uIntPtr nIdx )\
             {return (EntryName)BaseList::Replace(p,nIdx);}\
 inline EntryName ClassName##MemberList::Replace( EntryName p, EntryName pOld )\
@@ -293,10 +277,7 @@ inline EntryName ClassName##MemberList::Prev()\
 inline void      ClassName##MemberList::Append( const ClassName##MemberList & rList )\
             {BaseList::Append(rList);}\
 inline sal_uIntPtr   ClassName##MemberList::GetPos( const EntryName p) const\
-            {return BaseList::GetPos( p );}\
-inline sal_uIntPtr   ClassName##MemberList::GetPos\
-                    ( const EntryName p, sal_uIntPtr nStart, sal_Bool bForward ) const\
-            {return BaseList::GetPos( p, nStart, bForward );}
+            {return BaseList::GetPos( p );}
 
 #define SV_DECL_MEMBER_LIST(ClassName,EntryName)\
 class ClassName##MemberList : public SvRefBaseMemberList\
diff --git a/tools/inc/tools/stack.hxx b/tools/inc/tools/stack.hxx
index d3c76d1a0165..a8f8cb5395e3 100644
--- a/tools/inc/tools/stack.hxx
+++ b/tools/inc/tools/stack.hxx
@@ -87,11 +87,6 @@ public:                                                             \
                     { return (Type)Stack::GetObject( nIndex ); }    \
     sal_uIntPtr       GetPos( const Type p ) const                        \
                     { return Stack::GetPos( (const void*)p ); }     \
-    sal_uIntPtr       GetPos( const Type p, sal_uIntPtr nStartIndex,            \
-                        sal_Bool bForward = sal_True ) const                \
-                    { return Stack::GetPos( (const void*)p,         \
-                                            nStartIndex,            \
-                                            bForward ); }           \
                                                                     \
     ClassName&  operator =( const ClassName& rClassName )           \
                     { Stack::operator =( rClassName );              \
diff --git a/tools/inc/tools/urlobj.hxx b/tools/inc/tools/urlobj.hxx
index 6bd65878d7cb..2c18004b7cec 100644
--- a/tools/inc/tools/urlobj.hxx
+++ b/tools/inc/tools/urlobj.hxx
@@ -548,11 +548,6 @@ public:
     inline bool IsEmptyUser() const
     { return m_aUser.isPresent() && m_aUser.isEmpty(); }
 
-    bool hasPassword() const;
-
-    inline bool IsEmptyPass() const
-    { return hasPassword() && m_aAuth.isEmpty(); }
-
     inline rtl::OUString GetUser(DecodeMechanism eMechanism = DECODE_TO_IURI,
                              rtl_TextEncoding eCharset
                                  = RTL_TEXTENCODING_UTF8) const
diff --git a/tools/source/fsys/urlobj.cxx b/tools/source/fsys/urlobj.cxx
index 760d84d3287e..52b90f37afac 100644
--- a/tools/source/fsys/urlobj.cxx
+++ b/tools/source/fsys/urlobj.cxx
@@ -4288,12 +4288,6 @@ INetProtocol INetURLObject::CompareProtocolScheme(rtl::OUString const &
 }
 
 //============================================================================
-bool INetURLObject::hasPassword() const
-{
-    return m_aAuth.isPresent() && getSchemeInfo().m_bPassword;
-}
-
-//============================================================================
 rtl::OUString INetURLObject::GetHostPort(DecodeMechanism eMechanism,
                                      rtl_TextEncoding eCharset)
 {
diff --git a/tools/source/memtools/contnr.cxx b/tools/source/memtools/contnr.cxx
index 9fe9babc5f05..3430ca7eb8c0 100644
--- a/tools/source/memtools/contnr.cxx
+++ b/tools/source/memtools/contnr.cxx
@@ -824,19 +824,6 @@ void Container::Insert( void* p, sal_uIntPtr nIndex )
 
 /*************************************************************************
 |*
-|*    Container::Insert()
-|*
-*************************************************************************/
-
-void Container::Insert( void* pNew, void* pOld )
-{
-    sal_uIntPtr nIndex = GetPos( pOld );
-    if ( nIndex != CONTAINER_ENTRY_NOTFOUND )
-        Insert( pNew, nIndex );
-}
-
-/*************************************************************************
-|*
 |*    Container::ImpRemove()
 |*
 |*    Beschreibung      Interne Methode zum Entfernen eines Pointers
@@ -956,22 +943,6 @@ void* Container::Remove( sal_uIntPtr nIndex )
 |*
 *************************************************************************/
 
-void* Container::Replace( void* p )
-{
-    DBG_CHKTHIS( Container, DbgCheckContainer );
-
-    if ( !nCount )
-        return NULL;
-    else
-        return pCurBlock->Replace( p, nCurIndex );
-}
-
-/*************************************************************************
-|*
-|*    Container::Replace()
-|*
-*************************************************************************/
-
 void* Container::Replace( void* p, sal_uIntPtr nIndex )
 {
     DBG_CHKTHIS( Container, DbgCheckContainer );
@@ -1207,36 +1178,6 @@ sal_uIntPtr Container::GetCurPos() const
 
 /*************************************************************************
 |*
-|*    Container::GetObjectPtr()
-|*
-|*    Beschreibung      Interne Methode fuer Referenz-Container
-|*
-*************************************************************************/
-
-void** Container::GetObjectPtr( sal_uIntPtr nIndex )
-{
-    DBG_CHKTHIS( Container, DbgCheckContainer );
-
-    // Ist Index nicht innerhalb des Containers, dann NULL zurueckgeben
-    if ( nCount <= nIndex )
-        return NULL;
-    else
-    {
-        // Block suchen
-        CBlock* pTemp = pFirstBlock;
-        while ( pTemp->Count() <= nIndex )
-        {
-            nIndex -= pTemp->Count();
-            pTemp   = pTemp->GetNextBlock();
-        }
-
-        // Item innerhalb des gefundenen Blocks zurueckgeben
-        return pTemp->GetObjectPtr( (sal_uInt16)nIndex );
-    }
-}
-
-/*************************************************************************
-|*
 |*    Container::GetObject()
 |*
 *************************************************************************/
@@ -1303,97 +1244,6 @@ sal_uIntPtr Container::GetPos( const void* p ) const
 
 /*************************************************************************
 |*
-|*    Container::GetPos()
-|*
-*************************************************************************/
-
-sal_uIntPtr Container::GetPos( const void* p, sal_uIntPtr nStartIndex,
-                         sal_Bool bForward ) const
-{
-    DBG_CHKTHIS( Container, DbgCheckContainer );
-
-    // Ist Index nicht innerhalb des Containers, dann NOTFOUND zurueckgeben
-    if ( nCount <= nStartIndex )
-        return CONTAINER_ENTRY_NOTFOUND;
-    else
-    {
-        void**  pNodes;
-        sal_uInt16  nBlockCount;
-        sal_uInt16  i;
-
-        // Block suchen
-        CBlock* pTemp = pFirstBlock;
-        sal_uIntPtr nTemp = 0;
-        while ( nTemp+pTemp->Count() <= nStartIndex )
-        {
-            nTemp += pTemp->Count();
-            pTemp  = pTemp->GetNextBlock();
-        }
-
-        // Jetzt den Pointer suchen
-        if ( bForward )
-        {
-            // Alle Bloecke durchrsuchen
-            i = (sal_uInt16)(nStartIndex - nTemp);
-            pNodes = pTemp->GetObjectPtr( i );
-            do
-            {
-                nBlockCount = pTemp->Count();
-                while ( i < nBlockCount )
-                {
-                    if ( p == *pNodes )
-                        return nTemp+i;
-                    pNodes++;
-                    i++;
-                }
-                nTemp += nBlockCount;
-                pTemp  = pTemp->GetNextBlock();
-                if ( pTemp )
-                {
-                    i = 0;
-                    pNodes = pTemp->GetNodes();
-                }
-                else
-                    break;
-            }
-            while ( sal_True );
-        }
-        else
-        {
-            // Alle Bloecke durchrsuchen
-            i = (sal_uInt16)(nStartIndex-nTemp)+1;
-            pNodes = pTemp->GetObjectPtr( i-1 );
-            do
-            {
-                do
-                {
-                    if ( p == *pNodes )
-                        return nTemp+i-1;
-                    pNodes--;
-                    i--;
-                }
-                while ( i );
-                nTemp -= pTemp->Count();
-                pTemp  = pTemp->GetPrevBlock();
-                if ( pTemp )
-                {
-                    i = pTemp->Count();
-                    // Leere Bloecke in der Kette darf es nicht geben. Nur
-                    // wenn ein Block existiert, darf dieser leer sein
-                    pNodes = pTemp->GetObjectPtr( i-1 );
-                }
-                else
-                    break;
-            }
-            while ( sal_True );
-        }
-    }
-
-    return CONTAINER_ENTRY_NOTFOUND;
-}
-
-/*************************************************************************
-|*
 |*    Container::Seek()
 |*
 *************************************************************************/
diff --git a/tools/workben/urltest.cxx b/tools/workben/urltest.cxx
index 69a53950507c..515e6e6e8659 100644
--- a/tools/workben/urltest.cxx
+++ b/tools/workben/urltest.cxx
@@ -1505,7 +1505,6 @@ int SAL_CALL main()
             url, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("a-b.3:/%2F?x#y")),
             rtl::OUString(urlobj.GetMainURL(INetURLObject::NO_DECODE)));
         bSuccess &= assertEqual(url, false, urlobj.HasUserData());
-        bSuccess &= assertEqual(url, false, urlobj.hasPassword());
         bSuccess &= assertEqual(url, false, urlobj.HasPort());
         bSuccess &= assertEqual(
             url, rtl::OUString(), rtl::OUString(urlobj.GetHost()));