callcatcher: shrink unused inlines

10 files changed, 26 insertions, 128 deletions

diff --git a/binfilter/bf_svtools/source/memtools/tl_contnr.cxx b/binfilter/bf_svtools/source/memtools/tl_contnr.cxx
index e548d00e2..f0b48a9d9 100644
--- a/binfilter/bf_svtools/source/memtools/tl_contnr.cxx
+++ b/binfilter/bf_svtools/source/memtools/tl_contnr.cxx
@@ -788,17 +788,6 @@ void Container::ImpInsert( void* p, CBlock* pBlock, sal_uInt16 nIndex )
 |*
 *************************************************************************/
 
-void Container::Insert( void* p )
-{
-    ImpInsert( p, pCurBlock, nCurIndex );
-}
-
-/*************************************************************************
-|*
-|*    Container::Insert()
-|*
-*************************************************************************/
-
 void Container::Insert( void* p, sal_uIntPtr nIndex )
 {
     if ( nCount <= nIndex )
@@ -903,21 +892,6 @@ void* Container::ImpRemove( CBlock* pBlock, sal_uInt16 nIndex )
 |*
 *************************************************************************/
 
-void* Container::Remove()
-{
-    // Wenn kein Item vorhanden ist, NULL zurueckgeben
-    if ( !nCount )
-        return NULL;
-    else
-        return ImpRemove( pCurBlock, nCurIndex );
-}
-
-/*************************************************************************
-|*
-|*    Container::Remove()
-|*
-*************************************************************************/
-
 void* Container::Remove( sal_uIntPtr nIndex )
 {
     // Ist Index nicht innerhalb des Containers, dann NULL zurueckgeben
@@ -1133,23 +1107,6 @@ void Container::Clear()
 
 /*************************************************************************
 |*
-|*    Container::GetCurObject()
-|*
-*************************************************************************/
-
-void* Container::GetCurObject() const
-{
-    DBG_CHKTHIS( Container, DbgCheckContainer );
-
-    // NULL, wenn Container leer
-    if ( !nCount )
-        return NULL;
-    else
-        return pCurBlock->GetObject( nCurIndex );
-}
-
-/*************************************************************************
-|*
 |*    Container::GetCurPos()
 |*
 *************************************************************************/
@@ -1206,44 +1163,6 @@ void* Container::GetObject( sal_uIntPtr nIndex ) const
 
 /*************************************************************************
 |*
-|*    Container::GetPos()
-|*
-*************************************************************************/
-
-sal_uIntPtr Container::GetPos( const void* p ) const
-{
-    DBG_CHKTHIS( Container, DbgCheckContainer );
-
-    void**  pNodes;
-    CBlock* pTemp;
-    sal_uIntPtr nTemp;
-    sal_uInt16  nBlockCount;
-    sal_uInt16  i;
-
-    // Block suchen
-    pTemp = pFirstBlock;
-    nTemp = 0;
-    while ( pTemp )
-    {
-        pNodes = pTemp->GetNodes();
-        i = 0;
-        nBlockCount = pTemp->Count();
-        while ( i < nBlockCount )
-        {
-            if ( p == *pNodes )
-                return nTemp+i;
-            pNodes++;
-            i++;
-        }
-        nTemp += nBlockCount;
-        pTemp  = pTemp->GetNextBlock();
-    }
-
-    return CONTAINER_ENTRY_NOTFOUND;
-}
-
-/*************************************************************************
-|*
 |*    Container::Seek()
 |*
 *************************************************************************/
diff --git a/binfilter/bf_svtools/source/misc/tl_strimp.cxx b/binfilter/bf_svtools/source/misc/tl_strimp.cxx
index 83ca2c063..5ced5bc71 100644
--- a/binfilter/bf_svtools/source/misc/tl_strimp.cxx
+++ b/binfilter/bf_svtools/source/misc/tl_strimp.cxx
@@ -738,32 +738,6 @@ STRING& STRING::ToLowerAscii()
 
 // -----------------------------------------------------------------------
 
-STRING& STRING::ToUpperAscii()
-{
-    DBG_CHKTHIS( STRING, DBGCHECKSTRING );
-
-    sal_Int32 nIndex = 0;
-    sal_Int32 nLen = mpData->mnLen;
-    STRCODE*    pStr = mpData->maStr;
-    while ( nIndex < nLen )
-    {
-        // Ist das Zeichen zwischen 'a' und 'z' dann umwandeln
-        if ( (*pStr >= 97) && (*pStr <= 122) )
-        {
-            // Daten kopieren, wenn noetig
-            pStr = ImplCopyStringData( pStr );
-            *pStr -= 32;
-        }
-
-        ++pStr,
-        ++nIndex;
-    }
-
-    return *this;
-}
-
-// -----------------------------------------------------------------------
-
 StringCompare STRING::CompareTo( const STRING& rStr, xub_StrLen nLen ) const
 {
     DBG_CHKTHIS( STRING, DBGCHECKSTRING );
diff --git a/binfilter/bf_svtools/source/misc/tl_tustring.cxx b/binfilter/bf_svtools/source/misc/tl_tustring.cxx
index 6c6f0c301..e66b75015 100644
--- a/binfilter/bf_svtools/source/misc/tl_tustring.cxx
+++ b/binfilter/bf_svtools/source/misc/tl_tustring.cxx
@@ -696,6 +696,32 @@ xub_StrLen STRING::SearchBackward( STRCODE c, xub_StrLen nIndex ) const
     return STRING_NOTFOUND;
 }
 
+// -----------------------------------------------------------------------
+
+STRING& STRING::ToUpperAscii()
+{
+    DBG_CHKTHIS( STRING, DBGCHECKSTRING );
+
+    sal_Int32 nIndex = 0;
+    sal_Int32 nLen = mpData->mnLen;
+    STRCODE*    pStr = mpData->maStr;
+    while ( nIndex < nLen )
+    {
+        // Ist das Zeichen zwischen 'a' und 'z' dann umwandeln
+        if ( (*pStr >= 97) && (*pStr <= 122) )
+        {
+            // Daten kopieren, wenn noetig
+            pStr = ImplCopyStringData( pStr );
+            *pStr -= 32;
+        }
+
+        ++pStr,
+        ++nIndex;
+    }
+
+    return *this;
+}
+
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/inc/bf_svx/svdetc.hxx b/binfilter/inc/bf_svx/svdetc.hxx
index bff6bcdd3..bc8317bc5 100644
--- a/binfilter/inc/bf_svx/svdetc.hxx
+++ b/binfilter/inc/bf_svx/svdetc.hxx
@@ -141,7 +141,6 @@ public:
     void   Remove(ULONG nPos)                                { aArr.Remove(nPos); }
     void   Replace(USHORT nElem, ULONG nPos)                 { aArr.Replace((void*)ULONG(nElem),nPos); }
     USHORT GetObject(ULONG nPos)                       const { return USHORT(ULONG(aArr.GetObject(nPos))); }
-    ULONG  GetPos(USHORT nElem)                        const { return aArr.GetPos((void*)(ULONG)nElem); }
     ULONG  GetCount()                                  const { return aArr.Count(); }
     void   Sort();
 };
diff --git a/binfilter/inc/bf_svx/svdlayer.hxx b/binfilter/inc/bf_svx/svdlayer.hxx
index fdc2e5fa4..ae977d550 100644
--- a/binfilter/inc/bf_svx/svdlayer.hxx
+++ b/binfilter/inc/bf_svx/svdlayer.hxx
@@ -127,7 +127,6 @@ public:
     void               ClearLayer();
     // Neuer Layer wird angelegt und eingefuegt
     SdrLayer*          NewLayer(const String& rName, USHORT nPos=0xFFFF);
-    void               DeleteLayer(SdrLayer* pLayer)                                 { aLayer.Remove(pLayer); delete pLayer; Broadcast(FALSE); }
     // Neuer Layer, Name wird aus der Resource geholt
 
     // Iterieren ueber alle Layer
@@ -145,8 +144,6 @@ public:
     void               InsertLayerSet(SdrLayerSet* pSet, USHORT nPos=0xFFFF)         { aLSets.Insert(pSet,nPos); pSet->SetModel(pModel); Broadcast(TRUE); }
     // Alle LayerSets loeschen
     void               ClearLayerSets();
-    // Neuer Layerset wird angelegt und eingefuegt
-    void               DeleteLayerSet(SdrLayerSet* pSet)                             { aLSets.Remove(pSet); delete pSet; Broadcast(TRUE); }
     // Iterieren ueber alle LayerSets
     USHORT             GetLayerSetCount() const                                      { return USHORT(aLSets.Count()); }
     SdrLayerSet*       GetLayerSet(USHORT i)                                         { return (SdrLayerSet*)(aLSets.GetObject(i)); }
diff --git a/binfilter/inc/bf_svx/svdmark.hxx b/binfilter/inc/bf_svx/svdmark.hxx
index 0d3924414..9fdd285d2 100644
--- a/binfilter/inc/bf_svx/svdmark.hxx
+++ b/binfilter/inc/bf_svx/svdmark.hxx
@@ -57,9 +57,7 @@ public:
     void     Clear()                                           { aArr.Clear(); bSorted=TRUE; }
     void     Remove(ULONG nPos)                                { aArr.Remove(nPos); }
     USHORT   GetObject(ULONG nPos) const                       { return USHORT(ULONG(aArr.GetObject(nPos))); }
-    ULONG    GetPos(USHORT nElem) const                        { return aArr.GetPos((void*)(ULONG)nElem); }
     ULONG    GetCount() const                                  { return aArr.Count(); }
-    bool Exist(USHORT nElem) const                         { return aArr.GetPos((void*)(ULONG)nElem)!=CONTAINER_ENTRY_NOTFOUND; }
 };
 
 class SdrMark { // Alles was eine View ueber ein markiertes Objekt wissen muss
diff --git a/binfilter/inc/bf_tools/contnr.hxx b/binfilter/inc/bf_tools/contnr.hxx
index 6d7e70fc5..99b9bc6cf 100644
--- a/binfilter/inc/bf_tools/contnr.hxx
+++ b/binfilter/inc/bf_tools/contnr.hxx
@@ -79,17 +79,11 @@ public:
                 Container( const Container& rContainer );
                 ~Container();
 
-    void        Insert( void* p );
     void        Insert( void* p, sal_uIntPtr nIndex );
 
-    void*       Remove();
     void*       Remove( sal_uIntPtr nIndex );
-    void*       Remove( void* p )
-                    { return Remove( GetPos( p ) ); }
 
     void*       Replace( void* p, sal_uIntPtr nIndex );
-    void*       Replace( void* pNew, void* pOld )
-                    { return Replace( pNew, GetPos( pOld ) ); }
 
     void        SetSize( sal_uIntPtr nNewSize );
     sal_uIntPtr       GetSize() const { return nCount; }
@@ -97,13 +91,10 @@ public:
     sal_uIntPtr       Count() const { return nCount; }
     void        Clear();
 
-    void*       GetCurObject() const;
     sal_uIntPtr       GetCurPos() const;
     void*       GetObject( sal_uIntPtr nIndex ) const;
-    sal_uIntPtr       GetPos( const void* p ) const;
 
     void*       Seek( sal_uIntPtr nIndex );
-    void*       Seek( void* p ) { return Seek( GetPos( p ) ); }
 
     void*       First();
     void*       Last();
diff --git a/binfilter/inc/bf_tools/stack.hxx b/binfilter/inc/bf_tools/stack.hxx
index 5d76b538a..0564bd5bf 100644
--- a/binfilter/inc/bf_tools/stack.hxx
+++ b/binfilter/inc/bf_tools/stack.hxx
@@ -45,7 +45,6 @@ public:
             using Container::Clear;
             using Container::Count;
             using Container::GetObject;
-            using Container::GetPos;
 
             Stack( sal_uInt16 _nInitSize = 16, sal_uInt16 _nReSize = 16 ) :
                 Container( CONTAINER_MAXBLOCKSIZE, _nInitSize, _nReSize ) {}
@@ -87,8 +86,6 @@ public:                                                             \
                                                                     \
     Type        GetObject( sal_uIntPtr nIndex ) const                     \
                     { return (Type)Stack::GetObject( nIndex ); }    \
-    sal_uIntPtr       GetPos( const Type p ) const                        \
-                    { return Stack::GetPos( (const void*)p ); }     \
                                                                     \
     ClassName&  operator =( const ClassName& rClassName )           \
                     { Stack::operator =( rClassName );              \
diff --git a/binfilter/inc/bf_tools/string.hxx b/binfilter/inc/bf_tools/string.hxx
index 3a22903bd..00b995817 100644
--- a/binfilter/inc/bf_tools/string.hxx
+++ b/binfilter/inc/bf_tools/string.hxx
@@ -199,7 +199,6 @@ public:
                             { return ConvertLineEnd( GetSystemLineEnd() ); }
 
     ByteString&         ToLowerAscii();
-    ByteString&         ToUpperAscii();
 
     StringCompare       CompareTo( const ByteString& rStr,
                                    xub_StrLen nLen = STRING_LEN ) const;
diff --git a/binfilter/inc/bf_tools/unqidx.hxx b/binfilter/inc/bf_tools/unqidx.hxx
index 3bf63ae11..b4d7d7378 100644
--- a/binfilter/inc/bf_tools/unqidx.hxx
+++ b/binfilter/inc/bf_tools/unqidx.hxx
@@ -51,8 +51,6 @@ private:
     void*           Seek( void* p );
 
 public:
-                    using Container::GetCurObject;
-
                     UniqueIndex( sal_uIntPtr nStartIndex = 0,
                                  sal_uIntPtr nInitSize = 16,
                                  sal_uIntPtr nReSize = 16 );