ByteString is no more

4 files changed, 22 insertions, 250 deletions

diff --git a/tools/source/string/strcvt.cxx b/tools/source/string/strcvt.cxx
deleted file mode 100644
index 0f4a14516fce..000000000000
--- a/tools/source/string/strcvt.cxx
+++ /dev/null
@@ -1,74 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-
-// =======================================================================
-
-ByteString::ByteString( const rtl::OString& rStr )
-    : mpData(NULL)
-{
-    DBG_CTOR( ByteString, DbgCheckByteString );
-
-    OSL_ENSURE(rStr.pData->length < STRING_MAXLEN,
-               "Overflowing rtl::OString -> ByteString cut to zero length");
-
-    if (rStr.pData->length < STRING_MAXLEN)
-    {
-        mpData = reinterpret_cast< ByteStringData * >(const_cast< rtl::OString & >(rStr).pData);
-        STRING_ACQUIRE((STRING_TYPE *)mpData);
-    }
-    else
-    {
-        STRING_NEW((STRING_TYPE **)&mpData);
-    }
-}
-
-// -----------------------------------------------------------------------
-
-ByteString& ByteString::Assign( const rtl::OString& rStr )
-{
-    DBG_CHKTHIS( ByteString, DbgCheckByteString );
-
-    OSL_ENSURE(rStr.pData->length < STRING_MAXLEN,
-               "Overflowing rtl::OString -> ByteString cut to zero length");
-
-    if (rStr.pData->length < STRING_MAXLEN)
-    {
-        STRING_RELEASE((STRING_TYPE *)mpData);
-        mpData = reinterpret_cast< ByteStringData * >(const_cast< rtl::OString & >(rStr).pData);
-        STRING_ACQUIRE((STRING_TYPE *)mpData);
-    }
-    else
-    {
-        STRING_NEW((STRING_TYPE **)&mpData);
-    }
-
-    return *this;
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/tools/source/string/strucvt.cxx b/tools/source/string/strucvt.cxx
index d047cb4ba3b5..6db930277ea8 100644
--- a/tools/source/string/strucvt.cxx
+++ b/tools/source/string/strucvt.cxx
@@ -45,14 +45,13 @@ void UniString::InitStringRes( const char* pUTF8Str, sal_Int32 nLen )
 
 // =======================================================================
 
-UniString::UniString( const ByteString& rByteStr, rtl_TextEncoding eTextEncoding, sal_uInt32 nCvtFlags )
+UniString::UniString( const rtl::OString& rByteStr, rtl_TextEncoding eTextEncoding, sal_uInt32 nCvtFlags )
 {
     DBG_CTOR( UniString, DbgCheckUniString );
-    DBG_CHKOBJ( &rByteStr, ByteString, DbgCheckByteString );
 
     mpData = NULL;
     rtl_string2UString( (rtl_uString **)(&mpData),
-                        rByteStr.mpData->maStr, rByteStr.mpData->mnLen,
+                        rByteStr.getStr(), rByteStr.getLength(),
                         eTextEncoding, nCvtFlags );
 }
 
diff --git a/tools/source/string/tstring.cxx b/tools/source/string/tstring.cxx
deleted file mode 100644
index 97bad851b5e3..000000000000
--- a/tools/source/string/tstring.cxx
+++ /dev/null
@@ -1,172 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-
-#include <string.h>
-
-#include "osl/diagnose.h"
-#include <osl/interlck.h>
-#include <rtl/alloc.h>
-#include <rtl/memory.h>
-#include <rtl/tencinfo.h>
-
-#include <tools/string.hxx>
-#include <impstrg.hxx>
-
-#include <tools/debug.hxx>
-
-// =======================================================================
-
-DBG_NAME( ByteString )
-DBG_NAMEEX( UniString )
-
-// -----------------------------------------------------------------------
-
-#define STRCODE         sal_Char
-#define STRCODEU        unsigned char
-#define STRING          ByteString
-#define STRINGDATA      ByteStringData
-#define DBGCHECKSTRING  DbgCheckByteString
-#define STRING_TYPE     rtl_String
-#define STRING_ACQUIRE  rtl_string_acquire
-#define STRING_RELEASE  rtl_string_release
-#define STRING_NEW      rtl_string_new
-
-
-// -----------------------------------------------------------------------
-
-xub_StrLen ImplStringLen( const sal_Char* pStr )
-{
-    const sal_Char* pTempStr = pStr;
-    while( *pTempStr )
-        ++pTempStr;
-    return (xub_StrLen)(pTempStr-pStr);
-}
-
-// -----------------------------------------------------------------------
-
-xub_StrLen ImplStringLen( const sal_Unicode* pStr )
-{
-    const sal_Unicode* pTempStr = pStr;
-    while( *pTempStr )
-        ++pTempStr;
-    return (xub_StrLen)(pTempStr-pStr);
-}
-
-// -----------------------------------------------------------------------
-
-#include <strimp.cxx>
-#include <strcvt.cxx>
-
-static sal_Int32 ImplStringICompare( const STRCODE* pStr1, const STRCODE* pStr2,
-                                     xub_StrLen nCount )
-{
-    sal_Int32   nRet = 0;
-    STRCODE     c1;
-    STRCODE     c2;
-    do
-    {
-        if ( !nCount )
-            break;
-
-        // Ist das Zeichen zwischen 'A' und 'Z' dann umwandeln
-        c1 = *pStr1;
-        c2 = *pStr2;
-        if ( (c1 >= 65) && (c1 <= 90) )
-            c1 += 32;
-        if ( (c2 >= 65) && (c2 <= 90) )
-            c2 += 32;
-        nRet = ((sal_Int32)((STRCODEU)c1))-((sal_Int32)((STRCODEU)c2));
-        if ( nRet != 0 )
-            break;
-
-        ++pStr1,
-        ++pStr2,
-        --nCount;
-    }
-    while ( c2 );
-
-    return nRet;
-}
-
-StringCompare STRING::CompareIgnoreCaseToAscii( const STRCODE* pCharStr,
-                                                xub_StrLen nLen ) const
-{
-    DBG_CHKTHIS( STRING, DBGCHECKSTRING );
-
-    // String vergleichen
-    sal_Int32 nCompare = ImplStringICompare( mpData->maStr, pCharStr, nLen );
-
-    // Rueckgabewert anpassen
-    if ( nCompare == 0 )
-        return COMPARE_EQUAL;
-    else if ( nCompare < 0 )
-        return COMPARE_LESS;
-    else
-        return COMPARE_GREATER;
-}
-
-StringCompare STRING::CompareTo( const STRCODE* pCharStr, xub_StrLen nLen ) const
-{
-    DBG_CHKTHIS( STRING, DBGCHECKSTRING );
-
-    // String vergleichen
-    sal_Int32 nCompare = ImplStringCompare( mpData->maStr, pCharStr, nLen );
-
-    // Rueckgabewert anpassen
-    if ( nCompare == 0 )
-        return COMPARE_EQUAL;
-    else if ( nCompare < 0 )
-        return COMPARE_LESS;
-    else
-        return COMPARE_GREATER;
-}
-
-// =======================================================================
-
-static sal_Int32 ImplStringCompare( const STRCODE* pStr1, const STRCODE* pStr2 )
-{
-    sal_Int32 nRet;
-    while ( ((nRet = ((sal_Int32)((STRCODEU)*pStr1))-((sal_Int32)((STRCODEU)*pStr2))) == 0) &&
-            *pStr2 )
-    {
-        ++pStr1,
-        ++pStr2;
-    }
-
-    return nRet;
-}
-
-sal_Bool STRING::Equals( const STRCODE* pCharStr ) const
-{
-    DBG_CHKTHIS( STRING, DBGCHECKSTRING );
-
-    return (ImplStringCompare( mpData->maStr, pCharStr ) == 0);
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/tools/source/string/tustring.cxx b/tools/source/string/tustring.cxx
index 033498d5719c..4bb515e30ad8 100644
--- a/tools/source/string/tustring.cxx
+++ b/tools/source/string/tustring.cxx
@@ -45,7 +45,6 @@
 // =======================================================================
 
 DBG_NAME( UniString )
-DBG_NAMEEX( ByteString )
 
 // -----------------------------------------------------------------------
 
@@ -1205,4 +1204,24 @@ STRING& STRING::Assign( const STRCODE* pCharStr )
     return *this;
 }
 
+// -----------------------------------------------------------------------
+
+xub_StrLen ImplStringLen( const sal_Char* pStr )
+{
+    const sal_Char* pTempStr = pStr;
+    while( *pTempStr )
+        ++pTempStr;
+    return (xub_StrLen)(pTempStr-pStr);
+}
+
+// -----------------------------------------------------------------------
+
+xub_StrLen ImplStringLen( const sal_Unicode* pStr )
+{
+    const sal_Unicode* pTempStr = pStr;
+    while( *pTempStr )
+        ++pTempStr;
+    return (xub_StrLen)(pTempStr-pStr);
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */