gsl_getSystemTextEncoding -> osl_getThreadTextEncoding

48 files changed, 75 insertions, 75 deletions

diff --git a/binfilter/bf_basic/source/classes/image.cxx b/binfilter/bf_basic/source/classes/image.cxx
index 88600c46e..c41c51a64 100644
--- a/binfilter/bf_basic/source/classes/image.cxx
+++ b/binfilter/bf_basic/source/classes/image.cxx
@@ -51,7 +51,7 @@ SbiImage::SbiImage()
     bInit      =
     bError     = FALSE;
     bFirstInit = TRUE;
-    eCharSet   = gsl_getSystemTextEncoding();
+    eCharSet   = osl_getThreadTextEncoding();
 }
 
 SbiImage::~SbiImage()
@@ -73,7 +73,7 @@ void SbiImage::Clear()
     nStringSize= 0;
     nLegacyCodeSize  = 0;
     nCodeSize  = 0;
-    eCharSet   = gsl_getSystemTextEncoding();
+    eCharSet   = osl_getThreadTextEncoding();
     nDimBase   = 0;
     bError     = FALSE;
 }
diff --git a/binfilter/bf_basic/source/classes/sbxmod.cxx b/binfilter/bf_basic/source/classes/sbxmod.cxx
index c38bf2c54..e66433050 100644
--- a/binfilter/bf_basic/source/classes/sbxmod.cxx
+++ b/binfilter/bf_basic/source/classes/sbxmod.cxx
@@ -608,7 +608,7 @@ BOOL SbJScriptModule::LoadData( SvStream& rStrm, USHORT nVer )
 
     // Source-String holen
     String aTmp;
-    rStrm.ReadByteString( aTmp, gsl_getSystemTextEncoding() );
+    rStrm.ReadByteString( aTmp, osl_getThreadTextEncoding() );
     aOUSource = aTmp;
     return TRUE;
 }
