[Libreoffice-commits] .: sal/osl

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Sun Jan 6 06:35:27 PST 2013


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

New commits:
commit 3968133721f2d44fa861d369e4d6765c4ffbb6eb
Author: Tor Lillqvist <tml at iki.fi>
Date:   Sun Jan 6 16:34:37 2013 +0200

    Argh, I thought I had compiled this;)
    
    Change-Id: I5619e26e5afbe8e6532204feb60b87f6a7875ee0

diff --git a/sal/osl/unx/nlsupport.c b/sal/osl/unx/nlsupport.c
index b0f231f..60e21b8 100644
--- a/sal/osl/unx/nlsupport.c
+++ b/sal/osl/unx/nlsupport.c
@@ -911,7 +911,7 @@ void _imp_getProcessLocale( rtl_Locale ** ppLocale )
     /* No locale environment variables on Android, so why even bother
      * with getenv().
      */
-   locale = "en-US.UTF-8";
+   char * locale = "en-US.UTF-8";
 #else
     /* simulate behavior off setlocale */
     char * locale = getenv( "LC_ALL" );
@@ -925,8 +925,8 @@ void _imp_getProcessLocale( rtl_Locale ** ppLocale )
     if( NULL == locale )
         locale = "C";
 
-    *ppLocale = _parse_locale( locale );
 #endif
+    *ppLocale = _parse_locale( locale );
 }
 #endif
 


More information about the Libreoffice-commits mailing list