gsl_getSystemTextEncoding->osl_getThreadTextEncoding

9 files changed, 24 insertions, 24 deletions

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;