diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-08-21 23:49:54 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-08-22 09:39:18 +0100 |
| commit | b3c8e4177d24a184ffa854958fb177200608f68c (patch) | |
| tree | e39f1702e132a255954635aa06007f3d92bccc92 /vcl/unx/generic | |
| parent | 16032347d9b43d1ccefc185713e43b4d19974de6 (diff) | |
gsl_getSystemTextEncoding->osl_getThreadTextEncoding
Diffstat (limited to 'vcl/unx/generic')
| -rw-r--r-- | vcl/unx/generic/app/i18n_cb.cxx | 2 | ||||
| -rw-r--r-- | vcl/unx/generic/plugadapt/salplug.cxx | 2 | ||||
| -rw-r--r-- | vcl/unx/generic/printer/printerinfomanager.cxx | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/vcl/unx/generic/app/i18n_cb.cxx b/vcl/unx/generic/app/i18n_cb.cxx index 9b2283aaef72..d0cf39fdc4d4 100644 --- a/vcl/unx/generic/app/i18n_cb.cxx +++ b/vcl/unx/generic/app/i18n_cb.cxx @@ -614,7 +614,7 @@ StatusDrawCallback (XIC ic, XPointer client_data, XIMStatusDrawCallbackStruct *c } } if( nLength ) - aText = String( pMBString, nLength, gsl_getSystemTextEncoding() ); + aText = String( pMBString, nLength, osl_getThreadTextEncoding() ); } ::vcl::I18NStatus::get().setStatusText( aText ); } diff --git a/vcl/unx/generic/plugadapt/salplug.cxx b/vcl/unx/generic/plugadapt/salplug.cxx index e48ea3dc743d..51321b8c47ef 100644 --- a/vcl/unx/generic/plugadapt/salplug.cxx +++ b/vcl/unx/generic/plugadapt/salplug.cxx @@ -272,7 +272,7 @@ void SalAbort( const XubString& rErrorText ) if( !rErrorText.Len() ) std::fprintf( stderr, "Application Error\n" ); else - std::fprintf( stderr, "%s\n", rtl::OUStringToOString(rErrorText, gsl_getSystemTextEncoding()).getStr() ); + std::fprintf( stderr, "%s\n", rtl::OUStringToOString(rErrorText, osl_getThreadTextEncoding()).getStr() ); exit(-1); } diff --git a/vcl/unx/generic/printer/printerinfomanager.cxx b/vcl/unx/generic/printer/printerinfomanager.cxx index d04ef42bfd80..0cd00db12c65 100644 --- a/vcl/unx/generic/printer/printerinfomanager.cxx +++ b/vcl/unx/generic/printer/printerinfomanager.cxx @@ -233,7 +233,7 @@ bool PrinterInfoManager::checkPrintersChanged( bool bWait ) void PrinterInfoManager::initialize() { m_bUseIncludeFeature = false; - rtl_TextEncoding aEncoding = gsl_getSystemTextEncoding(); + rtl_TextEncoding aEncoding = osl_getThreadTextEncoding(); m_aPrinters.clear(); m_aWatchFiles.clear(); OUString aDefaultPrinter; |