diff --git a/binfilter/bf_basic/source/comp/buffer.cxx b/binfilter/bf_basic/source/comp/buffer.cxx
index 61144b67a..adf3ea36b 100644
--- a/binfilter/bf_basic/source/comp/buffer.cxx
+++ b/binfilter/bf_basic/source/comp/buffer.cxx
@@ -158,7 +158,7 @@ BOOL SbiBuffer::operator +=( const String& n )
     USHORT l = n.Len() + 1;
     if( Check( l ) )
     {
-        ByteString aByteStr( n, gsl_getSystemTextEncoding() );
+        ByteString aByteStr( n, osl_getThreadTextEncoding() );
         memcpy( pCur, aByteStr.GetBuffer(), l );
         pCur += l;
         nOff = nOff + l;
diff --git a/binfilter/bf_forms/source/component/forms_DatabaseForm.cxx b/binfilter/bf_forms/source/component/forms_DatabaseForm.cxx
index 55ac80efb..fdbf59fac 100644
--- a/binfilter/bf_forms/source/component/forms_DatabaseForm.cxx
+++ b/binfilter/bf_forms/source/component/forms_DatabaseForm.cxx
@@ -1042,7 +1042,7 @@ void ODatabaseForm::InsertTextPart( INetMIMEMessage& rParent, const ::rtl::OUStr
     pChild->SetContentDisposition( aContentDisp );
     pChild->SetContentType( UniString::CreateFromAscii("text/plain") );
 
-    rtl_TextEncoding eSystemEncoding = gsl_getSystemTextEncoding();
+    rtl_TextEncoding eSystemEncoding = osl_getThreadTextEncoding();
     const sal_Char* pBestMatchingEncoding = rtl_getBestMimeCharsetFromTextEncoding( eSystemEncoding );
     UniString aBestMatchingEncoding = UniString::CreateFromAscii( pBestMatchingEncoding );
     pChild->SetContentTransferEncoding(aBestMatchingEncoding);
diff --git a/binfilter/bf_sc/source/core/data/sc_documen2.cxx b/binfilter/bf_sc/source/core/data/sc_documen2.cxx
index 63c081d8a..e02d64981 100644
--- a/binfilter/bf_sc/source/core/data/sc_documen2.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_documen2.cxx
@@ -284,7 +284,7 @@ namespace binfilter {
 /*N*/           bInUnoBroadcast( FALSE ),
 /*N*/           bStyleSheetUsageInvalid( TRUE )
 /*N*/ {
-/*N*/   eSrcSet = gsl_getSystemTextEncoding();
+/*N*/   eSrcSet = osl_getThreadTextEncoding();
 /*N*/   nSrcVer = SC_CURRENT_VERSION;
 /*N*/   nSrcMaxRow = MAXROW;
 /*N*/
diff --git a/binfilter/bf_sc/source/core/data/sc_documen9.cxx b/binfilter/bf_sc/source/core/data/sc_documen9.cxx
index 6be9c7106..ae1922697 100644
--- a/binfilter/bf_sc/source/core/data/sc_documen9.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_documen9.cxx
@@ -351,7 +351,7 @@ namespace binfilter {
 /*N*/
 /*N*/   BOOL bUpdateOld = ( nSrcVer < SC_FONTCHARSET );
 /*N*/
-/*N*/   CharSet eSysSet = gsl_getSystemTextEncoding();
+/*N*/   CharSet eSysSet = osl_getThreadTextEncoding();
 /*N*/   if ( eSrcSet != eSysSet || bUpdateOld )
 /*N*/   {
 /*N*/       USHORT nCount,i;
diff --git a/binfilter/bf_sc/source/core/data/sc_document.cxx b/binfilter/bf_sc/source/core/data/sc_document.cxx
index b1f75213e..dc9b4ea70 100644
--- a/binfilter/bf_sc/source/core/data/sc_document.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_document.cxx
@@ -2439,7 +2439,7 @@ namespace binfilter {
 /*N*/                   {
 /*N*/                       //  StylePool konvertiert beim Laden selber
 /*N*/                       CharSet eOld = rStream.GetStreamCharSet();
-/*N*/                       rStream.SetStreamCharSet( gsl_getSystemTextEncoding() );    //! ???
+/*N*/                       rStream.SetStreamCharSet( osl_getThreadTextEncoding() );    //! ???
 /*N*/                       xPoolHelper->GetStylePool()->Load( rStream );
 /*N*/                       rStream.SetStreamCharSet( eOld );
 /*N*/                       lcl_RemoveMergeFromStyles( xPoolHelper->GetStylePool() );   // setzt auch ReadOnly zurueck
diff --git a/binfilter/bf_sc/source/core/data/sc_global.cxx b/binfilter/bf_sc/source/core/data/sc_global.cxx
index a580b769b..96da4cad6 100644
--- a/binfilter/bf_sc/source/core/data/sc_global.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_global.cxx
@@ -552,7 +552,7 @@ void global_InitAppOptions();
 /*N*/   {
 /*?*/       sal_Int32 nVal = rCharSet.ToInt32();
 /*?*/       if ( !nVal || nVal == RTL_TEXTENCODING_DONTKNOW )
-/*?*/           return gsl_getSystemTextEncoding();
+/*?*/           return osl_getThreadTextEncoding();
 /*?*/       return (CharSet) nVal;
 /*N*/   }
 /*N*/   // old CharSet values for compatibility
@@ -565,8 +565,8 @@ void global_InitAppOptions();
 /*N*/   else if (rCharSet.EqualsIgnoreCaseAscii("IBMPC_861")) return RTL_TEXTENCODING_IBM_861;
 /*N*/   else if (rCharSet.EqualsIgnoreCaseAscii("IBMPC_863")) return RTL_TEXTENCODING_IBM_863;
 /*N*/   else if (rCharSet.EqualsIgnoreCaseAscii("IBMPC_865")) return RTL_TEXTENCODING_IBM_865;
-/*N*/ //    else if (rCharSet.EqualsIgnoreCaseAscii("SYSTEM")   ) return gsl_getSystemTextEncoding();
-/*N*/   else return gsl_getSystemTextEncoding();
+/*N*/ //    else if (rCharSet.EqualsIgnoreCaseAscii("SYSTEM")   ) return osl_getThreadTextEncoding();
+/*N*/   else return osl_getThreadTextEncoding();
 /*N*/ }
 
 //------------------------------------------------------------------------
diff --git a/binfilter/bf_sc/source/core/tool/sc_autoform.cxx b/binfilter/bf_sc/source/core/tool/sc_autoform.cxx
index 52d161cb5..9e5be8f7e 100644
--- a/binfilter/bf_sc/source/core/tool/sc_autoform.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_autoform.cxx
@@ -278,7 +278,7 @@ const USHORT AUTOFORMAT_OLD_ID_NEW  = 4203;
 /*N*/          aNumFormat.Load( rStream );
 /*N*/
 /*N*/      //  adjust charset in font
-/*N*/      CharSet eSysSet = gsl_getSystemTextEncoding();
+/*N*/      CharSet eSysSet = osl_getThreadTextEncoding();
 /*N*/      CharSet eSrcSet = rStream.GetStreamCharSet();
 /*N*/      if( eSrcSet != eSysSet && aFont.GetCharSet() == eSrcSet )
 /*N*/          aFont.GetCharSet() = eSysSet;
@@ -447,7 +447,7 @@ const USHORT AUTOFORMAT_OLD_ID_NEW  = 4203;
 /*N*/      if( bRet && (nVer == AUTOFORMAT_DATA_ID_X ||
 /*N*/              (AUTOFORMAT_DATA_ID_504 <= nVer && nVer <= AUTOFORMAT_DATA_ID)) )
 /*N*/   {
-/*N*/       gsl_getSystemTextEncoding();
+/*N*/       osl_getThreadTextEncoding();
 /*N*/       CharSet eSrcSet = rStream.GetStreamCharSet();
 /*N*/
 /*N*/       BOOL b;
diff --git a/binfilter/bf_sc/source/core/tool/sc_interpr1.cxx b/binfilter/bf_sc/source/core/tool/sc_interpr1.cxx
index 9e54e2af7..5b330476c 100644
--- a/binfilter/bf_sc/source/core/tool/sc_interpr1.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_interpr1.cxx
@@ -1799,7 +1799,7 @@ void ScInterpreter::ScCode()
 {
 //2do: make it full range unicode?
     const String& rStr = GetString();
-    PushInt( (sal_uChar) ByteString_ConvertFromUnicode( rStr.GetChar(0), gsl_getSystemTextEncoding() ) );
+    PushInt( (sal_uChar) ByteString_ConvertFromUnicode( rStr.GetChar(0), osl_getThreadTextEncoding() ) );
 }
 
 
@@ -1812,7 +1812,7 @@ void ScInterpreter::ScChar()
     else
     {
         String aStr( '0' );
-        aStr.SetChar( 0, ByteString_ConvertToUnicode( (sal_Char) fVal, gsl_getSystemTextEncoding() ) );
+        aStr.SetChar( 0, ByteString_ConvertToUnicode( (sal_Char) fVal, osl_getThreadTextEncoding() ) );
         PushString( aStr );
     }
 }
diff --git a/binfilter/bf_sc/source/filter/xml/sc_xmlimprt.cxx b/binfilter/bf_sc/source/filter/xml/sc_xmlimprt.cxx
index 972d9a1d1..e0a030704 100644
--- a/binfilter/bf_sc/source/filter/xml/sc_xmlimprt.cxx
+++ b/binfilter/bf_sc/source/filter/xml/sc_xmlimprt.cxx
@@ -1434,7 +1434,7 @@ SvXMLImportContext *ScXMLImport::CreateFontDeclsContext(const USHORT nInPrefix,
         XMLFontStylesContext *pFSContext =
             new XMLFontStylesContext( *this, nInPrefix,
                                         rLocalName, xAttrList,
-                                        gsl_getSystemTextEncoding() );
+                                        osl_getThreadTextEncoding() );
         SetFontDecls( pFSContext );
         pContext = pFSContext;
     }
diff --git a/binfilter/bf_sc/source/ui/dbgui/sc_asciiopt.cxx b/binfilter/bf_sc/source/ui/dbgui/sc_asciiopt.cxx
index 60ca986fd..9ae3b96f0 100644
--- a/binfilter/bf_sc/source/ui/dbgui/sc_asciiopt.cxx
+++ b/binfilter/bf_sc/source/ui/dbgui/sc_asciiopt.cxx
@@ -57,7 +57,7 @@ static const sal_Char pStrMrg[] = "MRG";
 /*N*/   aFieldSeps      ( ';' ),
 /*N*/   bMergeFieldSeps ( FALSE ),
 /*N*/   cTextSep        ( 34 ),
-/*N*/   eCharSet        ( gsl_getSystemTextEncoding() ),
+/*N*/   eCharSet        ( osl_getThreadTextEncoding() ),
 /*N*/   bCharSetSystem  ( FALSE ),
 /*N*/   nStartRow       ( 1 ),
 /*N*/   nInfoCount      ( 0 ),
diff --git a/binfilter/bf_sc/source/ui/dbgui/sc_imoptdlg.cxx b/binfilter/bf_sc/source/ui/dbgui/sc_imoptdlg.cxx
index 73c59c74a..ed31d229e 100644
--- a/binfilter/bf_sc/source/ui/dbgui/sc_imoptdlg.cxx
+++ b/binfilter/bf_sc/source/ui/dbgui/sc_imoptdlg.cxx
@@ -64,7 +64,7 @@ private:
 /*N*/ void ScImportOptions::SetTextEncoding( rtl_TextEncoding nEnc )
 /*N*/ {
 /*N*/   eCharSet = (nEnc == RTL_TEXTENCODING_DONTKNOW ?
-/*N*/       gsl_getSystemTextEncoding() : nEnc);
+/*N*/       osl_getThreadTextEncoding() : nEnc);
 /*N*/   aStrFont = ScGlobal::GetCharsetString( nEnc );
 /*N*/ }
 }
diff --git a/binfilter/bf_sch/source/core/sch_chtmode2.cxx b/binfilter/bf_sch/source/core/sch_chtmode2.cxx
index dae98a11d..e3c827735 100644
--- a/binfilter/bf_sch/source/core/sch_chtmode2.cxx
+++ b/binfilter/bf_sch/source/core/sch_chtmode2.cxx
@@ -631,7 +631,7 @@ enum ChartStyleV0
 /*N*/   CHART_TRACE1( "ChartModel::StoreAttributes (%s)", aBStr.GetBuffer() );
 /*N*/ #endif
 /*N*/
-/*N*/   rtl_TextEncoding eSysSet = ::GetSOStoreTextEncoding( gsl_getSystemTextEncoding());
+/*N*/   rtl_TextEncoding eSysSet = ::GetSOStoreTextEncoding( osl_getThreadTextEncoding());
 /*N*/   rOut.SetStreamCharSet( eSysSet );
 /*N*/
 /*N*/   SchIOCompat aIO(rOut, STREAM_WRITE, 17);
diff --git a/binfilter/bf_sch/source/core/sch_memchrt.cxx b/binfilter/bf_sch/source/core/sch_memchrt.cxx
index 2e620b13b..da43dbb68 100644
--- a/binfilter/bf_sch/source/core/sch_memchrt.cxx
+++ b/binfilter/bf_sch/source/core/sch_memchrt.cxx
@@ -452,7 +452,7 @@ namespace binfilter {
 
 /*N*/ SvStream& operator << (SvStream& rOut, const SchMemChart& rMemChart)
 /*N*/ {
-/*N*/   CharSet aSysCharSet = static_cast< CharSet >( ::GetSOStoreTextEncoding( gsl_getSystemTextEncoding(),
+/*N*/   CharSet aSysCharSet = static_cast< CharSet >( ::GetSOStoreTextEncoding( osl_getThreadTextEncoding(),
 /*N*/                                                                             (USHORT)rOut.GetVersion()) );
 /*N*/   rOut.SetStreamCharSet( aSysCharSet );
 /*N*/
diff --git a/binfilter/bf_sd/source/core/sd_cusshow.cxx b/binfilter/bf_sd/source/core/sd_cusshow.cxx
index dc477b426..7de820597 100644
--- a/binfilter/bf_sd/source/core/sd_cusshow.cxx
+++ b/binfilter/bf_sd/source/core/sd_cusshow.cxx
@@ -97,9 +97,9 @@ using namespace ::com::sun::star;
 /*N*/   SdIOCompat aIO(rOut, STREAM_WRITE, 0);
 /*N*/
 /*N*/   // Name
-/*N*/   // #90477# rOut.WriteByteString( rCustomShow.aName, ::GetStoreCharSet( gsl_getSystemTextEncoding() ) );
+/*N*/   // #90477# rOut.WriteByteString( rCustomShow.aName, ::GetStoreCharSet( osl_getThreadTextEncoding() ) );
 /*N*/   rOut.WriteByteString(rCustomShow.aName,
-/*N*/       GetSOStoreTextEncoding(gsl_getSystemTextEncoding(), (sal_uInt16)rOut.GetVersion()));
+/*N*/       GetSOStoreTextEncoding(osl_getThreadTextEncoding(), (sal_uInt16)rOut.GetVersion()));
 /*N*/
 /*N*/   // Anzahl Seiten
 /*N*/   UINT32 nCount = rCustomShow.Count();
@@ -131,9 +131,9 @@ using namespace ::com::sun::star;
 /*N*/   SdIOCompat aIO(rIn, STREAM_READ);
 /*N*/
 /*N*/   // Name
-/*N*/   // #90477# rIn.ReadByteString( rCustomShow.aName, ::GetStoreCharSet( gsl_getSystemTextEncoding() ) );
+/*N*/   // #90477# rIn.ReadByteString( rCustomShow.aName, ::GetStoreCharSet( osl_getThreadTextEncoding() ) );
 /*N*/   rIn.ReadByteString(rCustomShow.aName,
-/*N*/       GetSOLoadTextEncoding(gsl_getSystemTextEncoding(), (sal_uInt16)rIn.GetVersion()));
+/*N*/       GetSOLoadTextEncoding(osl_getThreadTextEncoding(), (sal_uInt16)rIn.GetVersion()));
 /*N*/
 /*N*/   // Anzahl Seiten
 /*N*/   UINT32 nCount = 0;
diff --git a/binfilter/bf_sd/source/core/sd_drawdoc.cxx b/binfilter/bf_sd/source/core/sd_drawdoc.cxx
index db674c865..a2a7d59b3 100644
--- a/binfilter/bf_sd/source/core/sd_drawdoc.cxx
+++ b/binfilter/bf_sd/source/core/sd_drawdoc.cxx
@@ -342,8 +342,8 @@ SdrPage* SdDrawDocument::AllocPage(bool bMasterPage)
 
 SvStream& operator << (SvStream& rOut, SdDrawDocument& rDoc)
 {
-    // #90477# CharSet eSysSet = ::GetStoreCharSet( gsl_getSystemTextEncoding());
-    CharSet eSysSet = GetSOStoreTextEncoding(gsl_getSystemTextEncoding(), (sal_uInt16)rOut.GetVersion());
+    // #90477# CharSet eSysSet = ::GetStoreCharSet( osl_getThreadTextEncoding());
+    CharSet eSysSet = GetSOStoreTextEncoding(osl_getThreadTextEncoding(), (sal_uInt16)rOut.GetVersion());
 
     /**************************************************************************
     * Aktuelle FileFormat-Versionsnummer
@@ -462,8 +462,8 @@ SvStream& operator << (SvStream& rOut, SdDrawDocument& rDoc)
 
 SvStream& operator >> (SvStream& rIn, SdDrawDocument& rDoc)
 {
-    // #90477# CharSet eSysSet = ::GetStoreCharSet( gsl_getSystemTextEncoding());
-    CharSet eSysSet = GetSOLoadTextEncoding(gsl_getSystemTextEncoding(), (sal_uInt16)rIn.GetVersion());
+    // #90477# CharSet eSysSet = ::GetStoreCharSet( osl_getThreadTextEncoding());
+    CharSet eSysSet = GetSOLoadTextEncoding(osl_getThreadTextEncoding(), (sal_uInt16)rIn.GetVersion());
 
     rIn >> (FmFormModel&) rDoc;
     rDoc.GetItemPool().LoadCompleted();
diff --git a/binfilter/bf_sd/source/core/sd_sdpage.cxx b/binfilter/bf_sd/source/core/sd_sdpage.cxx
index 220f9e647..33ced3536 100644
--- a/binfilter/bf_sd/source/core/sd_sdpage.cxx
+++ b/binfilter/bf_sd/source/core/sd_sdpage.cxx
@@ -87,7 +87,7 @@ SdPage::SdPage(SdDrawDocument& rNewDoc, StarBASIC* pInBasic, BOOL bMasterPage) :
     aLayoutName.AppendAscii( RTL_CONSTASCII_STRINGPARAM( SD_LT_SEPARATOR ));
     aLayoutName += String(SdResId(STR_LAYOUT_OUTLINE));
 
-    eCharSet = gsl_getSystemTextEncoding();
+    eCharSet = osl_getThreadTextEncoding();
 
     Size aPageSize(GetSize());
 
diff --git a/binfilter/bf_sd/source/core/sd_sdpage2.cxx b/binfilter/bf_sd/source/core/sd_sdpage2.cxx
index 4a8a36918..192e84ae9 100644
--- a/binfilter/bf_sd/source/core/sd_sdpage2.cxx
+++ b/binfilter/bf_sd/source/core/sd_sdpage2.cxx
@@ -77,7 +77,7 @@ void SdPage::ReadData(const SdrIOHeader& rHead, SvStream& rIn)
 {
     FmFormPage::ReadData( rHead, rIn );
 
-    rIn.SetStreamCharSet(GetSOLoadTextEncoding(gsl_getSystemTextEncoding(), (sal_uInt16)rIn.GetVersion()));
+    rIn.SetStreamCharSet(GetSOLoadTextEncoding(osl_getThreadTextEncoding(), (sal_uInt16)rIn.GetVersion()));
 
     if ( pModel->IsStreamingSdrModel() )
     {
diff --git a/binfilter/bf_sfx2/source/doc/sfx2_docinf.cxx b/binfilter/bf_sfx2/source/doc/sfx2_docinf.cxx
index 2e767c9d9..ad6494509 100644
--- a/binfilter/bf_sfx2/source/doc/sfx2_docinf.cxx
+++ b/binfilter/bf_sfx2/source/doc/sfx2_docinf.cxx
@@ -774,7 +774,7 @@ static const char pDocInfoHeader[] = "SfxDocumentInfo";
 //-------------------------------------------------------------------------
 
 /*N*/ SfxDocumentInfo::SfxDocumentInfo() :
-/*N*/   eFileCharSet(gsl_getSystemTextEncoding()),
+/*N*/   eFileCharSet(osl_getThreadTextEncoding()),
 /*N*/   bPasswd(FALSE),
 /*N*/   bQueryTemplate(FALSE),
 /*N*/   bTemplateConfig(FALSE),
diff --git a/binfilter/bf_so3/source/inplace/outplace.cxx b/binfilter/bf_so3/source/inplace/outplace.cxx
index 285d3a0dc..94dca517e 100644
--- a/binfilter/bf_so3/source/inplace/outplace.cxx
+++ b/binfilter/bf_so3/source/inplace/outplace.cxx
@@ -668,7 +668,7 @@ SvInPlaceObjectRef SvOutPlaceObject::InsertObject
             {
             tType=TENANTTYPE_EMBEDDEDFILE;
             pv=szFile;
-            rFileName.Assign( String( szFile, gsl_getSystemTextEncoding() ) );
+            rFileName.Assign( String( szFile, osl_getThreadTextEncoding() ) );
             }
 
         if ((io.dwFlags & IOF_CHECKDISPLAYASICON)
diff --git a/binfilter/bf_so3/source/inplace/soconv.cxx b/binfilter/bf_so3/source/inplace/soconv.cxx
index 285a93dcc..0b6ab11bd 100644
--- a/binfilter/bf_so3/source/inplace/soconv.cxx
+++ b/binfilter/bf_so3/source/inplace/soconv.cxx
@@ -218,14 +218,14 @@ static ULONG LoadStarObject
         return 0;
     rObjName = String(
         cBuf, sal::static_int_cast< xub_StrLen >( aHdr.nObjName ),
-        gsl_getSystemTextEncoding() );
+        osl_getThreadTextEncoding() );
 
     rSrc.Read( cBuf, aHdr.nServerName );
     if ( rSrc.GetError() )
         return 0;
     rSvrName = String(
         cBuf, sal::static_int_cast< xub_StrLen >( aHdr.nServerName ),
-        gsl_getSystemTextEncoding() );
+        osl_getThreadTextEncoding() );
     if ( aHdr.nPrivData )
     {
         UINT32 nLen;
@@ -294,7 +294,7 @@ BOOL SvEmbeddedObject::InsertStarObject
     {
         // gefunden!
         pClsId = new SvGlobalName( pIds->nId, 0, 0, 0xc0,0,0,0,0,0,0,0x46 );
-        aFull = String( pIds->pDspName, gsl_getSystemTextEncoding() );
+        aFull = String( pIds->pDspName, osl_getThreadTextEncoding() );
         aShort = aSvrName;
     }
     else if( (COMPARE_EQUAL == aSvrName.CompareToAscii( "StarMath2" ))
diff --git a/binfilter/bf_so3/source/persist/persist.cxx b/binfilter/bf_so3/source/persist/persist.cxx
index c96cf18f7..f891e5090 100644
--- a/binfilter/bf_so3/source/persist/persist.cxx
+++ b/binfilter/bf_so3/source/persist/persist.cxx
@@ -128,8 +128,8 @@ void SvInfoObject::Load( SvPersistStream & rStm )
         rStm.SetError( SVSTREAM_WRONGVERSION );
     else
     {
-        rStm.ReadByteString( aStorName, gsl_getSystemTextEncoding() );
-        rStm.ReadByteString( aObjName, gsl_getSystemTextEncoding() );
+        rStm.ReadByteString( aStorName, osl_getThreadTextEncoding() );
+        rStm.ReadByteString( aObjName, osl_getThreadTextEncoding() );
         if( !aObjName.Len() )
             aObjName = aStorName;
         rStm >> aSvClassName;
diff --git a/binfilter/bf_svtools/source/filter.vcl/filter/svt_sgvtext.cxx b/binfilter/bf_svtools/source/filter.vcl/filter/svt_sgvtext.cxx
index e7bff4764..4d506a3a1 100644
--- a/binfilter/bf_svtools/source/filter.vcl/filter/svt_sgvtext.cxx
+++ b/binfilter/bf_svtools/source/filter.vcl/filter/svt_sgvtext.cxx
@@ -1206,7 +1206,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::isdigitAsciiString(s) ) SVWidth=sal::static_int_cast< sal_uInt16 >(s.toInt32());
         }
     }
diff --git a/binfilter/bf_svtools/source/filter.vcl/wmf/svt_winmtf.cxx b/binfilter/bf_svtools/source/filter.vcl/wmf/svt_winmtf.cxx
index 2b0128734..04e54e80e 100644
--- a/binfilter/bf_svtools/source/filter.vcl/wmf/svt_winmtf.cxx
+++ b/binfilter/bf_svtools/source/filter.vcl/wmf/svt_winmtf.cxx
@@ -192,11 +192,11 @@ WinMtfFontStyle::WinMtfFontStyle( LOGFONTW& rFont )
 {
     CharSet eCharSet;
     if ( ( rFont.lfCharSet == OEM_CHARSET ) || ( rFont.lfCharSet == DEFAULT_CHARSET ) )
-        eCharSet = gsl_getSystemTextEncoding();
+        eCharSet = osl_getThreadTextEncoding();
     else
         eCharSet = rtl_getTextEncodingFromWindowsCharset( rFont.lfCharSet );
     if ( eCharSet == RTL_TEXTENCODING_DONTKNOW )
-        eCharSet = gsl_getSystemTextEncoding();
+        eCharSet = osl_getThreadTextEncoding();
     aFont.SetCharSet( eCharSet );
     aFont.SetName( rFont.alfFaceName );
     FontFamily eFamily;
@@ -933,7 +933,7 @@ WinMtfOutput::WinMtfOutput( GDIMetaFile& rGDIMetaFile ) :
                                                                             // SetClipRgn( NULL ) and similar ClipRgn actions (SJ)
 
     maFont.SetName( String( RTL_CONSTASCII_USTRINGPARAM( "Arial" )) );  // sj: #i57205#, we do have some scaling problems if using
-    maFont.SetCharSet( gsl_getSystemTextEncoding() );                       // the default font then most times a x11 font is used, we
+    maFont.SetCharSet( osl_getThreadTextEncoding() );                       // the default font then most times a x11 font is used, we
     maFont.SetHeight( 423 );                                                // will prevent this defining a font
 
     maLatestLineStyle.aLineColor = Color( 0x12, 0x34, 0x56 );
diff --git a/binfilter/bf_svtools/source/filter.vcl/wmf/svt_winwmf.cxx b/binfilter/bf_svtools/source/filter.vcl/wmf/svt_winwmf.cxx
index 4974034cb..821e09330 100644
--- a/binfilter/bf_svtools/source/filter.vcl/wmf/svt_winwmf.cxx
+++ b/binfilter/bf_svtools/source/filter.vcl/wmf/svt_winwmf.cxx
@@ -756,11 +756,11 @@ void WMFReader::ReadRecordParams( USHORT 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/binfilter/bf_svtools/source/filter.vcl/wmf/svt_wmfwr.cxx b/binfilter/bf_svtools/source/filter.vcl/wmf/svt_wmfwr.cxx
index 77122c3e4..3c35862e7 100644
--- a/binfilter/bf_svtools/source/filter.vcl/wmf/svt_wmfwr.cxx
+++ b/binfilter/bf_svtools/source/filter.vcl/wmf/svt_wmfwr.cxx
@@ -1495,7 +1495,7 @@ void WMFWriter::WriteRecords( const GDIMetaFile & rMTF )
                     aSrcFont = pA->GetFont();
 
                     if ( aSrcFont.GetCharSet() == RTL_TEXTENCODING_DONTKNOW )
-                        aSrcFont.SetCharSet( GetExtendedTextEncoding( gsl_getSystemTextEncoding() ) );
+                        aSrcFont.SetCharSet( GetExtendedTextEncoding( osl_getThreadTextEncoding() ) );
                     if ( aSrcFont.GetCharSet() == RTL_TEXTENCODING_UNICODE )
                         aSrcFont.SetCharSet( RTL_TEXTENCODING_MS_1252 );
                     eSrcTextAlign = aSrcFont.GetAlign();
@@ -1813,7 +1813,7 @@ BOOL WMFWriter::WriteWMF( const GDIMetaFile& rMTF, SvStream& rTargetStream,
     bDstIsClipping = bSrcIsClipping = FALSE;
 
     Font aFont;
-    aFont.SetCharSet( GetExtendedTextEncoding( gsl_getSystemTextEncoding() ) );
+    aFont.SetCharSet( GetExtendedTextEncoding( osl_getThreadTextEncoding() ) );
     aFont.SetColor( Color( COL_WHITE ) );
     aFont.SetAlign( ALIGN_BASELINE );
     aDstFont = aSrcFont = aFont;
diff --git a/binfilter/bf_svtools/source/misc/svt_ctrltool.cxx b/binfilter/bf_svtools/source/misc/svt_ctrltool.cxx
index 0f919a87c..564001ab7 100644
--- a/binfilter/bf_svtools/source/misc/svt_ctrltool.cxx
+++ b/binfilter/bf_svtools/source/misc/svt_ctrltool.cxx
@@ -191,7 +191,7 @@ ImplFontListNameInfo* FontList::ImplFindByName( const XubString& rStr ) const
 void FontList::ImplInsertFonts( OutputDevice* pDevice, BOOL bAll,
                                 BOOL bInsertData )
 {
-    rtl_TextEncoding eSystemEncoding = gsl_getSystemTextEncoding();
+    rtl_TextEncoding eSystemEncoding = osl_getThreadTextEncoding();
 
     USHORT nType;
     if ( pDevice->GetOutDevType() != OUTDEV_PRINTER )
diff --git a/binfilter/bf_svtools/source/misc/svt_imap.cxx b/binfilter/bf_svtools/source/misc/svt_imap.cxx
index 7e37c875b..032b0ec9c 100644
--- a/binfilter/bf_svtools/source/misc/svt_imap.cxx
+++ b/binfilter/bf_svtools/source/misc/svt_imap.cxx
@@ -987,7 +987,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/binfilter/bf_svx/source/form/svx_fmpage.cxx b/binfilter/bf_svx/source/form/svx_fmpage.cxx
index 3900df987..bd3aeebd2 100644
--- a/binfilter/bf_svx/source/form/svx_fmpage.cxx
+++ b/binfilter/bf_svx/source/form/svx_fmpage.cxx
@@ -83,7 +83,7 @@ namespace binfilter {
 /*N*/           SdrDownCompat aVCCompat2( rIn, STREAM_READ );
 /*N*/           ByteString aByteStringName;
 /*N*/           rIn.ReadByteString(aByteStringName);
-/*N*/           aPageName = String(aByteStringName, gsl_getSystemTextEncoding());
+/*N*/           aPageName = String(aByteStringName, osl_getThreadTextEncoding());
 /*N*/       }
 /*N*/   }
 /*N*/
diff --git a/binfilter/bf_svx/source/items/svx_numitem.cxx b/binfilter/bf_svx/source/items/svx_numitem.cxx
index 7a787df11..8f31a3237 100644
--- a/binfilter/bf_svx/source/items/svx_numitem.cxx
+++ b/binfilter/bf_svx/source/items/svx_numitem.cxx
@@ -219,7 +219,7 @@ sal_Int32 SvxNumberType::nRefCount = 0;
 /*N*/
 /*N*/   rStream >> nShort;
 /*N*/   nCharTextDistance       = nShort;
-/*N*/   rtl_TextEncoding eEnc = gsl_getSystemTextEncoding();
+/*N*/   rtl_TextEncoding eEnc = osl_getThreadTextEncoding();
 /*N*/   rStream.ReadByteString(sPrefix, eEnc);
 /*N*/   rStream.ReadByteString(sSuffix, eEnc);
 /*N*/   rStream.ReadByteString(sCharStyleName, eEnc);
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdmodel.cxx b/binfilter/bf_svx/source/svdraw/svx_svdmodel.cxx
index a72acb65f..8e6610c2c 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdmodel.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdmodel.cxx
@@ -96,7 +96,7 @@ using namespace ::com::sun::star;
 /*N*/   if (bInit)
 /*N*/   {
 /*N*/       aCreationDate = DateTime();
-/*N*/       eCreationCharSet = gsl_getSystemTextEncoding();
+/*N*/       eCreationCharSet = osl_getThreadTextEncoding();
 /*N*/   }
 /*N*/ }
 
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdouno.cxx b/binfilter/bf_svx/source/svdraw/svx_svdouno.cxx
index e5b246a3d..0c36addf0 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdouno.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdouno.cxx
@@ -428,7 +428,7 @@ namespace binfilter {
 /*N*/       uno::Reference< beans::XPropertySet > xSet(xUnoControlModel, uno::UNO_QUERY);
 /*N*/       if (xSet.is())
 /*N*/       {
-/*N*/           uno::Any aValue( xSet->getPropertyValue(String("DefaultControl", gsl_getSystemTextEncoding())) );
+/*N*/           uno::Any aValue( xSet->getPropertyValue(String("DefaultControl", osl_getThreadTextEncoding())) );
 /*N*/           OUString aStr;
 /*N*/           if( aValue >>= aStr )
 /*N*/               aUnoControlTypeName = String(aStr);
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdview.cxx b/binfilter/bf_svx/source/svdraw/svx_svdview.cxx
index 5255440d2..d0df4b9a0 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdview.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdview.cxx
@@ -144,7 +144,7 @@ namespace binfilter {
 /*N*/
 /*N*/       // UNICODE:
 /*N*/       // rtl_TextEncoding eOutCharSet=rOut.GetStreamCharSet();
-/*N*/       rtl_TextEncoding eOutCharSet = gsl_getSystemTextEncoding();
+/*N*/       rtl_TextEncoding eOutCharSet = osl_getThreadTextEncoding();
 /*N*/
 /*N*/       // #90477# rOut << UINT16( GetStoreCharSet( eOutCharSet ) );
 /*N*/       rOut << (UINT16)GetSOStoreTextEncoding(eOutCharSet, (sal_uInt16)rOut.GetVersion());
diff --git a/binfilter/bf_svx/source/xoutdev/svx_xpool.cxx b/binfilter/bf_svx/source/xoutdev/svx_xpool.cxx
index db1052b6e..dc841bd69 100644
--- a/binfilter/bf_svx/source/xoutdev/svx_xpool.cxx
+++ b/binfilter/bf_svx/source/xoutdev/svx_xpool.cxx
@@ -82,14 +82,14 @@ static USHORT nVersion4Map[141];
 
 
 /*N*/ XOutdevItemPool::XOutdevItemPool(USHORT nAttrStart, USHORT nAttrEnd, bool bLoadRefCounts):
-/*N*/   SfxItemPool(String("XOutdevItemPool", gsl_getSystemTextEncoding()), nAttrStart, nAttrEnd, NULL, NULL, bLoadRefCounts)
+/*N*/   SfxItemPool(String("XOutdevItemPool", osl_getThreadTextEncoding()), nAttrStart, nAttrEnd, NULL, NULL, bLoadRefCounts)
 /*N*/ {
 /*N*/   Ctor(NULL,nAttrStart,nAttrEnd);
 /*N*/ }
 
 
 /*N*/ XOutdevItemPool::XOutdevItemPool(SfxItemPool* pInMaster, USHORT nAttrStart, USHORT nAttrEnd, bool bLoadRefCounts):
-/*N*/   SfxItemPool(String("XOutdevItemPool", gsl_getSystemTextEncoding()), nAttrStart, nAttrEnd, NULL, NULL, bLoadRefCounts)
+/*N*/   SfxItemPool(String("XOutdevItemPool", osl_getThreadTextEncoding()), nAttrStart, nAttrEnd, NULL, NULL, bLoadRefCounts)
 /*N*/ {
 /*N*/   Ctor(pInMaster,nAttrStart,nAttrEnd);
 /*N*/ }
diff --git a/binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx b/binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx
index 76f4a79cc..96e7c29b2 100644
--- a/binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx
+++ b/binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx
@@ -262,7 +262,7 @@ public:
 /*N*/   pCurNumRule = NULL;
 /*N*/   pCurPaM     =
 /*N*/   pCurNumRange= NULL;
-/*N*/   eSrcSet     = gsl_getSystemTextEncoding();
+/*N*/   eSrcSet     = osl_getThreadTextEncoding();
 /*N*/   if( pStrm )
 /*N*/       eSrcSet = GetSOStoreTextEncoding( eSrcSet, pStrm->GetVersion() );
 /*N*/   else if( pRoot.Is() )
@@ -1501,7 +1501,7 @@ void Sw3StringPool::LoadOld( SvStream& r )
 
 /*N*/ void Sw3IoImp::ChangeFontItemCharSet()
 /*N*/ {
-/*N*/   rtl_TextEncoding eSysEnc = gsl_getSystemTextEncoding();
+/*N*/   rtl_TextEncoding eSysEnc = osl_getThreadTextEncoding();
 /*N*/   sal_uInt16 nMaxItems = pDoc->GetAttrPool().GetItemCount( RES_CHRATR_FONT );
 /*N*/   SvxFontItem *pItem;
 /*N*/   for( sal_uInt16 i=0; i<nMaxItems; i++ )
@@ -1547,7 +1547,7 @@ void Sw3StringPool::LoadOld( SvStream& r )
 /*N*/   // Temporaere Namenserweiterungen entfernen
 /*N*/   aStringPool.RemoveExtensions( *pDoc );
 /*N*/
-/*N*/   rtl_TextEncoding eSysEnc = gsl_getSystemTextEncoding();
+/*N*/   rtl_TextEncoding eSysEnc = osl_getThreadTextEncoding();
 /*N*/   if( eSysEnc != eSrcSet )
 /*N*/   {
 /*N*/       // Bug 9714: Der CharSet an den Fonts muss geaendert werden, wenn
diff --git a/binfilter/bf_sw/source/core/sw3io/sw_sw3page.cxx b/binfilter/bf_sw/source/core/sw3io/sw_sw3page.cxx
index a7377aa61..12ab3c821 100644
--- a/binfilter/bf_sw/source/core/sw3io/sw_sw3page.cxx
+++ b/binfilter/bf_sw/source/core/sw3io/sw_sw3page.cxx
@@ -170,7 +170,7 @@ namespace binfilter {
 /*N*/           //JP 18.08.98: Bug 55115 - PageDescAttribute mit ihren Vorlagen
 /*N*/           //              verbinden
 /*?*/           ConnectPageDescAttrs();
-/*?*/           if( gsl_getSystemTextEncoding() != eSrcSet )
+/*?*/           if( osl_getThreadTextEncoding() != eSrcSet )
 /*?*/               ChangeFontItemCharSet();
 /*?*/
 /*?*/           // Temporaere Namenserweiterungen entfernen
@@ -178,7 +178,7 @@ namespace binfilter {
 /*?*/           ConvertFmtsToStarSymbol();
 /*N*/       }
 /*N*/       // TODO: unicode: is this required really?
-/*N*/       eSrcSet = GetSOLoadTextEncoding( gsl_getSystemTextEncoding(),
+/*N*/       eSrcSet = GetSOLoadTextEncoding( osl_getThreadTextEncoding(),
 /*N*/                                        pStrm->GetVersion() );
 /*N*/   }
 /*N*/ }
diff --git a/binfilter/bf_sw/source/core/swg/sw_rdcont.cxx b/binfilter/bf_sw/source/core/swg/sw_rdcont.cxx
index a784cd117..d419dc886 100644
--- a/binfilter/bf_sw/source/core/swg/sw_rdcont.cxx
+++ b/binfilter/bf_sw/source/core/swg/sw_rdcont.cxx
@@ -177,7 +177,7 @@ void SwSwgReader::InContents( BOOL bNode1, BOOL bBlock, USHORT nInsFirstPara )
                 if( !cFlag ) r.skipnext();
                 else {
                     // TODO: unicode: check for 8 bit encoding
-                    BYTE eCharSet = (BYTE) gsl_getSystemTextEncoding();
+                    BYTE eCharSet = (BYTE) osl_getThreadTextEncoding();
                     if( cFlag & 0x02 )
                       r >> eCharSet;
                     BYTE eSave = aHdr.cCodeSet;
@@ -232,7 +232,7 @@ String SwSwgReader::InContentsText( BOOL bBlock )
                 if( !cFlag ) r.skipnext();
                 else {
                     // TODO: unicode: check for 8 bit encoding
-                    BYTE eCharSet = (BYTE) gsl_getSystemTextEncoding();
+                    BYTE eCharSet = (BYTE) osl_getThreadTextEncoding();
                     if( cFlag & 0x02 )
                       r >> eCharSet;
                     BYTE eSave = aHdr.cCodeSet;
diff --git a/binfilter/bf_sw/source/core/swg/sw_rdmisc.cxx b/binfilter/bf_sw/source/core/swg/sw_rdmisc.cxx
index a52f13c09..ef5ec74ae 100644
--- a/binfilter/bf_sw/source/core/swg/sw_rdmisc.cxx
+++ b/binfilter/bf_sw/source/core/swg/sw_rdmisc.cxx
@@ -352,7 +352,7 @@ namespace binfilter {
     USHORT n, i;
     BYTE cGUIType, cCharSet;
     // TODO: unicode: is this correct?
-    rtl_TextEncoding eCharSet = gsl_getSystemTextEncoding();
+    rtl_TextEncoding eCharSet = osl_getThreadTextEncoding();
     SfxStamp aStamp;
     String aText;
 
diff --git a/binfilter/bf_sw/source/core/swg/sw_rdswg.cxx b/binfilter/bf_sw/source/core/swg/sw_rdswg.cxx
index f8624eb32..1018c899d 100644
--- a/binfilter/bf_sw/source/core/swg/sw_rdswg.cxx
+++ b/binfilter/bf_sw/source/core/swg/sw_rdswg.cxx
@@ -546,7 +546,7 @@ ByteString SwSwgReader::GetAsciiText( BOOL bReq )
     // Bug 9714: Der CharSet an den Fonts muss geaendert werden, wenn
     // es der globale CharSet ist
     USHORT nMaxItems = pDoc->GetAttrPool().GetItemCount( RES_CHRATR_FONT );
-    rtl_TextEncoding eSysCharSet = gsl_getSystemTextEncoding();
+    rtl_TextEncoding eSysCharSet = osl_getThreadTextEncoding();
     SvxFontItem* pItem;
     for( USHORT n = 0; n < nMaxItems; ++n )
     {
diff --git a/binfilter/bf_sw/source/filter/excel/sw_exlpar.cxx b/binfilter/bf_sw/source/filter/excel/sw_exlpar.cxx
index 4f759cf20..fa8598561 100644
--- a/binfilter/bf_sw/source/filter/excel/sw_exlpar.cxx
+++ b/binfilter/bf_sw/source/filter/excel/sw_exlpar.cxx
@@ -205,7 +205,7 @@ ULONG ExcelReader::Read( SwDoc &rDoc, SwPaM &rPam,
 
     if( !nRet )
     {
-        SwExcelParser* pParser = new SwExcelParser( rDoc, rPam, *pIn, !bInsertMode, gsl_getSystemTextEncoding() );
+        SwExcelParser* pParser = new SwExcelParser( rDoc, rPam, *pIn, !bInsertMode, osl_getThreadTextEncoding() );
         nRet = pParser->CallParser();   // 0 == kein Fehler aufgetreten
 
         delete pParser;
diff --git a/binfilter/bf_sw/source/filter/sw6/sw_sw6file.cxx b/binfilter/bf_sw/source/filter/sw6/sw_sw6file.cxx
index 547c86441..8412c89fd 100644
--- a/binfilter/bf_sw/source/filter/sw6/sw_sw6file.cxx
+++ b/binfilter/bf_sw/source/filter/sw6/sw_sw6file.cxx
@@ -370,7 +370,7 @@ BOOL Sw6File::ReadLn(String &rStr)
         if( nAsc )
         {
             rtl_TextEncoding eEnc = aSta.bTrs ? RTL_TEXTENCODING_IBM_850
-                                              : gsl_getSystemTextEncoding();
+                                              : osl_getThreadTextEncoding();
             rStr += String( (sal_Char*)pStt, nAsc, eEnc );
 
             aBuf.nIdx += nAsc;
diff --git a/binfilter/bf_sw/source/filter/xml/sw_xmlimp.cxx b/binfilter/bf_sw/source/filter/xml/sw_xmlimp.cxx
index 737d21834..6b85c2a03 100644
--- a/binfilter/bf_sw/source/filter/xml/sw_xmlimp.cxx
+++ b/binfilter/bf_sw/source/filter/xml/sw_xmlimp.cxx
@@ -735,7 +735,7 @@ SvXMLImportContext *SwXMLImport::CreateFontDeclsContext(
     XMLFontStylesContext *pFSContext =
             new XMLFontStylesContext( *this, XML_NAMESPACE_OFFICE,
                                       rLocalName, xAttrList,
-                                      gsl_getSystemTextEncoding() );
+                                      osl_getThreadTextEncoding() );
     SetFontDecls( pFSContext );
     return pFSContext;
 }
diff --git a/binfilter/bf_sw/source/ui/app/sw_docsh.cxx b/binfilter/bf_sw/source/ui/app/sw_docsh.cxx
index 786f972df..5f7f7fa74 100644
--- a/binfilter/bf_sw/source/ui/app/sw_docsh.cxx
+++ b/binfilter/bf_sw/source/ui/app/sw_docsh.cxx
@@ -186,7 +186,7 @@ SFX_IMPL_OBJECTFACTORY_DLL(SwDocShell, SFXOBJECTSHELL_STD_NORMAL|SFXOBJECTSHELL_
         {
             DBG_ASSERT(pItem->IsA( TYPE(SfxStringItem) ), "Fehler Parametertype");
             ByteString aLclPasswd( ((const SfxStringItem *)pItem)->GetValue(),
-                                gsl_getSystemTextEncoding() );
+                                osl_getThreadTextEncoding() );
             aStor->SetKey( aLclPasswd );
         }
         // Fuer's Dokument-Einfuegen noch die FF-Version, wenn's der
diff --git a/binfilter/bf_sw/source/ui/app/sw_docshini.cxx b/binfilter/bf_sw/source/ui/app/sw_docshini.cxx
index 3b8f59e7e..6ac7a1450 100644
--- a/binfilter/bf_sw/source/ui/app/sw_docshini.cxx
+++ b/binfilter/bf_sw/source/ui/app/sw_docshini.cxx
@@ -193,7 +193,7 @@ using namespace ::rtl;
 /*?*/                 sEntry = pStdFont->GetFontFor(nFontId);
 /*?*/                 const SfxFont* pFnt = NULL;
 /*?*/                 pFnt = new SfxFont( FAMILY_DONTKNOW, sEntry, PITCH_DONTKNOW,
-/*?*/                                     ::gsl_getSystemTextEncoding() );
+/*?*/                                     ::osl_getThreadTextEncoding() );
 /*?*/                 pFontItem = new SvxFontItem(pFnt->GetFamily(), pFnt->GetName(),
 /*?*/                                     aEmptyStr, pFnt->GetPitch(), pFnt->GetCharSet(),
                                           nFontWhich);
@@ -259,7 +259,7 @@ using namespace ::rtl;
 /*M*/                 sEntry = pStdFont->GetFontFor(aFontIdPoolId[nIdx]);
 /*M*/                 const SfxFont* pFnt = NULL;
 /*M*/                 pFnt = new SfxFont( FAMILY_DONTKNOW, sEntry, PITCH_DONTKNOW,
-/*M*/                                    ::gsl_getSystemTextEncoding() );
+/*M*/                                    ::osl_getThreadTextEncoding() );
 /*M*/                 SwTxtFmtColl *pColl = pDoc->GetTxtCollFromPool(aFontIdPoolId[nIdx + 1]);
 /*M*/                 if( !bHTMLTemplSet ||
 /*M*/                     SFX_ITEM_SET != pColl->GetAttrSet().GetItemState(
diff --git a/binfilter/bf_xmloff/source/text/xmloff_txtimppr.cxx b/binfilter/bf_xmloff/source/text/xmloff_txtimppr.cxx
index f13876505..5c6c6e220 100644
--- a/binfilter/bf_xmloff/source/text/xmloff_txtimppr.cxx
+++ b/binfilter/bf_xmloff/source/text/xmloff_txtimppr.cxx
@@ -245,7 +245,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 );
diff --git a/binfilter/inc/bf_svtools/ownlist.hxx b/binfilter/inc/bf_svtools/ownlist.hxx
index ecb72b5b3..03f513519 100644
--- a/binfilter/inc/bf_svtools/ownlist.hxx
+++ b/binfilter/inc/bf_svtools/ownlist.hxx
@@ -70,14 +70,14 @@ public:
 
     friend SvStream& operator >> ( SvStream& rStm, SvCommand & rThis )
                     {
-                        rStm.ReadByteString( rThis.aCommand, gsl_getSystemTextEncoding() );
-                        rStm.ReadByteString( rThis.aArgument, gsl_getSystemTextEncoding() );
+                        rStm.ReadByteString( rThis.aCommand, osl_getThreadTextEncoding() );
+                        rStm.ReadByteString( rThis.aArgument, osl_getThreadTextEncoding() );
                         return rStm;
                     }
     friend SvStream& operator << ( SvStream& rStm, const SvCommand & rThis )
                     {
-                        rStm.WriteByteString( rThis.aCommand, gsl_getSystemTextEncoding() );
-                        rStm.WriteByteString( rThis.aArgument, gsl_getSystemTextEncoding() );
+                        rStm.WriteByteString( rThis.aCommand, osl_getThreadTextEncoding() );
+                        rStm.WriteByteString( rThis.aArgument, osl_getThreadTextEncoding() );
                         return rStm;
                     }
 };
diff --git a/binfilter/inc/bf_sw/shellio.hxx b/binfilter/inc/bf_sw/shellio.hxx
index daafbdc02..8099883c0 100644
--- a/binfilter/inc/bf_sw/shellio.hxx
+++ b/binfilter/inc/bf_sw/shellio.hxx
@@ -90,7 +90,7 @@ public:
     {
         sFont.Erase();
         eCRLF_Flag = GetSystemLineEnd();
-        eCharSet = ::gsl_getSystemTextEncoding();
+        eCharSet = ::osl_getThreadTextEncoding();
         nLanguage = 0;
     }
     // for the automatic conversion (mail/news/...)