Kaydet (Commit) 3b1d10ac authored tarafından Hennes Rohling's avatar Hennes Rohling

#84715# osl_getThreadTextEncoding first defaults to contents of environment…

#84715# osl_getThreadTextEncoding first defaults to contents of environment variable SOLAR_USER_RTL_TEXTENCODING
üst c6f37202
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
* *
* $RCSfile: thread.c,v $ * $RCSfile: thread.c,v $
* *
* $Revision: 1.9 $ * $Revision: 1.10 $
* *
* last change: $Author: obr $ $Date: 2001-04-11 11:25:58 $ * last change: $Author: hro $ $Date: 2001-05-09 14:45:39 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
...@@ -751,7 +751,13 @@ rtl_TextEncoding SAL_CALL osl_getThreadTextEncoding() ...@@ -751,7 +751,13 @@ rtl_TextEncoding SAL_CALL osl_getThreadTextEncoding()
if ( !gotACP ) if ( !gotACP )
{ {
_encoding = GetTextEncodingFromCodePage( GetACP() ); char *pszEncoding;
if ( NULL != (pszEncoding = getenv( "SOLAR_USER_RTL_TEXTENCODING" )) )
_encoding = atoi(pszEncoding);
else
_encoding = GetTextEncodingFromCodePage( GetACP() );
TlsSetValue( g_dwTLSTextEncodingIndex, (LPVOID)MAKELONG( _encoding, TRUE ) ); TlsSetValue( g_dwTLSTextEncodingIndex, (LPVOID)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