ByteString->rtl::OString

2 files changed, 23 insertions, 19 deletions

diff --git a/tools/source/fsys/dirent.cxx b/tools/source/fsys/dirent.cxx
index 14548558e107..6666aa333ac5 100644
--- a/tools/source/fsys/dirent.cxx
+++ b/tools/source/fsys/dirent.cxx
@@ -1407,12 +1407,12 @@ sal_Bool DirEntry::Find( const String& rPfad, char cDelim )
                 cDelim = SEARCHDELIM(DEFSTYLE)[0];
 
         sal_uInt16 nTokenCount = rPfad.GetTokenCount( cDelim );
-        sal_uInt16 nIndex = 0;
+        sal_Int32 nIndex = 0;
         ByteString aThis = ACCESSDELIM(DEFSTYLE);
         aThis += ByteString(GetFull(), osl_getThreadTextEncoding());
         for ( sal_uInt16 nToken = 0; nToken < nTokenCount; ++nToken )
         {
-            ByteString aPath = ByteString(rPfad, osl_getThreadTextEncoding()).GetToken( 0, cDelim, nIndex );
+            ByteString aPath = rtl::OUStringToOString(rPfad, osl_getThreadTextEncoding()).getToken( 0, cDelim, nIndex );
 
             if ( aPath.Len() )
             {
diff --git a/tools/source/stream/strmunx.cxx b/tools/source/stream/strmunx.cxx
index 04d45a3c9964..110d2d1d18d3 100644
--- a/tools/source/stream/strmunx.cxx
+++ b/tools/source/stream/strmunx.cxx
@@ -87,11 +87,12 @@ InternalStreamLock::InternalStreamLock(
         m_nEndPos( nEnd ),
         m_pStream( pStream )
 {
-    ByteString aFileName(m_pStream->GetFileName(), osl_getThreadTextEncoding());
-    stat( aFileName.GetBuffer(), &m_aStat );
+    rtl::OString aFileName(rtl::OUStringToOString(m_pStream->GetFileName(),
+        osl_getThreadTextEncoding()));
+    stat( aFileName.getStr(), &m_aStat );
     LockList::get().push_back( this );
 #if OSL_DEBUG_LEVEL > 1
-    fprintf( stderr, "locked %s", aFileName.GetBuffer() );
+    fprintf( stderr, "locked %s", aFileName.getStr() );
     if( m_nStartPos || m_nEndPos )
         fprintf(stderr, " [ %ld ... %ld ]", m_nStartPos, m_nEndPos );
     fprintf( stderr, "\n" );
@@ -110,8 +111,9 @@ InternalStreamLock::~InternalStreamLock()
         }
     }
 #if OSL_DEBUG_LEVEL > 1
-    ByteString aFileName(m_pStream->GetFileName(), osl_getThreadTextEncoding());
-    fprintf( stderr, "unlocked %s", aFileName.GetBuffer() );
+    rtl::OString aFileName(rtl::OUStringToOString(m_pStream->GetFileName(),
+        osl_getThreadTextEncoding()));
+    fprintf( stderr, "unlocked %s", aFileName.getStr() );
     if( m_nStartPos || m_nEndPos )
         fprintf(stderr, " [ %ld ... %ld ]", m_nStartPos, m_nEndPos );
     fprintf( stderr, "\n" );
@@ -123,9 +125,10 @@ sal_Bool InternalStreamLock::LockFile( sal_Size nStart, sal_Size nEnd, SvFileStr
 #ifndef BOOTSTRAP
     osl::MutexGuard aGuard( LockMutex::get() );
 #endif
-    ByteString aFileName(pStream->GetFileName(), osl_getThreadTextEncoding());
+    rtl::OString aFileName(rtl::OUStringToOString(pStream->GetFileName(),
+        osl_getThreadTextEncoding()));
     struct stat aStat;
-    if( stat( aFileName.GetBuffer(), &aStat ) )
+    if( stat( aFileName.getStr(), &aStat ) )
         return sal_False;
 
     if( S_ISDIR( aStat.st_mode ) )
@@ -625,15 +628,16 @@ void SvFileStream::Open( const String& rFilename, StreamMode nOpenMode )
 #ifndef BOOTSTRAP
     FSysRedirector::DoRedirect( aFilename );
 #endif
-    ByteString aLocalFilename(aFilename, osl_getThreadTextEncoding());
+    rtl::OString aLocalFilename(rtl::OUStringToOString(aFilename, osl_getThreadTextEncoding()));
 
 #ifdef DBG_UTIL
-    ByteString aTraceStr( "SvFileStream::Open(): " );
-    aTraceStr +=  aLocalFilename;
-    OSL_TRACE( "%s", aTraceStr.GetBuffer() );
+    rtl::OStringBuffer aTraceStr(RTL_CONSTASCII_STRINGPARAM(
+        "SvFileStream::Open(): "));
+    aTraceStr.append(aLocalFilename);
+    OSL_TRACE( "%s", aTraceStr.getStr() );
 #endif
 
-    if ( lstat( aLocalFilename.GetBuffer(), &buf ) == 0 )
+    if ( lstat( aLocalFilename.getStr(), &buf ) == 0 )
       {
         bStatValid = sal_True;
         // SvFileStream soll kein Directory oeffnen
@@ -670,14 +674,14 @@ void SvFileStream::Open( const String& rFilename, StreamMode nOpenMode )
           if ( bStatValid  &&  S_ISLNK( buf.st_mode ) < 0 )
             {
               char *pBuf = new char[ 1024+1 ];
-              if ( readlink( aLocalFilename.GetBuffer(), pBuf, 1024 ) > 0 )
+              if ( readlink( aLocalFilename.getStr(), pBuf, 1024 ) > 0 )
                 {
-                  if (  unlink(aLocalFilename.GetBuffer())  == 0 )
+                  if (  unlink(aLocalFilename.getStr())  == 0 )
                       {
 #ifdef DBG_UTIL
                       fprintf( stderr,
                                "Copying file on symbolic link (%s).\n",
-                               aLocalFilename.GetBuffer() );
+                               aLocalFilename.getStr() );
 #endif
                       String aTmpString( pBuf, osl_getThreadTextEncoding() );
                       const DirEntry aSourceEntry( aTmpString );
@@ -692,7 +696,7 @@ void SvFileStream::Open( const String& rFilename, StreamMode nOpenMode )
     }
 
 
-    nHandleTmp = open(aLocalFilename.GetBuffer(),nAccessRW|nAccess, nMode );
+    nHandleTmp = open(aLocalFilename.getStr(),nAccessRW|nAccess, nMode );
 
     if ( nHandleTmp == -1 )
     {
@@ -702,7 +706,7 @@ void SvFileStream::Open( const String& rFilename, StreamMode nOpenMode )
             nAccessRW = O_RDONLY;
             nAccess = 0;
             nMode = S_IRUSR | S_IROTH | S_IRGRP;
-            nHandleTmp =open( aLocalFilename.GetBuffer(),
+            nHandleTmp =open( aLocalFilename.getStr(),
                               nAccessRW|nAccess,
                               nMode );
             }