strip down UniString some more

Change-Id: Ibd749a70a7bbe8c1023edf7bd144aa6547147a12

4 files changed, 2 insertions, 106 deletions

diff --git a/tools/inc/tools/string.hxx b/tools/inc/tools/string.hxx
index c524f0f1d4f6..d1768bc6b97a 100644
--- a/tools/inc/tools/string.hxx
+++ b/tools/inc/tools/string.hxx
@@ -152,6 +152,8 @@ private:
     TOOLS_DLLPRIVATE UniString( const rtl::OString& rByteStr,
                                    rtl_TextEncoding eTextEncoding,
                                    sal_uInt32 nCvtFlags = BYTESTRING_TO_UNISTRING_CVTFLAGS );
+    TOOLS_DLLPRIVATE UniString( const sal_Unicode* pCharStr );
+    TOOLS_DLLPRIVATE UniString( const sal_Unicode* pCharStr, xub_StrLen nLen );
 
 public:
                         UniString();
@@ -159,8 +161,6 @@ public:
                         UniString( const UniString& rStr );
                         UniString( const UniString& rStr, xub_StrLen nPos, xub_StrLen nLen );
                         UniString( const rtl::OUString& rStr );
-                        UniString( const sal_Unicode* pCharStr );
-                        UniString( const sal_Unicode* pCharStr, xub_StrLen nLen );
                         UniString( sal_Unicode c );
                         UniString(char c); // ...but allow "UniString('a')"
                         UniString( const sal_Char* pByteStr,
@@ -177,9 +177,6 @@ public:
                                 reinterpret_cast<rtl_uString*>(mpData)), SAL_NO_ACQUIRE );
     }
 
-    static UniString    CreateFromAscii( const sal_Char* pAsciiStr );
-    static UniString    CreateFromAscii( const sal_Char* pAsciiStr, xub_StrLen nLen );
-
     static UniString    CreateFromInt32( sal_Int32 n, sal_Int16 nRadix = 10 );
     static const UniString& EmptyString();
     sal_Int32           ToInt32() const;
diff --git a/tools/source/string/strascii.cxx b/tools/source/string/strascii.cxx
index 49600b9339de..f0fd961b0a7a 100644
--- a/tools/source/string/strascii.cxx
+++ b/tools/source/string/strascii.cxx
@@ -162,42 +162,6 @@ static sal_Int32 ImplStringICompareAscii( const sal_Unicode* pStr1, const sal_Ch
     return nRet;
 }
 
-// =======================================================================
-
-UniString UniString::CreateFromAscii( const sal_Char* pAsciiStr )
-{
-    DBG_ASSERT( pAsciiStr, "UniString::CreateFromAscii() - pAsciiStr is NULL" );
-
-    // Stringlaenge ermitteln
-    xub_StrLen nLen = ImplStringLen( pAsciiStr );
-
-    UniString aTempStr;
-    if ( nLen )
-    {
-        ImplCopyAsciiStr( aTempStr.AllocBuffer( nLen ), pAsciiStr, nLen );
-    }
-    return aTempStr;
-}
-
-// -----------------------------------------------------------------------
-
-UniString UniString::CreateFromAscii( const sal_Char* pAsciiStr, xub_StrLen nLen )
-{
-    DBG_ASSERT( pAsciiStr, "UniString::CreateFromAscii() - pAsciiStr is NULL" );
-
-    // Stringlaenge ermitteln
-    if ( nLen == STRING_LEN )
-        nLen = ImplStringLen( pAsciiStr );
-
-    UniString aTempStr;
-
-    if ( nLen )
-    {
-        ImplCopyAsciiStr( aTempStr.AllocBuffer( nLen ), pAsciiStr, nLen );
-    }
-    return aTempStr;
-}
-
 // -----------------------------------------------------------------------
 
 UniString& UniString::AssignAscii( const sal_Char* pAsciiStr )
diff --git a/tools/source/string/strimp.cxx b/tools/source/string/strimp.cxx
index 3e2fc4376207..6717d93209ad 100644
--- a/tools/source/string/strimp.cxx
+++ b/tools/source/string/strimp.cxx
@@ -192,34 +192,6 @@ STRING::STRING( const STRING& rStr, xub_StrLen nPos, xub_StrLen nLen )
 
 // -----------------------------------------------------------------------
 
-STRING::STRING( const STRCODE* pCharStr )
-    : mpData(NULL)
-{
-    DBG_CTOR( STRING, DBGCHECKSTRING );
-
-    // Stringlaenge ermitteln
-    // Bei diesem Ctor darf NULL uebergeben werden
-    xub_StrLen nLen;
-    if ( pCharStr )
-        nLen = ImplStringLen( pCharStr );
-    else
-        nLen = 0;
-
-    // Ist es kein leerer String
-    if ( nLen )
-    {
-        // Verwaltungsdaten anlegen und String kopieren
-        mpData = ImplAllocData( nLen );
-        memcpy( mpData->maStr, pCharStr, nLen*sizeof( STRCODE ) );
-    }
-    else
-    {
-        STRING_NEW((STRING_TYPE **)&mpData);
-    }
-}
-
-// -----------------------------------------------------------------------
-
 STRING::~STRING()
 {
     DBG_DTOR( STRING, DBGCHECKSTRING );
diff --git a/tools/source/string/tustring.cxx b/tools/source/string/tustring.cxx
index db9aeaa12b9c..120bf002b873 100644
--- a/tools/source/string/tustring.cxx
+++ b/tools/source/string/tustring.cxx
@@ -855,43 +855,6 @@ STRING STRING::GetToken( xub_StrLen nToken, STRCODE cTok, xub_StrLen& rIndex ) c
 
 // -----------------------------------------------------------------------
 
-STRING::STRING( const STRCODE* pCharStr, xub_StrLen nLen )
-: mpData(NULL)
-{
-    DBG_CTOR( STRING, DBGCHECKSTRING );
-    DBG_ASSERT( pCharStr, "String::String() - pCharStr is NULL" );
-
-    if ( nLen == STRING_LEN )
-        nLen = ImplStringLen( pCharStr );
-
-#ifdef DBG_UTIL
-    if ( DbgIsAssert() )
-    {
-        for ( xub_StrLen i = 0; i < nLen; i++ )
-        {
-            if ( !pCharStr[i] )
-            {
-                OSL_FAIL( "String::String() : nLen is wrong" );
-            }
-        }
-    }
-#endif
-
-    // Ist es kein leerer String
-    if ( nLen )
-    {
-        // Verwaltungsdaten anlegen und String kopieren
-        mpData = ImplAllocData( nLen );
-        memcpy( mpData->maStr, pCharStr, nLen*sizeof( STRCODE ) );
-    }
-    else
-    {
-        STRING_NEW((STRING_TYPE **)&mpData);
-    }
-}
-
-// -----------------------------------------------------------------------
-
 STRING& STRING::Append( const STRCODE* pCharStr, xub_StrLen nCharLen )
 {
     DBG_CHKTHIS( STRING, DBGCHECKSTRING );