Related: fdo#38838 remove/privatize String::Append

Change-Id: I5ae90b02e7ae5ddd19495fd0847b7e9dfc4419e8

2 files changed, 1 insertions, 39 deletions

diff --git a/include/tools/string.hxx b/include/tools/string.hxx
index f32d66800b6d..21eb3c5587d8 100644
--- a/include/tools/string.hxx
+++ b/include/tools/string.hxx
@@ -107,6 +107,7 @@ private:
                                    xub_StrLen nLen = STRING_LEN ) const;
 
     UniString&          Assign( const OUString& rStr );
+    UniString&          Append( const UniString& rStr );
 
                         UniString( const int* pDummy );    // not implemented: to prevent UniString( NULL )
                         UniString(int); // not implemented; to detect misuses of
@@ -115,8 +116,6 @@ private:
                                          // of operator =(sal_Unicode)
     void                Append(int); // not implemented; to detect misuses of
                                      // Append(sal_Unicode)
-    void                operator +=(int); // not implemented; to detect misuses
-                                          // of operator +=(sal_Unicode)
 
     //detect and reject use of RTL_CONSTASCII_STRINGPARAM instead of RTL_CONSTASCII_USTRINGPARAM
     TOOLS_DLLPRIVATE UniString( const sal_Char*, sal_Int32 );
@@ -133,12 +132,6 @@ private:
     TOOLS_DLLPRIVATE UniString( const sal_Unicode* pCharStr );
     TOOLS_DLLPRIVATE UniString( const sal_Unicode* pCharStr, xub_StrLen nLen );
     TOOLS_DLLPRIVATE UniString( sal_Unicode c );
-    TOOLS_DLLPRIVATE UniString& Append( const sal_Unicode* pCharStr );
-    TOOLS_DLLPRIVATE UniString& Append( const sal_Unicode* pCharStr, xub_StrLen nLen );
-    TOOLS_DLLPRIVATE UniString& Expand( xub_StrLen nCount, sal_Unicode cExpandChar );
-
-    TOOLS_DLLPRIVATE UniString& operator +=( const sal_Unicode* pCharStr );
-
 public:
                         UniString();
                         UniString( const ResId& rResId );
@@ -175,18 +168,8 @@ public:
     UniString&          operator =( const OUString& rStr )
                             { return Assign( rStr ); }
 
-    UniString&          Append( const UniString& rStr );
-    UniString&          Append( sal_Unicode c );
-    UniString & Append(char c) // ...but allow "Append('a')"
-        { return Append(static_cast< sal_Unicode >(c)); }
-    UniString&          operator +=( const UniString& rStr )
-                            { return Append( rStr ); }
     UniString&          operator +=( const OUString& rStr )
                             { return Append( UniString(rStr) ); }
-    UniString&          operator +=( sal_Unicode c )
-                            { return Append( c ); }
-    UniString & operator +=(char c) // ...but allow "+= 'a'"
-        { return operator +=(static_cast< sal_Unicode >(c)); }
 
     xub_StrLen          Len() const { return (xub_StrLen)mpData->mnLen; }
 
diff --git a/tools/source/string/tustring.cxx b/tools/source/string/tustring.cxx
index 42c69477c865..f4f3bd27086d 100644
--- a/tools/source/string/tustring.cxx
+++ b/tools/source/string/tustring.cxx
@@ -79,27 +79,6 @@ sal_Bool operator==(const UniString& rStr1, const UniString& rStr2)
     return (ImplStringCompareWithoutZero( rStr1.mpData->maStr, rStr2.mpData->maStr, rStr1.mpData->mnLen ) == 0);
 }
 
-STRING& STRING::Append( STRCODE c )
-{
-    // don't append null characters and keep string length < maxlen
-    sal_Int32 nLen = mpData->mnLen;
-    if ( c && (nLen < STRING_MAXLEN) )
-    {
-        // allocate string of new size
-        STRINGDATA* pNewData = ImplAllocData( nLen+1 );
-
-        // copy string
-        memcpy( pNewData->maStr, mpData->maStr, nLen*sizeof( STRCODE ) );
-        pNewData->maStr[nLen] = c;
-
-        // free old string
-        STRING_RELEASE((STRING_TYPE *)mpData);
-        mpData = pNewData;
-    }
-
-    return *this;
-}
-
 xub_StrLen ImplStringLen( const sal_Char* pStr )
 {
     const sal_Char* pTempStr = pStr;