diff options
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/bootstrp/cppdep.cxx | 2 | ||||
| -rw-r--r-- | tools/bootstrp/rscdep.cxx | 14 | ||||
| -rw-r--r-- | tools/source/fsys/dirent.cxx | 8 | ||||
| -rw-r--r-- | tools/source/inet/inetmsg.cxx | 2 | ||||
| -rw-r--r-- | tools/source/stream/strmwnt.cxx | 4 |
5 files changed, 11 insertions, 19 deletions
diff --git a/tools/bootstrp/cppdep.cxx b/tools/bootstrp/cppdep.cxx index a5a64fd0f6ce..9829ceee5bbe 100644 --- a/tools/bootstrp/cppdep.cxx +++ b/tools/bootstrp/cppdep.cxx @@ -98,7 +98,7 @@ sal_Bool CppDep::Search( ByteString aFileName ) SvFileStream aFile; ByteString aReadLine; - UniString suFileName( aFileName, gsl_getSystemTextEncoding()); + UniString suFileName(aFileName, osl_getThreadTextEncoding()); aFile.Open( suFileName, STREAM_READ ); while ( aFile.ReadLine( aReadLine )) diff --git a/tools/bootstrp/rscdep.cxx b/tools/bootstrp/rscdep.cxx index d1e26f21d27a..b6ec4ecdd408 100644 --- a/tools/bootstrp/rscdep.cxx +++ b/tools/bootstrp/rscdep.cxx @@ -111,7 +111,7 @@ int main( int argc, char** argv ) if ( aBuf[0] == '-' && aBuf[1] == 'f' && aBuf[2] == 'p' && aBuf[3] == '=' ) { strcpy(pSrsFileName, &aBuf[4]); - String aName( pSrsFileName, gsl_getSystemTextEncoding()); + String aName( pSrsFileName, osl_getThreadTextEncoding()); DirEntry aDest( aName ); aSrsBaseName = aDest.GetBase(); } @@ -126,7 +126,7 @@ int main( int argc, char** argv ) if (aBuf[0] == '@' ) { rtl::OString aToken; - String aRespName( &aBuf[1], gsl_getSystemTextEncoding()); + String aRespName( &aBuf[1], osl_getThreadTextEncoding()); SimpleConfig aConfig( aRespName ); while ((aToken = aConfig.getNext()).getLength()) { @@ -143,7 +143,7 @@ int main( int argc, char** argv ) if ( aBuf2[0] == '-' && aBuf2[1] == 'f' && aBuf2[2] == 'p' ) { strcpy(pSrsFileName, &aBuf2[3]); - String aName( pSrsFileName, gsl_getSystemTextEncoding()); + String aName( pSrsFileName, osl_getThreadTextEncoding()); DirEntry aDest( aName ); aSrsBaseName = aDest.GetBase(); } @@ -205,18 +205,18 @@ int main( int argc, char** argv ) } - String aCwd(pFileNamePrefix, gsl_getSystemTextEncoding()); + String aCwd(pFileNamePrefix, osl_getThreadTextEncoding()); SvFileStream aOutStream; - String aOutputFileName( pOutputFileName, gsl_getSystemTextEncoding()); + String aOutputFileName( pOutputFileName, osl_getThreadTextEncoding()); DirEntry aOutEntry( aOutputFileName ); String aOutPath = aOutEntry.GetPath().GetFull(); String aFileName( aOutPath ); aFileName += aDelim; aFileName += aCwd; - aFileName += String(".", gsl_getSystemTextEncoding()); + aFileName += String(".", osl_getThreadTextEncoding()); aFileName += aSrsBaseName; - aFileName += String(".dprr", gsl_getSystemTextEncoding()); + aFileName += String(".dprr", osl_getThreadTextEncoding()); aOutStream.Open( aFileName, STREAM_WRITE ); ByteString aString; diff --git a/tools/source/fsys/dirent.cxx b/tools/source/fsys/dirent.cxx index fd4bf8f4faa8..64d2319828c1 100644 --- a/tools/source/fsys/dirent.cxx +++ b/tools/source/fsys/dirent.cxx @@ -905,19 +905,13 @@ sal_Bool DirEntry::First() String aUniPathName( GetPath().GetFull() ); #ifndef BOOTSTRAP FSysRedirector::DoRedirect( aUniPathName ); - rtl::OString aPathName(rtl::OUStringToOString(aUniPathName, osl_getThreadTextEncoding())); -#else - rtl::OString aPathName(rtl::OUStringToOString(aUniPathName, gsl_getSystemTextEncoding())); #endif + rtl::OString aPathName(rtl::OUStringToOString(aUniPathName, osl_getThreadTextEncoding())); DIR *pDir = opendir(aPathName.getStr()); if ( pDir ) { -#ifndef BOOTSTRAP WildCard aWildeKarte( String(CMP_LOWER( aName ), osl_getThreadTextEncoding()) ); -#else - WildCard aWildeKarte( String(CMP_LOWER( aName ), gsl_getSystemTextEncoding()) ); -#endif for ( dirent* pEntry = readdir( pDir ); pEntry; pEntry = readdir( pDir ) ) diff --git a/tools/source/inet/inetmsg.cxx b/tools/source/inet/inetmsg.cxx index d6b67fe06b4b..24e564240529 100644 --- a/tools/source/inet/inetmsg.cxx +++ b/tools/source/inet/inetmsg.cxx @@ -116,7 +116,7 @@ void INetMessage::SetHeaderField_Impl ( { INetMIMEStringOutputSink aSink (0, STRING_MAXLEN); INetMIME::writeHeaderFieldBody ( - aSink, eType, rValue, gsl_getSystemTextEncoding(), false); + aSink, eType, rValue, osl_getThreadTextEncoding(), false); SetHeaderField_Impl ( INetMessageHeader (rName, aSink.takeBuffer()), rnIndex); } diff --git a/tools/source/stream/strmwnt.cxx b/tools/source/stream/strmwnt.cxx index 5ccaf4123493..c9dae13019a7 100644 --- a/tools/source/stream/strmwnt.cxx +++ b/tools/source/stream/strmwnt.cxx @@ -397,10 +397,8 @@ void SvFileStream::Open( const String& rFilename, StreamMode nMode ) // !!! DirEntry aDirEntry( rFilename ); // !!! aFilename = aDirEntry.GetFull(); aFilename = aParsedFilename; -#ifdef BOOTSTRAP - ByteString aFileNameA( aFilename, gsl_getSystemTextEncoding()); -#else ByteString aFileNameA( aFilename, osl_getThreadTextEncoding()); +#ifndef BOOTSTRAP FSysRedirector::DoRedirect( aFilename ); #endif SetLastError( ERROR_SUCCESS ); // ggf. durch Redirector geaendert! |