diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-08-21 23:49:54 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-08-22 09:39:18 +0100 |
| commit | b3c8e4177d24a184ffa854958fb177200608f68c (patch) | |
| tree | e39f1702e132a255954635aa06007f3d92bccc92 /l10ntools | |
| parent | 16032347d9b43d1ccefc185713e43b4d19974de6 (diff) | |
gsl_getSystemTextEncoding->osl_getThreadTextEncoding
Diffstat (limited to 'l10ntools')
| -rw-r--r-- | l10ntools/source/helpmerge.cxx | 4 | ||||
| -rw-r--r-- | l10ntools/source/lngmerge.cxx | 4 | ||||
| -rw-r--r-- | l10ntools/source/localize.cxx | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/l10ntools/source/helpmerge.cxx b/l10ntools/source/helpmerge.cxx index ccb45e47105f..6e7019c7bfe4 100644 --- a/l10ntools/source/helpmerge.cxx +++ b/l10ntools/source/helpmerge.cxx @@ -264,9 +264,9 @@ ByteString HelpParser::makeAbsolutePath( const ByteString& sHelpFile , const Byt String sFullEntry = aEntry.GetFull(); aEntry += DirEntry( String( "..", RTL_TEXTENCODING_ASCII_US )); aEntry += DirEntry( rRoot_in ); - ByteString sPrjEntry( aEntry.GetFull(), gsl_getSystemTextEncoding()); + ByteString sPrjEntry( aEntry.GetFull(), osl_getThreadTextEncoding()); ByteString sActFileName( - sFullEntry.Copy( sPrjEntry.Len() + 1 ), gsl_getSystemTextEncoding()); + sFullEntry.Copy( sPrjEntry.Len() + 1 ), osl_getThreadTextEncoding()); sActFileName.SearchAndReplaceAll( "/", "\\" ); return sActFileName; diff --git a/l10ntools/source/lngmerge.cxx b/l10ntools/source/lngmerge.cxx index 7af3293775f7..a9296e3ec841 100644 --- a/l10ntools/source/lngmerge.cxx +++ b/l10ntools/source/lngmerge.cxx @@ -120,9 +120,9 @@ sal_Bool LngParser::CreateSDF( String sFullEntry = aEntry.GetFull(); aEntry += DirEntry( String( "..", RTL_TEXTENCODING_ASCII_US )); aEntry += DirEntry( rRoot ); - ByteString sPrjEntry( aEntry.GetFull(), gsl_getSystemTextEncoding()); + ByteString sPrjEntry( aEntry.GetFull(), osl_getThreadTextEncoding()); ByteString sActFileName( - sFullEntry.Copy( sPrjEntry.Len() + 1 ), gsl_getSystemTextEncoding()); + sFullEntry.Copy( sPrjEntry.Len() + 1 ), osl_getThreadTextEncoding()); sActFileName.SearchAndReplaceAll( "/", "\\" ); size_t nPos = 0; diff --git a/l10ntools/source/localize.cxx b/l10ntools/source/localize.cxx index d30d08185531..c8a8d340cbf0 100644 --- a/l10ntools/source/localize.cxx +++ b/l10ntools/source/localize.cxx @@ -699,7 +699,7 @@ int _cdecl main( int argc, char *argv[] ) DirEntry aEntry( String( sFileName , RTL_TEXTENCODING_ASCII_US )); aEntry.ToAbs(); String sFullEntry = aEntry.GetFull(); - ByteString sFileABS( aEntry.GetFull(), gsl_getSystemTextEncoding()); + ByteString sFileABS(aEntry.GetFull(), osl_getThreadTextEncoding()); //printf("B %s\nA %s\n",rDestinationFile.GetBuffer(), sFile.GetBuffer()); sFileName = sFileABS; |