Kaydet (Commit) 668c627e authored tarafından Stephan Bergmann's avatar Stephan Bergmann

Remove support for undocumented SOLAR_USER_RTL_TEXTENCODING env var

...introduced in 2001 with a Sun-internal bug ID as
3b1d10ac and
54007bb9 "#84715# osl_getThreadTextEncoding
first defaults to contents of environment variable SOLAR_USER_RTL_TEXTENCODING."

Change-Id: I991b4777c27a24419bf066cf41b3c4545d0fa681
üst 5c791770
......@@ -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);
/*
......
......@@ -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 ) );
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment