[Libreoffice-commits] .: tools/bootstrp tools/inc

[Joseph Powers]

 tools/bootstrp/sstring.cxx     |  122 -----------------------------------------
 tools/inc/bootstrp/sstring.hxx |   35 -----------
 2 files changed, 157 deletions(-)

New commits:
commit 376422aac12f322375cc5015ddd573befa2d1465
Author: Joseph Powers <jpowers27 at cox.net>
Date:   Sat Feb 12 08:37:37 2011 -0800

    Remove unused class SUniStringList

diff --git a/tools/bootstrp/sstring.cxx b/tools/bootstrp/sstring.cxx
index 792f02a..7399c70 100644
--- a/tools/bootstrp/sstring.cxx
+++ b/tools/bootstrp/sstring.cxx
@@ -213,126 +213,4 @@ SByteStringList& SByteStringList::operator>>  ( SvStream& rStream )
     return *this;
 }
 
-//=============================================================================
-
-SUniStringList::SUniStringList()
-{
-}
-
-SUniStringList::~SUniStringList()
-{
-}
-
-ULONG SUniStringList::IsString( UniString* pStr )
-{
-    ULONG nRet = NOT_THERE;
-    if ( (nRet = GetPrevString( pStr )) != 0 )
-    {
-        UniString* pString = GetObject( nRet );
-        if ( *pString == *pStr )
-            return nRet;
-        else
-            return NOT_THERE;
-    }
-    else
-    {
-        UniString* pString = GetObject( 0 );
-        if ( pString && (*pString == *pStr) )
-            return 0;
-        else
-            return NOT_THERE;
-    }
-}
-
-ULONG SUniStringList::GetPrevString( UniString* pStr )
-{
-    ULONG nRet = 0;
-    BOOL bFound = FALSE;
-    ULONG nCountMember = Count();
-    ULONG nUpper = nCountMember;
-    ULONG nLower = 0;
-    ULONG nCurrent = nUpper / 2;
-    ULONG nRem = 0;
-    UniString* pString;
-
-    do
-    {
-        if ( (nCurrent == nLower) || (nCurrent == nUpper) )
-            return nLower;
-        pString = GetObject( nCurrent );
-        StringCompare nResult =  pStr->CompareTo( *pString );
-        if ( nResult == COMPARE_LESS )
-        {
-            nUpper = nCurrent;
-            nCurrent = (nCurrent + nLower) /2;
-        }
-        else if ( nResult == COMPARE_GREATER )
-        {
-            nLower = nCurrent;
-            nCurrent = (nUpper + nCurrent) /2;
-        }
-        else if ( nResult == COMPARE_EQUAL )
-            return nCurrent;
-        if ( nRem == nCurrent )
-            return nCurrent;
-        nRem = nCurrent;
-    }
-    while ( !bFound );
-    return nRet;
-}
-
-/**************************************************************************
-*
-*	Sortiert einen UniString in die Liste ein und gibt die Position,
-*	an der einsortiert wurde, zurueck
-*
-**************************************************************************/
-
-ULONG SUniStringList::PutString( UniString* pStr )
-{
-    ULONG nPos = GetPrevString ( pStr );
-    if ( Count() )
-    {
-        {
-            UniString* pString = GetObject( 0 );
-            if ( pString->CompareTo( *pStr ) == COMPARE_GREATER )
-            {
-                Insert( pStr, (ULONG)0);
-                return (ULONG)0;
-            }
-        }
-        UniString* pString = GetObject( nPos );
-        if ( *pStr != *pString )
-        {
-            Insert( pStr, nPos+1 );
-            return ( nPos +1 );
-        }
-    }
-    else
-    {
-        Insert( pStr );
-        return (ULONG)0;
-    }
-
-    return NOT_THERE;
-}
-
-UniString* SUniStringList::RemoveString( const UniString& rName )
-{
-    ULONG i;
-    UniString* pReturn;
-
-    for( i = 0 ; i < Count(); i++ )
-    {
-        if ( rName == *GetObject( i ) )
-        {
-            pReturn = GetObject(i);
-            Remove(i);
-            return pReturn;
-        }
-    }
-
-    return NULL;
-}
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/tools/inc/bootstrp/sstring.hxx b/tools/inc/bootstrp/sstring.hxx
index a8fc4ac..2cc3e97 100644
--- a/tools/inc/bootstrp/sstring.hxx
+++ b/tools/inc/bootstrp/sstring.hxx
@@ -35,7 +35,6 @@
 
 #define NOT_THERE		LIST_ENTRY_NOTFOUND
 
-#define  SStringList SUniStringList
 #define  StringList UniStringList
 
 typedef ::std::vector< ByteString* > ByteStringList;
@@ -77,40 +76,6 @@ public:
     ByteString*         at( size_t i ) const;
 };
 
-// ---------------------
-// - class SUniStringList -
-// ---------------------
-
-class SUniStringList : public UniStringList
-{
-public:
-                SUniStringList();
-                ~SUniStringList();
-
-                // neuen UniString in Liste einfuegen
-    ULONG		PutString( UniString* );
-    UniString* 	RemoveString( const UniString& rName );
-
-                // Position des UniString in Liste, wenn nicht enthalten, dann
-                // return = NOT_THERE
-    ULONG		IsString( UniString* );
-
-                // Vorgaenger ermitteln ( auch wenn selbst noch nicht in
-                // Liste enthalten
-    ULONG		GetPrevString( UniString* );
-};
-
-class Text
-{
-protected:
-    String		aString;
-
-public:
-                Text( char* pChar );
-                Text( String &rStr ) { aString = rStr; }
-    void		Stderr();
-};
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */