diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-11-25 16:30:15 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-11-25 20:17:17 +0000 |
| commit | cbb2b42f113e29609161d8bdbeb667a2164a4d1a (patch) | |
| tree | 9c56718f55532a872a230cf521da14702095c807 /tools | |
| parent | 4e34d8fd5b64a18dd17faf4ed4d603648bab8311 (diff) | |
ByteString->rtl::OString
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/source/stream/strmunx.cxx | 2 | ||||
| -rw-r--r-- | tools/source/stream/strmwnt.cxx | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/tools/source/stream/strmunx.cxx b/tools/source/stream/strmunx.cxx index 2dfe2bbdf333..ad245a7af43c 100644 --- a/tools/source/stream/strmunx.cxx +++ b/tools/source/stream/strmunx.cxx @@ -503,7 +503,7 @@ sal_Bool SvFileStream::LockRange( sal_Size nByteOffset, sal_Size nBytes ) { #if OSL_DEBUG_LEVEL > 1 fprintf( stderr, "InternalLock on %s [ %ld ... %ld ] failed\n", - ByteString(aFilename, osl_getThreadTextEncoding()).GetBuffer(), nByteOffset, nByteOffset+nBytes ); + rtl::OUStringToOStroug(aFilename, osl_getThreadTextEncoding()).getStr(), nByteOffset, nByteOffset+nBytes ); #endif return sal_False; } diff --git a/tools/source/stream/strmwnt.cxx b/tools/source/stream/strmwnt.cxx index c9dae13019a7..409504d428fa 100644 --- a/tools/source/stream/strmwnt.cxx +++ b/tools/source/stream/strmwnt.cxx @@ -397,7 +397,7 @@ void SvFileStream::Open( const String& rFilename, StreamMode nMode ) // !!! DirEntry aDirEntry( rFilename ); // !!! aFilename = aDirEntry.GetFull(); aFilename = aParsedFilename; - ByteString aFileNameA( aFilename, osl_getThreadTextEncoding()); + rtl::OString aFileNameA(rtl::OUStringToOString(aFilename, osl_getThreadTextEncoding())); #ifndef BOOTSTRAP FSysRedirector::DoRedirect( aFilename ); #endif @@ -442,7 +442,7 @@ void SvFileStream::Open( const String& rFilename, StreamMode nMode ) } pInstanceData->hFile = CreateFile( - aFileNameA.GetBuffer(), + aFileNameA.getStr(), nAccessMode, nShareMode, (LPSECURITY_ATTRIBUTES)NULL, @@ -476,7 +476,7 @@ void SvFileStream::Open( const String& rFilename, StreamMode nMode ) nOpenAction = OPEN_EXISTING; SetLastError( ERROR_SUCCESS ); pInstanceData->hFile = CreateFile( - aFileNameA.GetBuffer(), + aFileNameA.getStr(), GENERIC_READ, nShareMode, (LPSECURITY_ATTRIBUTES)NULL, |