diff options
Diffstat (limited to 'sw/source/ui')
-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 |
9 files changed, 13 insertions, 13 deletions
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)); |