gsl_getSystemTextEncoding->osl_getThreadTextEncoding

7 files changed, 11 insertions, 11 deletions

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;