diff options
| author | David Tardon <dtardon@redhat.com> | 2011-11-24 12:06:54 +0100 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2011-11-25 09:07:49 +0100 |
| commit | fba911fea7b87e332b8db9e511b875feedbcb59c (patch) | |
| tree | 55e119a74d03fe61c4c7181dd295ed8cfa3d2427 /sc/source/ui/dbgui | |
| parent | 20c8eb409e2b48d57f392c146f7414bab3551664 (diff) | |
gsl_getSystemTextEncoding -> osl_getThreadTextEncoding
Diffstat (limited to 'sc/source/ui/dbgui')
| -rw-r--r-- | sc/source/ui/dbgui/asciiopt.cxx | 2 | ||||
| -rw-r--r-- | sc/source/ui/dbgui/imoptdlg.cxx | 2 | ||||
| -rw-r--r-- | sc/source/ui/dbgui/scuiasciiopt.cxx | 4 | ||||
| -rw-r--r-- | sc/source/ui/dbgui/scuiimoptdlg.cxx | 2 |
4 files changed, 5 insertions, 5 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 ) |