summaryrefslogtreecommitdiff
path: root/sc/source/ui
diff options
context:
space:
mode:
Diffstat (limited to 'sc/source/ui')
-rw-r--r--sc/source/ui/dbgui/asciiopt.cxx2
-rw-r--r--sc/source/ui/dbgui/imoptdlg.cxx2
-rw-r--r--sc/source/ui/dbgui/scuiasciiopt.cxx4
-rw-r--r--sc/source/ui/dbgui/scuiimoptdlg.cxx2
-rw-r--r--sc/source/ui/docshell/docsh4.cxx6
-rw-r--r--sc/source/ui/docshell/impex.cxx6
-rw-r--r--sc/source/ui/docshell/servobj.cxx2
-rw-r--r--sc/source/ui/view/viewfun5.cxx2
8 files changed, 13 insertions, 13 deletions
diff --git a/sc/source/ui/dbgui/asciiopt.cxx b/sc/source/ui/dbgui/asciiopt.cxx
index f328b0a67e3d..f68ba2d2ca2b 100644
--- a/sc/source/ui/dbgui/asciiopt.cxx
+++ b/sc/source/ui/dbgui/asciiopt.cxx
@@ -56,7 +56,7 @@ ScAsciiOptions::ScAsciiOptions() :
bQuotedFieldAsText(false),
bDetectSpecialNumber(false),
cTextSep ( cDefaultTextSep ),
- eCharSet ( gsl_getSystemTextEncoding() ),
+ eCharSet ( osl_getThreadTextEncoding() ),
eLang ( LANGUAGE_SYSTEM ),
bCharSetSystem ( false ),
nStartRow ( 1 ),
diff --git a/sc/source/ui/dbgui/imoptdlg.cxx b/sc/source/ui/dbgui/imoptdlg.cxx
index 56946006ce02..9c8ca82257cd 100644
--- a/sc/source/ui/dbgui/imoptdlg.cxx
+++ b/sc/source/ui/dbgui/imoptdlg.cxx
@@ -113,7 +113,7 @@ String ScImportOptions::BuildString() const
void ScImportOptions::SetTextEncoding( rtl_TextEncoding nEnc )
{
eCharSet = (nEnc == RTL_TEXTENCODING_DONTKNOW ?
- gsl_getSystemTextEncoding() : nEnc);
+ osl_getThreadTextEncoding() : nEnc);
aStrFont = ScGlobal::GetCharsetString( nEnc );
}
diff --git a/sc/source/ui/dbgui/scuiasciiopt.cxx b/sc/source/ui/dbgui/scuiasciiopt.cxx
index 9806e80659a0..3d36cd8e4455 100644
--- a/sc/source/ui/dbgui/scuiasciiopt.cxx
+++ b/sc/source/ui/dbgui/scuiasciiopt.cxx
@@ -387,7 +387,7 @@ ScImportAsciiDlg::ScImportAsciiDlg( Window* pParent,String aDatName,
// independent document linkage.
aLbCharSet.InsertTextEncoding( RTL_TEXTENCODING_DONTKNOW, aCharSetUser );
aLbCharSet.SelectTextEncoding( ePreselectUnicode == RTL_TEXTENCODING_DONTKNOW ?
- gsl_getSystemTextEncoding() : ePreselectUnicode );
+ osl_getThreadTextEncoding() : ePreselectUnicode );
if( nCharSet >= 0 && ePreselectUnicode == RTL_TEXTENCODING_DONTKNOW )
aLbCharSet.SelectEntryPos( static_cast<sal_uInt16>(nCharSet) );
@@ -563,7 +563,7 @@ void ScImportAsciiDlg::SetSelectedCharSet()
meCharSet = aLbCharSet.GetSelectTextEncoding();
mbCharSetSystem = (meCharSet == RTL_TEXTENCODING_DONTKNOW);
if( mbCharSetSystem )
- meCharSet = gsl_getSystemTextEncoding();
+ meCharSet = osl_getThreadTextEncoding();
}
String ScImportAsciiDlg::GetSeparators() const
diff --git a/sc/source/ui/dbgui/scuiimoptdlg.cxx b/sc/source/ui/dbgui/scuiimoptdlg.cxx
index 4fa3e6868875..8279092b7e60 100644
--- a/sc/source/ui/dbgui/scuiimoptdlg.cxx
+++ b/sc/source/ui/dbgui/scuiimoptdlg.cxx
@@ -235,7 +235,7 @@ ScImportOptionsDlg::ScImportOptionsDlg(
}
aLbFont.SelectTextEncoding( pOptions ? pOptions->eCharSet :
- gsl_getSystemTextEncoding() );
+ osl_getThreadTextEncoding() );
// optionaler Titel:
if ( pStrTitle )
diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx
index 9f6186a7c909..1494834d1936 100644
--- a/sc/source/ui/docshell/docsh4.cxx
+++ b/sc/source/ui/docshell/docsh4.cxx
@@ -2034,7 +2034,7 @@ long ScDocShell::DdeGetData( const String& rItem,
aDdeTextFmt.EqualsAscii( "FSYLK" ) )
{
rtl::OString aData;
- if( aObj.ExportByteString( aData, gsl_getSystemTextEncoding(),
+ if( aObj.ExportByteString( aData, osl_getThreadTextEncoding(),
SOT_FORMATSTR_ID_SYLK ) )
{
rValue <<= ::com::sun::star::uno::Sequence< sal_Int8 >(
@@ -2067,7 +2067,7 @@ long ScDocShell::DdeSetData( const String& rItem,
{
if( rItem.EqualsIgnoreCaseAscii( "Format" ) )
{
- if ( ScByteSequenceToString::GetString( aDdeTextFmt, rValue, gsl_getSystemTextEncoding() ) )
+ if ( ScByteSequenceToString::GetString( aDdeTextFmt, rValue, osl_getThreadTextEncoding() ) )
{
aDdeTextFmt.ToUpperAscii();
return 1;
@@ -2081,7 +2081,7 @@ long ScDocShell::DdeSetData( const String& rItem,
aDdeTextFmt.EqualsAscii( "FSYLK" ) )
{
String aData;
- if ( ScByteSequenceToString::GetString( aData, rValue, gsl_getSystemTextEncoding() ) )
+ if ( ScByteSequenceToString::GetString( aData, rValue, osl_getThreadTextEncoding() ) )
{
return aObj.ImportString( aData, SOT_FORMATSTR_ID_SYLK ) ? 1 : 0;
}
diff --git a/sc/source/ui/docshell/impex.cxx b/sc/source/ui/docshell/impex.cxx
index a10affc84d5b..9d744bde320f 100644
--- a/sc/source/ui/docshell/impex.cxx
+++ b/sc/source/ui/docshell/impex.cxx
@@ -325,7 +325,7 @@ sal_Bool ScImportExport::ImportString( const ::rtl::OUString& rText, sal_uLong n
//break;
default:
{
- rtl_TextEncoding eEnc = gsl_getSystemTextEncoding();
+ rtl_TextEncoding eEnc = osl_getThreadTextEncoding();
::rtl::OString aTmp( rText.getStr(), rText.getLength(), eEnc );
SvMemoryStream aStrm( (void*)aTmp.getStr(), aTmp.getLength() * sizeof(sal_Char), STREAM_READ );
aStrm.SetStreamCharSet( eEnc );
@@ -341,7 +341,7 @@ sal_Bool ScImportExport::ExportString( ::rtl::OUString& rText, sal_uLong nFmt )
OSL_ENSURE( nFmt == FORMAT_STRING, "ScImportExport::ExportString: Unicode not supported for other formats than FORMAT_STRING" );
if ( nFmt != FORMAT_STRING )
{
- rtl_TextEncoding eEnc = gsl_getSystemTextEncoding();
+ rtl_TextEncoding eEnc = osl_getThreadTextEncoding();
rtl::OString aTmp;
sal_Bool bOk = ExportByteString( aTmp, eEnc, nFmt );
rText = rtl::OStringToOUString( aTmp, eEnc );
@@ -372,7 +372,7 @@ sal_Bool ScImportExport::ExportByteString( rtl::OString& rText, rtl_TextEncoding
{
OSL_ENSURE( eEnc != RTL_TEXTENCODING_UNICODE, "ScImportExport::ExportByteString: Unicode not supported" );
if ( eEnc == RTL_TEXTENCODING_UNICODE )
- eEnc = gsl_getSystemTextEncoding();
+ eEnc = osl_getThreadTextEncoding();
if (!nSizeLimit)
nSizeLimit = STRING_MAXLEN;
diff --git a/sc/source/ui/docshell/servobj.cxx b/sc/source/ui/docshell/servobj.cxx
index 90c497ea6688..2bbff8fb3050 100644
--- a/sc/source/ui/docshell/servobj.cxx
+++ b/sc/source/ui/docshell/servobj.cxx
@@ -189,7 +189,7 @@ sal_Bool ScServerObject::GetData(
aDdeTextFmt.EqualsAscii( "FSYLK" ) )
{
rtl::OString aByteData;
- if( aObj.ExportByteString( aByteData, gsl_getSystemTextEncoding(), SOT_FORMATSTR_ID_SYLK ) )
+ if( aObj.ExportByteString( aByteData, osl_getThreadTextEncoding(), SOT_FORMATSTR_ID_SYLK ) )
{
rData <<= ::com::sun::star::uno::Sequence< sal_Int8 >(
(const sal_Int8*)aByteData.getStr(),
diff --git a/sc/source/ui/view/viewfun5.cxx b/sc/source/ui/view/viewfun5.cxx
index f5571aba06e9..14ec8008c913 100644
--- a/sc/source/ui/view/viewfun5.cxx
+++ b/sc/source/ui/view/viewfun5.cxx
@@ -676,7 +676,7 @@ bool ScViewFunc::PasteLink( const uno::Reference<datatransfer::XTransferable>& r
sal_Int32 nSeqLen = aSequence.getLength();
const char* p = reinterpret_cast<const char*>(aSequence.getConstArray());
- rtl_TextEncoding eSysEnc = gsl_getSystemTextEncoding();
+ rtl_TextEncoding eSysEnc = osl_getThreadTextEncoding();
// char array delimited by \0.
// app \0 topic \0 item \0 (extra \0) where the extra is optional.
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-21 11:23:23 +0000