gsl_getSystemTextEncoding->osl_getThreadTextEncoding

31 files changed, 61 insertions, 69 deletions

diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index f6f0ee48d4fe..9fc514a083da 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -2468,7 +2468,7 @@ void OfaAutoCompleteTabPage::CopyToClipboard() const
                 "\015\012";
 #endif
 
-        rtl_TextEncoding nEncode = gsl_getSystemTextEncoding();
+        rtl_TextEncoding nEncode = osl_getThreadTextEncoding();
 
         for( sal_uInt16 n = 0; n < nSelCnt; ++n )
         {
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;
 
diff --git a/rsc/inc/rscdb.hxx b/rsc/inc/rscdb.hxx
index 012c340bc42e..b7eecdc33e09 100644
--- a/rsc/inc/rscdb.hxx
+++ b/rsc/inc/rscdb.hxx
@@ -315,7 +315,7 @@ public:
                     { return (nFlags & NOSYSRESTEST_FLAG) ? sal_False : sal_True; }
     sal_Bool            IsSrsDefault() const
                     { return (nFlags & SRSDEFAULT_FLAG) ? sal_True : sal_False; }
-    ByteString      ChangeLanguage( const ByteString& rNewLang );
+    rtl::OString ChangeLanguage(const rtl::OString & rNewLang);
     const std::vector< sal_uInt32 >& GetFallbacks() const
     { return aLangFallbacks; }
 
diff --git a/rsc/source/parser/rscdb.cxx b/rsc/source/parser/rscdb.cxx
index 1c7e544e18eb..3368c1fb54f8 100644
--- a/rsc/source/parser/rscdb.cxx
+++ b/rsc/source/parser/rscdb.cxx
@@ -130,9 +130,9 @@ static sal_uInt32 getLangIdAndShortenLocale( RscTypCont* pTypCont,
     return nRet;
 }
 
-ByteString RscTypCont::ChangeLanguage( const ByteString& rNewLang )
+rtl::OString RscTypCont::ChangeLanguage(const rtl::OString& rNewLang)
 {
-    ByteString aRet = aLanguage;
+    rtl::OString aRet = aLanguage;
     aLanguage = rNewLang;
 
     rtl::OString aLang = aLanguage;
@@ -145,8 +145,8 @@ ByteString RscTypCont::ChangeLanguage( const ByteString& rNewLang )
         aVariant = aLang.copy( nIndex );
 
     bool bAppendEnUsFallback =
-        ! (rNewLang.EqualsIgnoreCaseAscii( "en-US" ) ||
-           rNewLang.EqualsIgnoreCaseAscii( "x-no-translate" ) );
+        ! (rNewLang.equalsIgnoreAsciiCase( "en-US" ) ||
+           rNewLang.equalsIgnoreAsciiCase( "x-no-translate" ) );
 
 #if OSL_DEBUG_LEVEL > 1
     fprintf( stderr, "RscTypCont::ChangeLanguage:" );
diff --git a/svtools/source/config/htmlcfg.cxx b/svtools/source/config/htmlcfg.cxx
index 338fd0d6e40c..4b4f3424e1dd 100644
--- a/svtools/source/config/htmlcfg.cxx
+++ b/svtools/source/config/htmlcfg.cxx
@@ -68,7 +68,7 @@ struct HtmlOptions_Impl
     HtmlOptions_Impl() :
         nFlags(HTMLCFG_LOCAL_GRF|HTMLCFG_IS_BASIC_WARNING),
         nExportMode(HTML_CFG_NS40),
-        eEncoding( gsl_getSystemTextEncoding() ),
+        eEncoding( osl_getThreadTextEncoding() ),
         bIsEncodingDefault(sal_True)
     {
         aFontSizeArr[0] = HTMLFONTSZ1_DFLT;
diff --git a/svtools/source/control/ctrltool.cxx b/svtools/source/control/ctrltool.cxx
index 9be060d94403..83f624435a77 100644
--- a/svtools/source/control/ctrltool.cxx
+++ b/svtools/source/control/ctrltool.cxx
@@ -249,7 +249,7 @@ ImplFontListNameInfo* FontList::ImplFindByName( const XubString& rStr ) const
 void FontList::ImplInsertFonts( OutputDevice* pDevice, sal_Bool bAll,
                                 sal_Bool bInsertData )
 {
-    rtl_TextEncoding eSystemEncoding = gsl_getSystemTextEncoding();
+    rtl_TextEncoding eSystemEncoding = osl_getThreadTextEncoding();
 
     sal_uInt16 nType;
     if ( pDevice->GetOutDevType() != OUTDEV_PRINTER )
diff --git a/svtools/source/filter/sgvtext.cxx b/svtools/source/filter/sgvtext.cxx
index 3dbc61a96894..f303ebfa4ac0 100644
--- a/svtools/source/filter/sgvtext.cxx
+++ b/svtools/source/filter/sgvtext.cxx
@@ -1208,7 +1208,7 @@ void SgfFontOne::ReadOne( const rtl::OString& rID, ByteString& Dsc )
             else if (matchL(s, RTL_CONSTASCII_USTRINGPARAM("IBMPC"))) SVChSet=RTL_TEXTENCODING_IBM_850;
             else if (matchL(s, RTL_CONSTASCII_USTRINGPARAM("MAC"))) SVChSet=RTL_TEXTENCODING_APPLE_ROMAN;
             else if (matchL(s, RTL_CONSTASCII_USTRINGPARAM("SYMBOL"))) SVChSet=RTL_TEXTENCODING_SYMBOL;
-            else if (matchL(s, RTL_CONSTASCII_USTRINGPARAM("SYSTEM"))) SVChSet = gsl_getSystemTextEncoding();
+            else if (matchL(s, RTL_CONSTASCII_USTRINGPARAM("SYSTEM"))) SVChSet = osl_getThreadTextEncoding();
             else if (comphelper::string::isAsciiDecimalString(s) ) SVWidth=sal::static_int_cast< sal_uInt16 >(s.toInt32());
         }
     }
diff --git a/svtools/source/filter/wmf/winwmf.cxx b/svtools/source/filter/wmf/winwmf.cxx
index f9700816e2f8..48c2222645bb 100644
--- a/svtools/source/filter/wmf/winwmf.cxx
+++ b/svtools/source/filter/wmf/winwmf.cxx
@@ -759,11 +759,11 @@ void WMFReader::ReadRecordParams( sal_uInt16 nFunc )
 
             CharSet eCharSet;
             if ( ( aLogFont.lfCharSet == OEM_CHARSET ) || ( aLogFont.lfCharSet == DEFAULT_CHARSET ) )
-                eCharSet = gsl_getSystemTextEncoding();
+                eCharSet = osl_getThreadTextEncoding();
             else
                 eCharSet = rtl_getTextEncodingFromWindowsCharset( aLogFont.lfCharSet );
             if ( eCharSet == RTL_TEXTENCODING_DONTKNOW )
-                eCharSet = gsl_getSystemTextEncoding();
+                eCharSet = osl_getThreadTextEncoding();
             if ( eCharSet == RTL_TEXTENCODING_SYMBOL )
                 eCharSet = RTL_TEXTENCODING_MS_1252;
             aLogFont.alfFaceName = UniString( lfFaceName, eCharSet );
diff --git a/svtools/source/misc/imap.cxx b/svtools/source/misc/imap.cxx
index 39bb9f83bd87..59d1085e9d81 100644
--- a/svtools/source/misc/imap.cxx
+++ b/svtools/source/misc/imap.cxx
@@ -98,7 +98,7 @@ sal_uInt16 IMapObject::GetVersion() const
 void IMapObject::Write( SvStream& rOStm, const String& rBaseURL ) const
 {
     IMapCompat*             pCompat;
-    const rtl_TextEncoding  eEncoding = gsl_getSystemTextEncoding();
+    const rtl_TextEncoding  eEncoding = osl_getThreadTextEncoding();
 
     rOStm << GetType();
     rOStm << GetVersion();
@@ -1121,7 +1121,7 @@ void ImageMap::Write( SvStream& rOStm, const String& rBaseURL ) const
     String                  aDummy;
     sal_uInt16                  nOldFormat = rOStm.GetNumberFormatInt();
     sal_uInt16                  nCount = (sal_uInt16) GetIMapObjectCount();
-    const rtl_TextEncoding  eEncoding = gsl_getSystemTextEncoding();
+    const rtl_TextEncoding  eEncoding = osl_getThreadTextEncoding();
 
     rOStm.SetNumberFormatInt( NUMBERFORMAT_INT_LITTLEENDIAN );
 
@@ -1171,7 +1171,7 @@ void ImageMap::Read( SvStream& rIStm, const String& rBaseURL )
         // Version ueberlesen wir
         rIStm.SeekRel( 2 );
 
-        rIStm.ReadByteString( aString ); aName = String( aString, gsl_getSystemTextEncoding() );
+        rIStm.ReadByteString( aString ); aName = String( aString, osl_getThreadTextEncoding() );
         rIStm.ReadByteString( aString ); // Dummy
         rIStm >> nCount;
         rIStm.ReadByteString( aString ); // Dummy
diff --git a/svtools/source/misc/imap2.cxx b/svtools/source/misc/imap2.cxx
index 359615a1b2c2..b28093172921 100644
--- a/svtools/source/misc/imap2.cxx
+++ b/svtools/source/misc/imap2.cxx
@@ -73,12 +73,12 @@ void IMapObject::AppendNCSACoords(rtl::OStringBuffer& rBuf, const Point& rPoint1
 
 void IMapObject::AppendCERNURL(rtl::OStringBuffer& rBuf, const String& rBaseURL) const
 {
-    rBuf.append(rtl::OUStringToOString(URIHelper::simpleNormalizedMakeRelative(rBaseURL, aURL), gsl_getSystemTextEncoding()));
+    rBuf.append(rtl::OUStringToOString(URIHelper::simpleNormalizedMakeRelative(rBaseURL, aURL), osl_getThreadTextEncoding()));
 }
 
 void IMapObject::AppendNCSAURL(rtl::OStringBuffer& rBuf, const String& rBaseURL) const
 {
-    rBuf.append(rtl::OUStringToOString(URIHelper::simpleNormalizedMakeRelative(rBaseURL, aURL), gsl_getSystemTextEncoding()));
+    rBuf.append(rtl::OUStringToOString(URIHelper::simpleNormalizedMakeRelative(rBaseURL, aURL), osl_getThreadTextEncoding()));
     rBuf.append(' ');
 }
 
diff --git a/svtools/source/misc/transfer.cxx b/svtools/source/misc/transfer.cxx
index cbb5eedb3bb3..71763b95915a 100644
--- a/svtools/source/misc/transfer.cxx
+++ b/svtools/source/misc/transfer.cxx
@@ -98,8 +98,8 @@ SvStream& operator>>( SvStream& rIStm, TransferableObjectDescriptor& rObjDesc )
     rIStm >> rObjDesc.maSize.Height();
     rIStm >> rObjDesc.maDragStartPos.X();
     rIStm >> rObjDesc.maDragStartPos.Y();
-    rIStm.ReadByteString( rObjDesc.maTypeName, gsl_getSystemTextEncoding() );
-    rIStm.ReadByteString( rObjDesc.maDisplayName, gsl_getSystemTextEncoding() );
+    rIStm.ReadByteString( rObjDesc.maTypeName, osl_getThreadTextEncoding() );
+    rIStm.ReadByteString( rObjDesc.maDisplayName, osl_getThreadTextEncoding() );
     rIStm >> nSig1 >> nSig2;
 
     rObjDesc.mnViewAspect = static_cast< sal_uInt16 >( nViewAspect );
@@ -128,8 +128,8 @@ SvStream& operator<<( SvStream& rOStm, const TransferableObjectDescriptor& rObjD
     rOStm << rObjDesc.maSize.Height();
     rOStm << rObjDesc.maDragStartPos.X();
     rOStm << rObjDesc.maDragStartPos.Y();
-    rOStm.WriteByteString( rObjDesc.maTypeName, gsl_getSystemTextEncoding() );
-    rOStm.WriteByteString( rObjDesc.maDisplayName, gsl_getSystemTextEncoding() );
+    rOStm.WriteByteString( rObjDesc.maTypeName, osl_getThreadTextEncoding() );
+    rOStm.WriteByteString( rObjDesc.maDisplayName, osl_getThreadTextEncoding() );
     rOStm << nSig1 << nSig2;
 
     const sal_uInt32 nLastPos = rOStm.Tell();
@@ -781,7 +781,7 @@ sal_Bool TransferableHelper::SetString( const ::rtl::OUString& rString, const Da
         TransferableDataHelper::IsEqual( aFileFlavor, rFlavor ) )
     {
         const String            aString( rString );
-        const ByteString        aByteStr( aString, gsl_getSystemTextEncoding() );
+        const ByteString        aByteStr( aString, osl_getThreadTextEncoding() );
         Sequence< sal_Int8 >    aSeq( aByteStr.Len() + 1 );
 
         rtl_copyMemory( aSeq.getArray(), aByteStr.GetBuffer(), aByteStr.Len() );
@@ -874,7 +874,7 @@ sal_Bool TransferableHelper::SetTransferableObjectDescriptor( const Transferable
 sal_Bool TransferableHelper::SetINetBookmark( const INetBookmark& rBmk,
                                               const ::com::sun::star::datatransfer::DataFlavor& rFlavor )
 {
-    rtl_TextEncoding eSysCSet = gsl_getSystemTextEncoding();
+    rtl_TextEncoding eSysCSet = osl_getThreadTextEncoding();
 
     switch( SotExchange::GetFormat( rFlavor ) )
     {
@@ -1709,7 +1709,7 @@ sal_Bool TransferableDataHelper::GetString( const DataFlavor& rFlavor, ::rtl::OU
             while( nLen && ( 0 == *( pChars + nLen - 1 ) ) )
                 --nLen;
 
-            rStr = ::rtl::OUString( pChars, nLen, gsl_getSystemTextEncoding() );
+            rStr = ::rtl::OUString( pChars, nLen, osl_getThreadTextEncoding() );
             bRet = sal_True;
         }
     }
@@ -1981,8 +1981,8 @@ sal_Bool TransferableDataHelper::GetINetBookmark( const ::com::sun::star::datatr
 
             if( GetSequence( rFlavor, aSeq ) && ( 2048 == aSeq.getLength() ) )
             {
-                rBmk = INetBookmark( String( reinterpret_cast< const sal_Char* >( aSeq.getConstArray() ), gsl_getSystemTextEncoding() ),
-                                     String( reinterpret_cast< const sal_Char* >( aSeq.getConstArray() ) + 1024, gsl_getSystemTextEncoding() ) );
+                rBmk = INetBookmark( String( reinterpret_cast< const sal_Char* >( aSeq.getConstArray() ), osl_getThreadTextEncoding() ),
+                                     String( reinterpret_cast< const sal_Char* >( aSeq.getConstArray() ) + 1024, osl_getThreadTextEncoding() ) );
                 bRet = sal_True;
             }
         }
@@ -2000,7 +2000,7 @@ sal_Bool TransferableDataHelper::GetINetBookmark( const ::com::sun::star::datatr
                 if( pFDesc->cItems )
                 {
                     ByteString          aDesc( pFDesc->fgd[ 0 ].cFileName );
-                    rtl_TextEncoding    eTextEncoding = gsl_getSystemTextEncoding();
+                    rtl_TextEncoding    eTextEncoding = osl_getThreadTextEncoding();
 
                     if( ( aDesc.Len() > 4 ) && aDesc.Copy( aDesc.Len() - 4 ).EqualsIgnoreCaseAscii( ".URL" ) )
                     {
diff --git a/svtools/source/svhtml/htmlout.cxx b/svtools/source/svhtml/htmlout.cxx
index fc1eea6bf6de..fd669c927c93 100644
--- a/svtools/source/svhtml/htmlout.cxx
+++ b/svtools/source/svhtml/htmlout.cxx
@@ -55,7 +55,7 @@ const sal_Char HTMLOutFuncs::sNewLine[] = "\015\012";
 HTMLOutContext::HTMLOutContext( rtl_TextEncoding eDestEnc )
 {
     m_eDestEnc = RTL_TEXTENCODING_DONTKNOW == eDestEnc
-                    ? gsl_getSystemTextEncoding()
+                    ? osl_getThreadTextEncoding()
                     : eDestEnc;
 
     m_hConv = rtl_createUnicodeToTextConverter( eDestEnc );
@@ -620,7 +620,7 @@ SvStream& HTMLOutFuncs::Out_ImageMap( SvStream& rStream,
                                         String *pNonConvertableChars    )
 {
     if( RTL_TEXTENCODING_DONTKNOW == eDestEnc )
-        eDestEnc = gsl_getSystemTextEncoding();
+        eDestEnc = osl_getThreadTextEncoding();
 
     const String& rOutName = rName.Len() ? rName : rIMap.GetName();
     DBG_ASSERT( rOutName.Len(), "Kein ImageMap-Name" );
@@ -797,7 +797,7 @@ SvStream& HTMLOutFuncs::OutScript( SvStream& rStrm,
                                    String *pNonConvertableChars )
 {
     if( RTL_TEXTENCODING_DONTKNOW == eDestEnc )
-        eDestEnc = gsl_getSystemTextEncoding();
+        eDestEnc = osl_getThreadTextEncoding();
 
     // Script wird komplett nicht eingerueckt!
     ByteString sOut( '<' );
diff --git a/svtools/source/urlobj/inetimg.cxx b/svtools/source/urlobj/inetimg.cxx
index 1994acdf5ceb..4bfa012c9390 100644
--- a/svtools/source/urlobj/inetimg.cxx
+++ b/svtools/source/urlobj/inetimg.cxx
@@ -105,7 +105,7 @@ sal_Bool INetImage::Read( SvStream& rIStm, sal_uLong nFormat )
     int     iExtraHTML_Offset;  // Extra HTML (stored in CImageElement)
     sal_Char pImageURL[1];      // Append all variable-length strings starting here
 */
-            rtl_TextEncoding eSysCSet = gsl_getSystemTextEncoding();
+            rtl_TextEncoding eSysCSet = osl_getThreadTextEncoding();
             sal_Int32 nVal, nAnchorOffset, nAltOffset, nFilePos;
             ByteString sData;
 
diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx
index 19a76c9052c8..7fdf3b522d8f 100644
--- a/toolkit/source/awt/vclxtoolkit.cxx
+++ b/toolkit/source/awt/vclxtoolkit.cxx
@@ -368,7 +368,7 @@ sal_uInt16 ImplGetComponentType( const String& rServiceName )
 
 
     ComponentInfo aSearch;
-    ByteString aServiceName( rServiceName, gsl_getSystemTextEncoding() );
+    ByteString aServiceName( rServiceName, osl_getThreadTextEncoding() );
     aServiceName.ToLowerAscii();
     if ( aServiceName.Len() )
         aSearch.pName = aServiceName.GetBuffer();
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!
diff --git a/unotools/source/misc/syslocale.cxx b/unotools/source/misc/syslocale.cxx
index f5382b2c2074..4233828bd7db 100644
--- a/unotools/source/misc/syslocale.cxx
+++ b/unotools/source/misc/syslocale.cxx
@@ -192,7 +192,7 @@ LanguageType SvtSysLocale::GetUILanguage() const
 rtl_TextEncoding SvtSysLocale::GetBestMimeEncoding()
 {
     const sal_Char* pCharSet = rtl_getBestMimeCharsetFromTextEncoding(
-            gsl_getSystemTextEncoding() );
+            osl_getThreadTextEncoding() );
     if ( !pCharSet )
     {
         // If the system locale is unknown to us, e.g. LC_ALL=xx, match the UI
diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx
index 1683faf1613a..eec8ba560917 100644
--- a/vcl/source/app/settings.cxx
+++ b/vcl/source/app/settings.cxx
@@ -546,7 +546,7 @@ ImplStyleData::ImplStyleData( const ImplStyleData& rData ) :
 void ImplStyleData::SetStandardStyles()
 {
     Font aStdFont( FAMILY_SWISS, Size( 0, 8 ) );
-    aStdFont.SetCharSet( gsl_getSystemTextEncoding() );
+    aStdFont.SetCharSet( osl_getThreadTextEncoding() );
     aStdFont.SetWeight( WEIGHT_NORMAL );
     aStdFont.SetName( utl::DefaultFontConfiguration::get().getUserInterfaceFont(com::sun::star::lang::Locale( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("en") ), rtl::OUString(), rtl::OUString() ) ) );
     maAppFont                   = aStdFont;
diff --git a/vcl/source/gdi/cvtsvm.cxx b/vcl/source/gdi/cvtsvm.cxx
index 193c066b1d98..119029068b3c 100644
--- a/vcl/source/gdi/cvtsvm.cxx
+++ b/vcl/source/gdi/cvtsvm.cxx
@@ -298,7 +298,7 @@ void ImplWriteFont( SvStream& rOStm, const Font& rFont,
     rOStm << rFont.IsShadow();
     rOStm << rFont.IsTransparent();
     if ( rActualCharSet == RTL_TEXTENCODING_DONTKNOW )
-        rActualCharSet = gsl_getSystemTextEncoding();
+        rActualCharSet = osl_getThreadTextEncoding();
 }
 
 // ------------------------------------------------------------------------
@@ -541,7 +541,7 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf )
     LineInfo            aLineInfo( LINE_NONE, 0 );
     Stack               aLIStack;
     VirtualDevice       aFontVDev;
-    rtl_TextEncoding    eActualCharSet = gsl_getSystemTextEncoding();
+    rtl_TextEncoding    eActualCharSet = osl_getThreadTextEncoding();
     sal_Bool                bFatLine = sal_False;
 
     // TODO: fix reindentation below if you can accept being blamed by the SCM
@@ -868,7 +868,7 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf )
 
                     eActualCharSet = aFont.GetCharSet();
                     if ( eActualCharSet == RTL_TEXTENCODING_DONTKNOW )
-                        eActualCharSet = gsl_getSystemTextEncoding();
+                        eActualCharSet = osl_getThreadTextEncoding();
 
                     rMtf.AddAction( new MetaFontAction( aFont ) );
                     rMtf.AddAction( new MetaTextAlignAction( aFont.GetAlign() ) );
@@ -1384,7 +1384,7 @@ void SVMConverter::ImplConvertToSVM1( SvStream& rOStm, GDIMetaFile& rMtf )
     sal_uLong               nCountPos;
     Font                aSaveFont;
     const sal_uInt16        nOldFormat = rOStm.GetNumberFormatInt();
-    rtl_TextEncoding    eActualCharSet = gsl_getSystemTextEncoding();
+    rtl_TextEncoding    eActualCharSet = osl_getThreadTextEncoding();
     const Size          aPrefSize( rMtf.GetPrefSize() );
     sal_Bool                bRop_0_1 = sal_False;
     VirtualDevice       aSaveVDev;
diff --git a/vcl/source/gdi/metaact.cxx b/vcl/source/gdi/metaact.cxx
index 32c4a589f54d..99e56ece49ad 100644
--- a/vcl/source/gdi/metaact.cxx
+++ b/vcl/source/gdi/metaact.cxx
@@ -3549,7 +3549,7 @@ void MetaFontAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
     rOStm << maFont;
     pData->meActualCharSet = maFont.GetCharSet();
     if ( pData->meActualCharSet == RTL_TEXTENCODING_DONTKNOW )
-        pData->meActualCharSet = gsl_getSystemTextEncoding();
+        pData->meActualCharSet = osl_getThreadTextEncoding();
 }
 
 // ------------------------------------------------------------------------
@@ -3560,7 +3560,7 @@ void MetaFontAction::Read( SvStream& rIStm, ImplMetaReadData* pData )
     rIStm >> maFont;
     pData->meActualCharSet = maFont.GetCharSet();
     if ( pData->meActualCharSet == RTL_TEXTENCODING_DONTKNOW )
-        pData->meActualCharSet = gsl_getSystemTextEncoding();
+        pData->meActualCharSet = osl_getThreadTextEncoding();
 }
 
 // ========================================================================
diff --git a/vcl/source/gdi/outdev3.cxx b/vcl/source/gdi/outdev3.cxx
index aa0c77fda2dd..722bcbeaabfc 100755
--- a/vcl/source/gdi/outdev3.cxx
+++ b/vcl/source/gdi/outdev3.cxx
@@ -581,7 +581,7 @@ Font OutputDevice::GetDefaultFont( sal_uInt16 nType, LanguageType eLang,
         aFont.SetLanguage( eLang );
 
         if ( aFont.GetCharSet() == RTL_TEXTENCODING_DONTKNOW )
-            aFont.SetCharSet( gsl_getSystemTextEncoding() );
+            aFont.SetCharSet( osl_getThreadTextEncoding() );
 
         // Should we only return available fonts on the given device
         if ( pOutDev )
diff --git a/vcl/unx/generic/app/i18n_cb.cxx b/vcl/unx/generic/app/i18n_cb.cxx
index 9b2283aaef72..d0cf39fdc4d4 100644
--- a/vcl/unx/generic/app/i18n_cb.cxx
+++ b/vcl/unx/generic/app/i18n_cb.cxx
@@ -614,7 +614,7 @@ StatusDrawCallback (XIC ic, XPointer client_data, XIMStatusDrawCallbackStruct *c
                 }
             }
             if( nLength )
-                aText = String( pMBString, nLength, gsl_getSystemTextEncoding() );
+                aText = String( pMBString, nLength, osl_getThreadTextEncoding() );
         }
         ::vcl::I18NStatus::get().setStatusText( aText );
     }
diff --git a/vcl/unx/generic/plugadapt/salplug.cxx b/vcl/unx/generic/plugadapt/salplug.cxx
index e48ea3dc743d..51321b8c47ef 100644
--- a/vcl/unx/generic/plugadapt/salplug.cxx
+++ b/vcl/unx/generic/plugadapt/salplug.cxx
@@ -272,7 +272,7 @@ void SalAbort( const XubString& rErrorText )
     if( !rErrorText.Len() )
         std::fprintf( stderr, "Application Error\n" );
     else
-        std::fprintf( stderr, "%s\n", rtl::OUStringToOString(rErrorText, gsl_getSystemTextEncoding()).getStr() );
+        std::fprintf( stderr, "%s\n", rtl::OUStringToOString(rErrorText, osl_getThreadTextEncoding()).getStr() );
     exit(-1);
 }
 
diff --git a/vcl/unx/generic/printer/printerinfomanager.cxx b/vcl/unx/generic/printer/printerinfomanager.cxx
index d04ef42bfd80..0cd00db12c65 100644
--- a/vcl/unx/generic/printer/printerinfomanager.cxx
+++ b/vcl/unx/generic/printer/printerinfomanager.cxx
@@ -233,7 +233,7 @@ bool PrinterInfoManager::checkPrintersChanged( bool bWait )
 void PrinterInfoManager::initialize()
 {
     m_bUseIncludeFeature = false;
-    rtl_TextEncoding aEncoding = gsl_getSystemTextEncoding();
+    rtl_TextEncoding aEncoding = osl_getThreadTextEncoding();
     m_aPrinters.clear();
     m_aWatchFiles.clear();
     OUString aDefaultPrinter;
diff --git a/xmloff/source/draw/sdxmlimp.cxx b/xmloff/source/draw/sdxmlimp.cxx
index c8bcf741b198..9da00b9b2eb6 100644
--- a/xmloff/source/draw/sdxmlimp.cxx
+++ b/xmloff/source/draw/sdxmlimp.cxx
@@ -839,7 +839,7 @@ SvXMLImportContext *SdXMLImport::CreateFontDeclsContext(const OUString& rLocalNa
     XMLFontStylesContext *pFSContext =
             new XMLFontStylesContext( *this, XML_NAMESPACE_OFFICE,
                                       rLocalName, xAttrList,
-                                      gsl_getSystemTextEncoding() );
+                                      osl_getThreadTextEncoding() );
     SetFontDecls( pFSContext );
     return pFSContext;
 }
diff --git a/xmloff/source/text/txtimppr.cxx b/xmloff/source/text/txtimppr.cxx
index dcd8c9f559e1..64598e687615 100644
--- a/xmloff/source/text/txtimppr.cxx
+++ b/xmloff/source/text/txtimppr.cxx
@@ -255,7 +255,7 @@ void XMLTextImportPropertyMapper::FontDefaultsCheck(
 
         if( !pFontCharSet )
         {
-            aAny <<= (sal_Int16)gsl_getSystemTextEncoding();
+            aAny <<= (sal_Int16)osl_getThreadTextEncoding();
     #ifdef DBG_UTIL
                 sal_Int16 nTmp = getPropertySetMapper()->GetEntryContextId(
                                                 pFontFamilyName->mnIndex + 4 );