[Libreoffice-commits] .: binfilter/bf_svtools binfilter/inc

[Caolán McNamara]

 binfilter/bf_svtools/source/memtools/svt_svarray.cxx |   95 -------------------
 binfilter/inc/bf_svtools/svstdarr.hxx                |   20 ----
 2 files changed, 115 deletions(-)

New commits:
commit b2560f04f7fa29958bec02a013d7a2dc4608ed96
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Jun 22 00:58:22 2011 +0100

    junk some more unused pre-stl template-like macros

diff --git a/binfilter/bf_svtools/source/memtools/svt_svarray.cxx b/binfilter/bf_svtools/source/memtools/svt_svarray.cxx
index 86d7885..251ed09 100644
--- a/binfilter/bf_svtools/source/memtools/svt_svarray.cxx
+++ b/binfilter/bf_svtools/source/memtools/svt_svarray.cxx
@@ -89,8 +89,6 @@ SV_IMPL_OP_PTRARR_SORT( SvStringsSort, StringPtr )
 SV_IMPL_OP_PTRARR_SORT( SvStringsSortDtor, StringPtr )
 
 SV_IMPL_PTRARR( SvByteStrings, ByteStringPtr )
-SV_IMPL_PTRARR( SvByteStringsDtor, ByteStringPtr )
-SV_IMPL_OP_PTRARR_SORT( SvByteStringsSort, ByteStringPtr )
 SV_IMPL_OP_PTRARR_SORT( SvByteStringsSortDtor, ByteStringPtr )
 
 
@@ -274,99 +272,6 @@ void SvUShortsSort::Remove( const USHORT aE, USHORT nL )
         SvUShorts::Remove( nP, nL);
 }
 
-// ---------------- bytestrings -------------------------------------
-
-// Array mit anderer Seek-Methode!
-_SV_IMPL_SORTAR_ALG( SvByteStringsISort, ByteStringPtr )
-void SvByteStringsISort::DeleteAndDestroy( USHORT nP, USHORT nL )
-{
-    if( nL )
-    {
-        DBG_ASSERT( nP < nA && nP + nL <= nA, "ERR_VAR_DEL" );
-        for( USHORT n=nP; n < nP + nL; n++ )
-            delete *((ByteStringPtr*)pData+n);
-        SvPtrarr::Remove( nP, nL );
-    }
-}
-BOOL SvByteStringsISort::Seek_Entry( const ByteStringPtr aE, USHORT* pP ) const
-{
-    register USHORT nO  = SvByteStringsISort_SAR::Count(),
-            nM,
-            nU = 0;
-    if( nO > 0 )
-    {
-        nO--;
-        while( nU <= nO )
-        {
-            nM = nU + ( nO - nU ) / 2;
-            StringCompare eCmp = (*((ByteStringPtr*)pData + nM))->
-                        CompareIgnoreCaseToAscii( *(aE) );
-            if( COMPARE_EQUAL == eCmp )
-            {
-                if( pP ) *pP = nM;
-                return TRUE;
-            }
-            else if( COMPARE_LESS == eCmp )
-                nU = nM + 1;
-            else if( nM == 0 )
-            {
-                if( pP ) *pP = nU;
-                return FALSE;
-            }
-            else
-                nO = nM - 1;
-        }
-    }
-    if( pP ) *pP = nU;
-    return FALSE;
-}
-
-
-// Array mit anderer Seek-Methode!
-_SV_IMPL_SORTAR_ALG( SvByteStringsISortDtor, ByteStringPtr )
-void SvByteStringsISortDtor::DeleteAndDestroy( USHORT nP, USHORT nL )
-{
-    if( nL )
-    {
-        DBG_ASSERT( nP < nA && nP + nL <= nA, "ERR_VAR_DEL" );
-        for( USHORT n=nP; n < nP + nL; n++ )
-            delete *((ByteStringPtr*)pData+n);
-        SvPtrarr::Remove( nP, nL );
-    }
-}
-BOOL SvByteStringsISortDtor::Seek_Entry( const ByteStringPtr aE, USHORT* pP ) const
-{
-    register USHORT nO  = SvByteStringsISortDtor_SAR::Count(),
-            nM,
-            nU = 0;
-    if( nO > 0 )
-    {
-        nO--;
-        while( nU <= nO )
-        {
-            nM = nU + ( nO - nU ) / 2;
-            StringCompare eCmp = (*((ByteStringPtr*)pData + nM))->
-                                    CompareIgnoreCaseToAscii( *(aE) );
-            if( COMPARE_EQUAL == eCmp )
-            {
-                if( pP ) *pP = nM;
-                return TRUE;
-            }
-            else if( COMPARE_LESS == eCmp )
-                nU = nM + 1;
-            else if( nM == 0 )
-            {
-                if( pP ) *pP = nU;
-                return FALSE;
-            }
-            else
-                nO = nM - 1;
-        }
-    }
-    if( pP ) *pP = nU;
-    return FALSE;
-}
-
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/inc/bf_svtools/svstdarr.hxx b/binfilter/inc/bf_svtools/svstdarr.hxx
index 6788a9c..e149c7d 100644
--- a/binfilter/inc/bf_svtools/svstdarr.hxx
+++ b/binfilter/inc/bf_svtools/svstdarr.hxx
@@ -145,31 +145,11 @@ SV_DECL_PTRARR_VISIBILITY( SvByteStrings, ByteStringPtr, 1, 1,  )
 #define _SVSTDARR_BYTESTRINGS_DECL
 #endif
 
-#ifndef _SVSTDARR_BYTESTRINGSDTOR_DECL
-SV_DECL_PTRARR_DEL_VISIBILITY( SvByteStringsDtor, ByteStringPtr, 1, 1,  )
-#define _SVSTDARR_BYTESTRINGSDTOR_DECL
-#endif
-
-#ifndef _SVSTDARR_BYTESTRINGSSORT_DECL
-SV_DECL_PTRARR_SORT_VISIBILITY( SvByteStringsSort, ByteStringPtr, 1, 1,  )
-#define _SVSTDARR_BYTESTRINGSSORT_DECL
-#endif
-
 #ifndef _SVSTDARR_BYTESTRINGSSORTDTOR_DECL
 SV_DECL_PTRARR_SORT_DEL_VISIBILITY( SvByteStringsSortDtor, ByteStringPtr, 1, 1,  )
 #define _SVSTDARR_BYTESTRINGSSORTDTOR_DECL
 #endif
 
-#ifndef _SVSTDARR_BYTESTRINGSISORT_DECL
-SV_DECL_PTRARR_SORT_VISIBILITY( SvByteStringsISort, ByteStringPtr, 1, 1,  )
-#define _SVSTDARR_BYTESTRINGSISORT_DECL
-#endif
-
-#ifndef _SVSTDARR_BYTESTRINGSISORTDTOR_DECL
-SV_DECL_PTRARR_SORT_DEL_VISIBILITY( SvByteStringsISortDtor, ByteStringPtr, 1, 1,  )
-#define _SVSTDARR_BYTESTRINGSISORTDTOR_DECL
-#endif
-
 #ifndef _SVSTDARR_XUB_STRLEN_DECL
 SV_DECL_VARARR_VISIBILITY( SvXub_StrLens, xub_StrLen, 1, 1,  )
 #define _SVSTDARR_XUB_STRLEN_DECL