From 2bee9847ec615258819b6cfec857c84e8f03fc6d Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Thu, 15 Sep 2011 11:23:10 +0100
Subject: ditch ByteString::Fill

---
 tools/inc/tools/string.hxx       |  2 +-
 tools/source/string/strimp.cxx   | 32 --------------------------------
 tools/source/string/tustring.cxx | 32 ++++++++++++++++++++++++++++++++
 3 files changed, 33 insertions(+), 33 deletions(-)

(limited to 'tools')

diff --git a/tools/inc/tools/string.hxx b/tools/inc/tools/string.hxx
index bb674a60cba1..9a70a66031e8 100644
--- a/tools/inc/tools/string.hxx
+++ b/tools/inc/tools/string.hxx
@@ -177,6 +177,7 @@ private:
                                      // Append(char)
     void                operator +=(int); // not implemented; to detect misuses
                                           // of operator +=(sal_Char)
+
 public:
                         ByteString();
                         ByteString( const ByteString& rStr );
@@ -233,7 +234,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&         Fill( xub_StrLen nCount, sal_Char cFillChar = ' ' );
     ByteString&         Expand( xub_StrLen nCount, sal_Char cExpandChar = ' ' );
 
     ByteString&         EraseLeadingChars( sal_Char c = ' ' );
diff --git a/tools/source/string/strimp.cxx b/tools/source/string/strimp.cxx
index f351aea90044..3d15cb29b26c 100644
--- a/tools/source/string/strimp.cxx
+++ b/tools/source/string/strimp.cxx
@@ -769,38 +769,6 @@ STRING& STRING::Erase( xub_StrLen nIndex, xub_StrLen nCount )
 
 // -----------------------------------------------------------------------
 
-STRING& STRING::Fill( xub_StrLen nCount, STRCODE cFillChar )
-{
-    DBG_CHKTHIS( STRING, DBGCHECKSTRING );
-
-    if ( !nCount )
-        return *this;
-
-    // Ist nCount groesser wie der jetzige String, dann verlaengern
-    if ( nCount > mpData->mnLen )
-    {
-        // dann neuen String mit der neuen Laenge anlegen
-        STRINGDATA* pNewData = ImplAllocData( nCount );
-        STRING_RELEASE((STRING_TYPE *)mpData);
-        mpData = pNewData;
-    }
-    else
-        ImplCopyData();
-
-    STRCODE* pStr = mpData->maStr;
-    do
-    {
-        *pStr = cFillChar;
-        ++pStr,
-        --nCount;
-    }
-    while ( nCount );
-
-    return *this;
-}
-
-// -----------------------------------------------------------------------
-
 STRING& STRING::Expand( xub_StrLen nCount, STRCODE cExpandChar )
 {
     DBG_CHKTHIS( STRING, DBGCHECKSTRING );
diff --git a/tools/source/string/tustring.cxx b/tools/source/string/tustring.cxx
index 877b6d86fb49..720d5a24b002 100644
--- a/tools/source/string/tustring.cxx
+++ b/tools/source/string/tustring.cxx
@@ -442,4 +442,36 @@ StringCompare STRING::CompareIgnoreCaseToAscii( const STRING& rStr,
         return COMPARE_GREATER;
 }
 
+// -----------------------------------------------------------------------
+
+STRING& STRING::Fill( xub_StrLen nCount, STRCODE cFillChar )
+{
+    DBG_CHKTHIS( STRING, DBGCHECKSTRING );
+
+    if ( !nCount )
+        return *this;
+
+    // Ist nCount groesser wie der jetzige String, dann verlaengern
+    if ( nCount > mpData->mnLen )
+    {
+        // dann neuen String mit der neuen Laenge anlegen
+        STRINGDATA* pNewData = ImplAllocData( nCount );
+        STRING_RELEASE((STRING_TYPE *)mpData);
+        mpData = pNewData;
+    }
+    else
+        ImplCopyData();
+
+    STRCODE* pStr = mpData->maStr;
+    do
+    {
+        *pStr = cFillChar;
+        ++pStr,
+        --nCount;
+    }
+    while ( nCount );
+
+    return *this;
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
-- 
cgit