From 8c4d2ee8cb2b1950be02aed6cf5d4a4d1c5d6e32 Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Sun, 18 Sep 2011 23:13:40 +0100
Subject: ByteString->rtl::OString[Buffer]

---
 tools/source/fsys/dirent.cxx | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/tools/source/fsys/dirent.cxx b/tools/source/fsys/dirent.cxx
index 6666aa333ac5..15611506fda9 100644
--- a/tools/source/fsys/dirent.cxx
+++ b/tools/source/fsys/dirent.cxx
@@ -345,9 +345,9 @@ ByteString ImplCutPath( const ByteString& rStr, sal_uInt16 nMax, char cAccDel )
 
     if ( bInsertPrefix )
     {
-        ByteString aIns( cAccDel );
-        aIns += "...";
-        aCutPath.Insert( aIns, nBegin );
+        rtl::OStringBuffer aIns;
+        aIns.append(cAccDel).append(RTL_CONSTASCII_STRINGPARAM("..."));
+        aCutPath.Insert(ByteString(aIns.makeStringAndClear()), nBegin);
     }
 
     return aCutPath;
@@ -1373,13 +1373,13 @@ void DirEntry::SetName( const String& rName, FSysPathStyle eFormatter )
 {
     DBG_CHKTHIS( DirEntry, ImpCheckDirEntry );
 
-        if ( eFormatter == FSYS_STYLE_HOST || eFormatter == FSYS_STYLE_DETECT )
+    if ( eFormatter == FSYS_STYLE_HOST || eFormatter == FSYS_STYLE_DETECT )
         eFormatter = DEFSTYLE;
-    ByteString aAccDelim( ACCESSDELIM_C( eFormatter ) );
+    sal_Char cAccDelim(ACCESSDELIM_C(eFormatter));
 
     if ( (eFlag != FSYS_FLAG_NORMAL) ||
          (aName.Search( ':' ) != STRING_NOTFOUND) ||
-         (aName.Search( aAccDelim ) != STRING_NOTFOUND) )
+         (aName.Search( cAccDelim ) != STRING_NOTFOUND) )
     {
         eFlag = FSYS_FLAG_INVALID;
     }
-- 
cgit