[Libreoffice-commits] .: sal/osl

[Libreoffice Gerrit user]

 sal/osl/unx/nlsupport.c |   11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

New commits:
commit bf850f6799e505e6d1735540e68e01c6b18ef22f
Author: Tor Lillqvist <tml at iki.fi>
Date:   Sun Jan 6 12:41:07 2013 +0200

    Streamline a bit for Android
    
    Change-Id: I8233f6409d75bff23738e121efcdbd340035da9d

diff --git a/sal/osl/unx/nlsupport.c b/sal/osl/unx/nlsupport.c
index fd0e024..b0f231f 100644
--- a/sal/osl/unx/nlsupport.c
+++ b/sal/osl/unx/nlsupport.c
@@ -907,6 +907,12 @@ void _imp_getProcessLocale( rtl_Locale ** ppLocale )
 
 void _imp_getProcessLocale( rtl_Locale ** ppLocale )
 {
+#ifdef ANDROID
+    /* No locale environment variables on Android, so why even bother
+     * with getenv().
+     */
+   locale = "en-US.UTF-8";
+#else
     /* simulate behavior off setlocale */
     char * locale = getenv( "LC_ALL" );
 
@@ -917,13 +923,10 @@ void _imp_getProcessLocale( rtl_Locale ** ppLocale )
         locale = getenv( "LANG" );
 
     if( NULL == locale )
-#ifdef ANDROID
-        locale = "en-US.UTF-8";
-#else
         locale = "C";
-#endif
 
     *ppLocale = _parse_locale( locale );
+#endif
 }
 #endif