Related: fdo#38838 remove unused String::Append varients

Change-Id: I158c171d39756d1949427b3a45d685a194d9fb63

include/tools/string.hxx

@@ -133,10 +133,15 @@ private:
     TOOLS_DLLPRIVATE UniString( const sal_Unicode* pCharStr, xub_StrLen nLen );
     TOOLS_DLLPRIVATE UniString( sal_Unicode c );
     TOOLS_DLLPRIVATE UniString& Assign( const sal_Unicode* pCharStr, xub_StrLen nLen );
+    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 sal_Bool   Equals( const sal_Unicode* pCharStr,
                                 xub_StrLen nIndex, xub_StrLen nLen ) const;
     TOOLS_DLLPRIVATE xub_StrLen Search( const sal_Unicode* pCharStr, xub_StrLen nIndex = 0 ) const;
+
+    TOOLS_DLLPRIVATE UniString& operator +=( const sal_Unicode* pCharStr );
+
 public:
                         UniString();
                         UniString( const ResId& rResId );
@@ -191,8 +196,6 @@ public:
         { return operator =(static_cast< sal_Unicode >(c)); }
 
     UniString&          Append( const UniString& rStr );
-    UniString&          Append( const sal_Unicode* pCharStr );
-    UniString&          Append( const sal_Unicode* pCharStr, xub_StrLen nLen );
     UniString&          Append( sal_Unicode c );
     inline UniString & Append(char c) // ...but allow "Append('a')"
         { return Append(static_cast< sal_Unicode >(c)); }
@@ -200,8 +203,6 @@ public:
                             { return Append( rStr ); }
     UniString&          operator +=( const OUString& rStr )
                             { return Append( UniString(rStr) ); }
-    UniString&          operator +=( const sal_Unicode* pCharStr )
-                            { return Append( pCharStr ); }
     UniString&          operator +=( sal_Unicode c )
                             { return Append( c ); }
     inline UniString & operator +=(char c) // ...but allow "+= 'a'"

tools/source/string/strimp.cxx

@@ -203,35 +203,6 @@ STRING& STRING::Append( const STRING& rStr )
     return *this;
 }
 
-STRING& STRING::Append( const STRCODE* pCharStr )
-{
-    DBG_CHKTHIS( STRING, DBGCHECKSTRING );
-    DBG_ASSERT( pCharStr, "String::Append() - pCharStr is NULL" );
-
-    // determine string length
-    sal_Int32 nLen = mpData->mnLen;
-    sal_Int32 nCopyLen = ImplStringLen( pCharStr );
-
-    // detect overflow
-    nCopyLen = ImplGetCopyLen( nLen, nCopyLen );
-
-    if ( nCopyLen )
-    {
-        // allocate string of new size
-        STRINGDATA* pNewData = ImplAllocData( nLen+nCopyLen );
-
-        // copy string
-        memcpy( pNewData->maStr, mpData->maStr, nLen*sizeof( STRCODE ) );
-        memcpy( pNewData->maStr+nLen, pCharStr, nCopyLen*sizeof( STRCODE ) );
-
-        // free old string
-        STRING_RELEASE((STRING_TYPE *)mpData);
-        mpData = pNewData;
-    }
-
-    return *this;
-}
-
 void STRING::SetChar( xub_StrLen nIndex, STRCODE c )
 {
     DBG_CHKTHIS( STRING, DBGCHECKSTRING );

tools/source/string/tustring.cxx

@@ -282,48 +282,6 @@ STRING STRING::GetToken( xub_StrLen nToken, STRCODE cTok, sal_Int32& rIndex ) co
     }
 }
 
-STRING& STRING::Append( const STRCODE* pCharStr, xub_StrLen nCharLen )
-{
-    DBG_CHKTHIS( STRING, DBGCHECKSTRING );
-    DBG_ASSERT( pCharStr, "String::Append() - pCharStr is NULL" );
-
-    if ( nCharLen == STRING_LEN )
-        nCharLen = ImplStringLen( pCharStr );
-
-#ifdef DBG_UTIL
-    if ( DbgIsAssert() )
-    {
-        for ( xub_StrLen i = 0; i < nCharLen; i++ )
-        {
-            if ( !pCharStr[i] )
-            {
-                OSL_FAIL( "String::Append() : nLen is wrong" );
-            }
-        }
-    }
-#endif
-
-    // Catch overflow
-    sal_Int32 nLen = mpData->mnLen;
-    sal_Int32 nCopyLen = ImplGetCopyLen( nLen, nCharLen );
-
-    if ( nCopyLen )
-    {
-        // allocate string of new size
-        STRINGDATA* pNewData = ImplAllocData( nLen+nCopyLen );
-
-        // copy string
-        memcpy( pNewData->maStr, mpData->maStr, nLen*sizeof( STRCODE ) );
-        memcpy( pNewData->maStr+nLen, pCharStr, nCopyLen*sizeof( STRCODE ) );
-
-        // free old string
-        STRING_RELEASE((STRING_TYPE *)mpData);
-        mpData = pNewData;
-    }
-
-    return *this;
-}
-
 STRING& STRING::Append( STRCODE c )
 {
     DBG_CHKTHIS( STRING, DBGCHECKSTRING );

unusedcode.easy

@@ -63,8 +63,6 @@ SfxGrabBagItem::SetGrabBag(std::__debug::map<rtl::OUString, com::sun::star::uno:
 SfxTemplatePanelControl::SetParagraphFamily()
 SmFontPickList::Contains(Font const&) const
 SmParser::Insert(rtl::OUString const&, int)
-String::Append(unsigned short const*)
-String::Append(unsigned short const*, unsigned short)
 String::Assign(unsigned short const*)
 String::Insert(String const&, unsigned short, unsigned short, unsigned short)
 String::String(char)