diff options
| -rw-r--r-- | sal/osl/unx/thread.c | 10 | ||||
| -rw-r--r-- | sal/osl/w32/thread.c | 9 |
2 files changed, 2 insertions, 17 deletions
diff --git a/sal/osl/unx/thread.c b/sal/osl/unx/thread.c index 598fd92c9b7b..3b09d3f65f8f 100644 --- a/sal/osl/unx/thread.c +++ b/sal/osl/unx/thread.c @@ -951,19 +951,11 @@ sal_Bool SAL_CALL osl_setThreadKeyData(oslThreadKey Key, void *pData) /*****************************************************************************/ static void osl_thread_textencoding_init_Impl (void) { - rtl_TextEncoding defaultEncoding; - const char * pszEncoding; - /* create thread specific data key */ pthread_key_create (&(g_thread.m_textencoding.m_key), NULL); /* determine default text encoding */ - pszEncoding = getenv ("SOLAR_USER_RTL_TEXTENCODING"); - if (pszEncoding) - defaultEncoding = atoi(pszEncoding); - else - defaultEncoding = osl_getTextEncodingFromLocale(NULL); - + rtl_TextEncoding defaultEncoding = osl_getTextEncodingFromLocale(NULL); OSL_ASSERT(defaultEncoding != RTL_TEXTENCODING_DONTKNOW); /* diff --git a/sal/osl/w32/thread.c b/sal/osl/w32/thread.c index d4dbc7f8f9f9..0bb71722694f 100644 --- a/sal/osl/w32/thread.c +++ b/sal/osl/w32/thread.c @@ -576,16 +576,9 @@ rtl_TextEncoding SAL_CALL osl_getThreadTextEncoding(void) _encoding = LOWORD(dwEncoding); gotACP = HIWORD(dwEncoding); - if ( !gotACP ) { - char *pszEncoding; - - if ( NULL != (pszEncoding = getenv( "SOLAR_USER_RTL_TEXTENCODING" )) ) - _encoding = (rtl_TextEncoding)atoi(pszEncoding); - else - _encoding = rtl_getTextEncodingFromWindowsCodePage( GetACP() ); - + _encoding = rtl_getTextEncodingFromWindowsCodePage( GetACP() ); TlsSetValue( g_dwTLSTextEncodingIndex, (LPVOID)(DWORD_PTR)MAKELONG( _encoding, TRUE ) ); } |