diff options
Diffstat (limited to 'filter/source')
-rw-r--r-- | filter/source/graphicfilter/ios2met/ios2met.cxx | 4 | ||||
-rw-r--r-- | filter/source/graphicfilter/ipict/ipict.cxx | 6 | ||||
-rw-r--r-- | filter/source/msfilter/msdffimp.cxx | 2 | ||||
-rw-r--r-- | filter/source/msfilter/svdfppt.cxx | 4 | ||||
-rw-r--r-- | filter/source/xsltdialog/xmlfileview.cxx | 2 |
5 files changed, 9 insertions, 9 deletions
diff --git a/filter/source/graphicfilter/ios2met/ios2met.cxx b/filter/source/graphicfilter/ios2met/ios2met.cxx index 72e071665758..5319b9ff73f2 100644 --- a/filter/source/graphicfilter/ios2met/ios2met.cxx +++ b/filter/source/graphicfilter/ios2met/ios2met.cxx @@ -991,7 +991,7 @@ void OS2METReader::ReadChrStr(sal_Bool bGivenPos, sal_Bool bMove, sal_Bool bExtr for (i=0; i<nLen; i++) *pOS2MET >> pChr[i]; pChr[nLen] = 0; - String aStr( (const sal_Char*)pChr, gsl_getSystemTextEncoding() ); + String aStr( (const sal_Char*)pChr, osl_getThreadTextEncoding() ); SetRasterOp(aAttr.eChrMix); if (pVirDev->GetFont()!=aFont) pVirDev->SetFont(aFont); @@ -2273,7 +2273,7 @@ void OS2METReader::ReadFont(sal_uInt16 nFieldSize) pOS2MET->SeekRel(1); pOS2MET->Read( &str, 32 ); str[ 32 ] = 0; - String aStr( (const sal_Char*)str, gsl_getSystemTextEncoding() ); + String aStr( (const sal_Char*)str, osl_getThreadTextEncoding() ); if ( aStr.CompareIgnoreCaseToAscii( "Helv" ) == COMPARE_EQUAL ) aStr = String::CreateFromAscii( "Helvetica" ); pF->aFont.SetName( aStr ); diff --git a/filter/source/graphicfilter/ipict/ipict.cxx b/filter/source/graphicfilter/ipict/ipict.cxx index 8b94572728bb..dc2ef25760e9 100644 --- a/filter/source/graphicfilter/ipict/ipict.cxx +++ b/filter/source/graphicfilter/ipict/ipict.cxx @@ -316,8 +316,8 @@ rtl_TextEncoding PictReader::GetTextEncoding (sal_uInt16 fId) { static bool first = true; static rtl_TextEncoding enc = RTL_TEXTENCODING_APPLE_ROMAN; if (first) { - rtl_TextEncoding def = gsl_getSystemTextEncoding(); - // we keep gsl_getSystemTextEncoding only if it is a mac encoding + rtl_TextEncoding def = osl_getThreadTextEncoding(); + // we keep osl_getThreadTextEncoding only if it is a mac encoding switch(def) { case RTL_TEXTENCODING_APPLE_ROMAN: case RTL_TEXTENCODING_APPLE_ARABIC: @@ -1502,7 +1502,7 @@ sal_uLong PictReader::ReadData(sal_uInt16 nOpcode) *pPict >> nByteLen; nLen=((sal_uInt16)nByteLen)&0x00ff; pPict->Read( &sFName, nLen ); sFName[ nLen ] = 0; - String aString( (const sal_Char*)&sFName, gsl_getSystemTextEncoding() ); + String aString( (const sal_Char*)&sFName, osl_getThreadTextEncoding() ); aActFont.SetName( aString ); eActMethod=PDM_UNDEFINED; break; diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx index 49b95891421b..769c57420ab5 100644 --- a/filter/source/msfilter/msdffimp.cxx +++ b/filter/source/msfilter/msdffimp.cxx @@ -7061,7 +7061,7 @@ sal_Bool SvxMSDffManager::ConvertToOle2( SvStream& rStm, sal_uInt32 nReadLen, { sal_Char * pBuf = new sal_Char[ nStrLen ]; rStm.Read( pBuf, nStrLen ); - aSvrName.Assign( String( pBuf, (sal_uInt16) nStrLen-1, gsl_getSystemTextEncoding() ) ); + aSvrName.Assign( String( pBuf, (sal_uInt16) nStrLen-1, osl_getThreadTextEncoding() ) ); delete[] pBuf; } else diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx index 2f0cf778e067..f534f3472e80 100644 --- a/filter/source/msfilter/svdfppt.cxx +++ b/filter/source/msfilter/svdfppt.cxx @@ -402,7 +402,7 @@ SvStream& operator>>( SvStream& rIn, PptFontEntityAtom& rAtom ) break; default : - rAtom.eCharSet = gsl_getSystemTextEncoding(); + rAtom.eCharSet = osl_getThreadTextEncoding(); } switch ( lfPitchAndFamily & 0xf0 ) { @@ -526,7 +526,7 @@ SdrEscherImport::SdrEscherImport( PowerPointImportParam& rParam, const String& r pFonts ( NULL ), nStreamLen ( 0 ), nTextStylesIndex ( 0xffff ), - eCharSetSystem ( gsl_getSystemTextEncoding() ), + eCharSetSystem ( osl_getThreadTextEncoding() ), bWingdingsChecked ( sal_False ), bWingdingsAvailable ( sal_False ), bMonotypeSortsChecked ( sal_False ), diff --git a/filter/source/xsltdialog/xmlfileview.cxx b/filter/source/xsltdialog/xmlfileview.cxx index 87b71a4d2833..58133dc0a097 100644 --- a/filter/source/xsltdialog/xmlfileview.cxx +++ b/filter/source/xsltdialog/xmlfileview.cxx @@ -146,7 +146,7 @@ XMLFileWindow::XMLFileWindow( Window* pParent ) : pVScrollbar(0), nCurTextWidth(0), nStartLine(USHRT_MAX), - eSourceEncoding(gsl_getSystemTextEncoding()), + eSourceEncoding(osl_getThreadTextEncoding()), bHighlighting(false) { CreateTextEngine(); |