diff options
Diffstat (limited to 'sw')
-rw-r--r-- | sw/inc/shellio.hxx | 2 | ||||
-rw-r--r-- | sw/source/core/doc/tblafmt.cxx | 6 | ||||
-rw-r--r-- | sw/source/core/edit/edtox.cxx | 2 | ||||
-rw-r--r-- | sw/source/core/fields/ddefld.cxx | 2 | ||||
-rw-r--r-- | sw/source/filter/html/swhtml.cxx | 4 | ||||
-rw-r--r-- | sw/source/filter/xml/xmlimp.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/config/uinums.cxx | 8 | ||||
-rw-r--r-- | sw/source/ui/dbui/dbmgr.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/dbui/mmoutputpage.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/dialog/ascfldlg.cxx | 2 | ||||
-rwxr-xr-x | sw/source/ui/dochdl/swdtflvr.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/docvw/edtwin2.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/docvw/srcedtw.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/index/cnttab.cxx | 4 | ||||
-rw-r--r-- | sw/source/ui/utlui/content.cxx | 2 |
15 files changed, 22 insertions, 22 deletions
diff --git a/sw/inc/shellio.hxx b/sw/inc/shellio.hxx index d915bb2a26fa..56cd0635f4f6 100644 --- a/sw/inc/shellio.hxx +++ b/sw/inc/shellio.hxx @@ -97,7 +97,7 @@ public: { sFont.Erase(); eCRLF_Flag = GetSystemLineEnd(); - eCharSet = ::gsl_getSystemTextEncoding(); + eCharSet = ::osl_getThreadTextEncoding(); nLanguage = 0; } // for the automatic conversion (mail/news/...) diff --git a/sw/source/core/doc/tblafmt.cxx b/sw/source/core/doc/tblafmt.cxx index 5c321b0fd337..4e3df17fbbaf 100644 --- a/sw/source/core/doc/tblafmt.cxx +++ b/sw/source/core/doc/tblafmt.cxx @@ -337,7 +337,7 @@ sal_Bool SwBoxAutoFmt::Load( SvStream& rStream, const SwAfVersions& rVersions, s READ( aFont, SvxFontItem , rVersions.nFontVersion) if( rStream.GetStreamCharSet() == aFont.GetCharSet() ) - aFont.SetCharSet(::gsl_getSystemTextEncoding()); + aFont.SetCharSet(::osl_getThreadTextEncoding()); READ( aHeight, SvxFontHeightItem , rVersions.nFontHeightVersion) READ( aWeight, SvxWeightItem , rVersions.nWeightVersion) @@ -425,7 +425,7 @@ sal_Bool SwBoxAutoFmt::LoadOld( SvStream& rStream, sal_uInt16 aLoadVer[] ) READ( aFont, SvxFontItem , 0) if( rStream.GetStreamCharSet() == aFont.GetCharSet() ) - aFont.SetCharSet(::gsl_getSystemTextEncoding()); + aFont.SetCharSet(::osl_getThreadTextEncoding()); READ( aHeight, SvxFontHeightItem , 1) READ( aWeight, SvxWeightItem , 2) @@ -1079,7 +1079,7 @@ sal_Bool SwTableAutoFmtTbl::Save( SvStream& rStream ) const sal_uInt16 nVal = AUTOFORMAT_ID; rStream << nVal << (sal_uInt8)2 // Anzahl von Zeichen des Headers incl. diesem - << (sal_uInt8)GetStoreCharSet( ::gsl_getSystemTextEncoding() ); + << (sal_uInt8)GetStoreCharSet( ::osl_getThreadTextEncoding() ); bRet = 0 == rStream.GetError(); diff --git a/sw/source/core/edit/edtox.cxx b/sw/source/core/edit/edtox.cxx index 0cde96d7440a..246d51c7d315 100644 --- a/sw/source/core/edit/edtox.cxx +++ b/sw/source/core/edit/edtox.cxx @@ -346,7 +346,7 @@ void SwEditShell::ApplyAutoMark() SvStream& rStrm = *aMedium.GetInStream(); const String sZero('0'); Push(); - rtl_TextEncoding eChrSet = ::gsl_getSystemTextEncoding(); + rtl_TextEncoding eChrSet = ::osl_getThreadTextEncoding(); // // SearchOptions to be used in loop below diff --git a/sw/source/core/fields/ddefld.cxx b/sw/source/core/fields/ddefld.cxx index bcf4e3e7f685..4b7af34ac3b5 100644 --- a/sw/source/core/fields/ddefld.cxx +++ b/sw/source/core/fields/ddefld.cxx @@ -46,7 +46,7 @@ using rtl::OUString; using namespace ::com::sun::star; -#define DDE_TXT_ENCODING gsl_getSystemTextEncoding() +#define DDE_TXT_ENCODING osl_getThreadTextEncoding() /*-------------------------------------------------------------------- Beschreibung: Globale Variablen diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx index 05b83f1ad632..1059a3fc6107 100644 --- a/sw/source/filter/html/swhtml.cxx +++ b/sw/source/filter/html/swhtml.cxx @@ -378,7 +378,7 @@ SwHTMLParser::SwHTMLParser( SwDoc* pD, const SwPaM& rCrsr, SvStream& rIn, if( pHeaderAttrs ) SetEncodingByHTTPHeader( pHeaderAttrs ); } - pCSS1Parser->SetDfltEncoding( gsl_getSystemTextEncoding() ); + pCSS1Parser->SetDfltEncoding( osl_getThreadTextEncoding() ); // Timer nur bei ganz normalen Dokumenten aufsetzen! SwDocShell* pDocSh = pDoc->GetDocShell(); @@ -3684,7 +3684,7 @@ void SwHTMLParser::NewFontAttr( int nToken ) String aFontName, aStyleName; FontFamily eFamily = FAMILY_DONTKNOW; // Family und Pitch, FontPitch ePitch = PITCH_DONTKNOW; // falls nicht gefunden - rtl_TextEncoding eEnc = gsl_getSystemTextEncoding(); + rtl_TextEncoding eEnc = osl_getThreadTextEncoding(); if( aFace.Len() && !pCSS1Parser->IsIgnoreFontFamily() ) { diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx index 6537e71664c1..cab34860ea91 100644 --- a/sw/source/filter/xml/xmlimp.cxx +++ b/sw/source/filter/xml/xmlimp.cxx @@ -1019,7 +1019,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/sw/source/ui/config/uinums.cxx b/sw/source/ui/config/uinums.cxx index 4be6ecfcaab5..939c0e715b44 100644 --- a/sw/source/ui/config/uinums.cxx +++ b/sw/source/ui/config/uinums.cxx @@ -236,7 +236,7 @@ const SwNumRulesWithName& SwNumRulesWithName::operator=(const SwNumRulesWithName SwNumRulesWithName::SwNumRulesWithName( SvStream &rStream, sal_uInt16 nVersion ) { - CharSet eEncoding = gsl_getSystemTextEncoding(); + CharSet eEncoding = osl_getThreadTextEncoding(); rStream.ReadByteString(aName, eEncoding); char c; @@ -275,7 +275,7 @@ void SwNumRulesWithName::MakeNumRule( SwWrtShell& rSh, SwNumRule& rChg ) const void SwNumRulesWithName::Store( SvStream &rStream ) { - CharSet eEncoding = gsl_getSystemTextEncoding(); + CharSet eEncoding = osl_getThreadTextEncoding(); rStream.WriteByteString(aName, eEncoding); for( sal_uInt16 n = 0; n < MAXLEVEL; ++n ) @@ -332,7 +332,7 @@ SwNumRulesWithName::_SwNumFmtGlobal::_SwNumFmtGlobal( SvStream& rStream, sal_uInt16 nVersion ) : nCharPoolId( USHRT_MAX ) { - CharSet eEncoding = gsl_getSystemTextEncoding(); + CharSet eEncoding = osl_getThreadTextEncoding(); { sal_uInt16 nUS; sal_Char cChar; @@ -466,7 +466,7 @@ SwNumRulesWithName::_SwNumFmtGlobal::~_SwNumFmtGlobal() void SwNumRulesWithName::_SwNumFmtGlobal::Store( SvStream& rStream ) { - CharSet eEncoding = gsl_getSystemTextEncoding(); + CharSet eEncoding = osl_getThreadTextEncoding(); { String aName; sal_uInt16 nFamily = FAMILY_DONTKNOW, nCharSet = 0, nPitch = 0; diff --git a/sw/source/ui/dbui/dbmgr.cxx b/sw/source/ui/dbui/dbmgr.cxx index cd0baba09863..87eb03a687aa 100644 --- a/sw/source/ui/dbui/dbmgr.cxx +++ b/sw/source/ui/dbui/dbmgr.cxx @@ -848,7 +848,7 @@ sal_Bool SwNewDBMgr::MergeMailFiles(SwWrtShell* pSourceShell, ::rtl::Reference< MailDispatcher > xMailDispatcher; ::rtl::OUString sBodyMimeType; - rtl_TextEncoding eEncoding = ::gsl_getSystemTextEncoding(); + rtl_TextEncoding eEncoding = ::osl_getThreadTextEncoding(); if(bEMail) { diff --git a/sw/source/ui/dbui/mmoutputpage.cxx b/sw/source/ui/dbui/mmoutputpage.cxx index c7d7fd4223e4..67844640658d 100644 --- a/sw/source/ui/dbui/mmoutputpage.cxx +++ b/sw/source/ui/dbui/mmoutputpage.cxx @@ -1044,7 +1044,7 @@ IMPL_LINK(SwMailMergeOutputPage, SendDocumentsHdl_Impl, PushButton*, pButton) nEnd = rConfigItem.GetMergedDocumentCount(); } bool bAsBody = false; - rtl_TextEncoding eEncoding = ::gsl_getSystemTextEncoding(); + rtl_TextEncoding eEncoding = ::osl_getThreadTextEncoding(); SfxFilterContainer* pFilterContainer = SwDocShell::Factory().GetFilterContainer(); const SfxFilter *pSfxFlt = 0; sal_uLong nDocType = (sal_uLong)m_aSendAsLB.GetEntryData(m_aSendAsLB.GetSelectEntryPos()); diff --git a/sw/source/ui/dialog/ascfldlg.cxx b/sw/source/ui/dialog/ascfldlg.cxx index eb82e9f2fff5..1e63040d4d9a 100644 --- a/sw/source/ui/dialog/ascfldlg.cxx +++ b/sw/source/ui/dialog/ascfldlg.cxx @@ -372,7 +372,7 @@ IMPL_LINK( SwAsciiFilterDlg, CharSetSelHdl, SvxTextEncodingBox*, pBox ) nOldLng = nLng; rtl_TextEncoding nChrSet = pBox->GetSelectTextEncoding(); - if( nChrSet == gsl_getSystemTextEncoding() ) + if( nChrSet == osl_getThreadTextEncoding() ) eEnd = GetSystemLineEnd(); else { diff --git a/sw/source/ui/dochdl/swdtflvr.cxx b/sw/source/ui/dochdl/swdtflvr.cxx index 1212d9c14c8b..646c511df9cd 100755 --- a/sw/source/ui/dochdl/swdtflvr.cxx +++ b/sw/source/ui/dochdl/swdtflvr.cxx @@ -154,7 +154,7 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::datatransfer; using namespace nsTransferBufferType; -#define DDE_TXT_ENCODING gsl_getSystemTextEncoding() +#define DDE_TXT_ENCODING osl_getThreadTextEncoding() class SwTrnsfrDdeLink : public ::sfx2::SvBaseLink { diff --git a/sw/source/ui/docvw/edtwin2.cxx b/sw/source/ui/docvw/edtwin2.cxx index 169c3e0bd4ac..85ec45f965f4 100644 --- a/sw/source/ui/docvw/edtwin2.cxx +++ b/sw/source/ui/docvw/edtwin2.cxx @@ -163,7 +163,7 @@ void SwEditWin::RequestHelp(const HelpEvent &rEvt) { sTxt = rtl::OStringToOUString(rtl::OString::valueOf( ((SwTblBoxValue*)aCntntAtPos.aFnd.pAttr)->GetValue()), - gsl_getSystemTextEncoding()); + osl_getThreadTextEncoding()); } break; case SwContentAtPos::SW_CURR_ATTRS: diff --git a/sw/source/ui/docvw/srcedtw.cxx b/sw/source/ui/docvw/srcedtw.cxx index 9b468a827748..1f5ca938944b 100644 --- a/sw/source/ui/docvw/srcedtw.cxx +++ b/sw/source/ui/docvw/srcedtw.cxx @@ -230,7 +230,7 @@ SwSrcEditWindow::SwSrcEditWindow( Window* pParent, SwSrcView* pParentView ) : nCurTextWidth(0), nStartLine(USHRT_MAX), - eSourceEncoding(gsl_getSystemTextEncoding()), + eSourceEncoding(osl_getThreadTextEncoding()), bDoSyntaxHighlight(sal_True), bHighlighting(sal_False) { diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx index 3fc515d6aa4d..4825fbf21a8b 100644 --- a/sw/source/ui/index/cnttab.cxx +++ b/sw/source/ui/index/cnttab.cxx @@ -4090,7 +4090,7 @@ void SwEntryBrowseBox::ReadEntries(SvStream& rInStr) { AutoMarkEntry* pToInsert = 0; const String sZero('0'); - rtl_TextEncoding eTEnc = gsl_getSystemTextEncoding(); + rtl_TextEncoding eTEnc = osl_getThreadTextEncoding(); while( !rInStr.GetError() && !rInStr.IsEof() ) { String sLine; @@ -4151,7 +4151,7 @@ void SwEntryBrowseBox::WriteEntries(SvStream& rOutStr) if(pController ->IsModified()) GoToColumnId(nCol < ITEM_CASE ? ++nCol : --nCol ); - rtl_TextEncoding eTEnc = gsl_getSystemTextEncoding(); + rtl_TextEncoding eTEnc = osl_getThreadTextEncoding(); for(sal_uInt16 i = 0; i < aEntryArr.Count();i++) { AutoMarkEntry* pEntry = aEntryArr[i]; diff --git a/sw/source/ui/utlui/content.cxx b/sw/source/ui/utlui/content.cxx index 49b19766d036..db696356809a 100644 --- a/sw/source/ui/utlui/content.cxx +++ b/sw/source/ui/utlui/content.cxx @@ -3105,7 +3105,7 @@ NaviContentBookmark::NaviContentBookmark( const String &rUrl, void NaviContentBookmark::Copy( TransferDataContainer& rData ) const { - rtl_TextEncoding eSysCSet = gsl_getSystemTextEncoding(); + rtl_TextEncoding eSysCSet = osl_getThreadTextEncoding(); rtl::OStringBuffer sStrBuf(rtl::OUStringToOString(aUrl, eSysCSet)); sStrBuf.append(static_cast<char>(NAVI_BOOKMARK_DELIM)); |