ditch ByteString::Expand

tools/inc/tools/string.hxx

@@ -177,7 +177,6 @@ private:
                                      // Append(char)
     void                operator +=(int); // not implemented; to detect misuses
                                           // of operator +=(sal_Char)
-
 public:
                         ByteString();
                         ByteString( const ByteString& rStr );
@@ -234,8 +233,6 @@ public:
     ByteString&         Erase( xub_StrLen nIndex = 0, xub_StrLen nCount = STRING_LEN );
     ByteString          Copy( xub_StrLen nIndex = 0, xub_StrLen nCount = STRING_LEN ) const;
 
-    ByteString&         Expand( xub_StrLen nCount, sal_Char cExpandChar = ' ' );
-
     ByteString&         EraseLeadingChars( sal_Char c = ' ' );
     ByteString&         EraseTrailingChars( sal_Char c = ' ' );
     ByteString&         EraseLeadingAndTrailingChars( sal_Char c = ' ' );

tools/source/string/strimp.cxx

@@ -769,37 +769,6 @@ STRING& STRING::Erase( xub_StrLen nIndex, xub_StrLen nCount )
 
 // -----------------------------------------------------------------------
 
-STRING& STRING::Expand( xub_StrLen nCount, STRCODE cExpandChar )
-{
-    DBG_CHKTHIS( STRING, DBGCHECKSTRING );
-
-    // Muss der String erweitert werden
-    sal_Int32 nLen = mpData->mnLen;
-    if ( nCount <= nLen )
-        return *this;
-
-    // Neuen String anlegen
-    STRINGDATA* pNewData = ImplAllocData( nCount );
-
-    // Alten String kopieren
-    memcpy( pNewData->maStr, mpData->maStr, nLen*sizeof( STRCODE ) );
-
-    // und initialisieren
-    STRCODE* pStr = pNewData->maStr;
-    pStr += nLen;
-    for (sal_Int32 i = nCount - nLen; i > 0; --i) {
-        *pStr++ = cExpandChar;
-    }
-
-    // Alte Daten loeschen und Neue zuweisen
-    STRING_RELEASE((STRING_TYPE *)mpData);
-    mpData = pNewData;
-
-    return *this;
-}
-
-// -----------------------------------------------------------------------
-
 STRING& STRING::EraseLeadingChars( STRCODE c )
 {
     DBG_CHKTHIS( STRING, DBGCHECKSTRING );

tools/source/string/tustring.cxx

@@ -474,4 +474,35 @@ STRING& STRING::Fill( xub_StrLen nCount, STRCODE cFillChar )
     return *this;
 }
 
+// -----------------------------------------------------------------------
+
+STRING& STRING::Expand( xub_StrLen nCount, STRCODE cExpandChar )
+{
+    DBG_CHKTHIS( STRING, DBGCHECKSTRING );
+
+    // Muss der String erweitert werden
+    sal_Int32 nLen = mpData->mnLen;
+    if ( nCount <= nLen )
+        return *this;
+
+    // Neuen String anlegen
+    STRINGDATA* pNewData = ImplAllocData( nCount );
+
+    // Alten String kopieren
+    memcpy( pNewData->maStr, mpData->maStr, nLen*sizeof( STRCODE ) );
+
+    // und initialisieren
+    STRCODE* pStr = pNewData->maStr;
+    pStr += nLen;
+    for (sal_Int32 i = nCount - nLen; i > 0; --i) {
+        *pStr++ = cExpandChar;
+    }
+
+    // Alte Daten loeschen und Neue zuweisen
+    STRING_RELEASE((STRING_TYPE *)mpData);
+    mpData = pNewData;
+
+    return *this;
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */