mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gsl_getSystemTextEncoding->osl_getThreadTextEncoding

Browse Source
This commit is contained in:
Caolán McNamara 2011-08-21 23:49:54 +01:00
parent 16032347d9
commit b3c8e4177d
31 changed files with 61 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cui/source/tabpages/autocdlg.cxx
View File

@ -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 )
{

4
l10ntools/source/helpmerge.cxx
View File

@ -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;

4
l10ntools/source/lngmerge.cxx
View File

@ -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;

2
l10ntools/source/localize.cxx
View File

@ -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;

2
rsc/inc/rscdb.hxx
View File

@ -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; }

8
rsc/source/parser/rscdb.cxx
View File

@ -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:" );

2
svtools/source/config/htmlcfg.cxx
View File

@ -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;

2
svtools/source/control/ctrltool.cxx
View File

@ -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 )

2
svtools/source/filter/sgvtext.cxx
View File

@ -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());
}
}

4
svtools/source/filter/wmf/winwmf.cxx
View File

@ -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 );

6
svtools/source/misc/imap.cxx
View File

@ -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

4
svtools/source/misc/imap2.cxx
View File

@ -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(' ');
}

20
svtools/source/misc/transfer.cxx
View File

@ -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" ) )
{

6
svtools/source/svhtml/htmlout.cxx
View File

@ -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( '<' );

2
svtools/source/urlobj/inetimg.cxx
View File

@ -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;

2
toolkit/source/awt/vclxtoolkit.cxx
View File

@ -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();

2
tools/bootstrp/cppdep.cxx
View File

@ -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 ))

14
tools/bootstrp/rscdep.cxx
View File

@ -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;

8
tools/source/fsys/dirent.cxx
View File

@ -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 ) )

2
tools/source/inet/inetmsg.cxx
View File

@ -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);
}

4
tools/source/stream/strmwnt.cxx
View File

@ -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!

2
unotools/source/misc/syslocale.cxx
View File

@ -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

2
vcl/source/app/settings.cxx
View File

@ -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;

8
vcl/source/gdi/cvtsvm.cxx
View File

@ -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;

4
vcl/source/gdi/metaact.cxx
View File

@ -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();
}
// ========================================================================

2
vcl/source/gdi/outdev3.cxx
View File

@ -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 )

2
vcl/unx/generic/app/i18n_cb.cxx
View File

@ -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 );
}

2
vcl/unx/generic/plugadapt/salplug.cxx
View File

@ -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);
}

2
vcl/unx/generic/printer/printerinfomanager.cxx
View File

@ -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;

2
xmloff/source/draw/sdxmlimp.cxx
View File

@ -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;
}

2
xmloff/source/text/txtimppr.cxx
View File

@ -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 );