[Libreoffice-commits] core.git: sal/osl

Tor Lillqvist tml at collabora.com
Wed Nov 19 04:15:45 PST 2014


 sal/osl/unx/nlsupport.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 76cdf2ffeafa6a516c15e5d50c20848205665872
Author: Tor Lillqvist <tml at collabora.com>
Date:   Wed Nov 19 14:13:18 2014 +0200

    ISO C++11 does not allow conversion from string literal to 'char *'
    
    Change-Id: I098d0b8b3428cbf57a69c331515093df36e0c172

diff --git a/sal/osl/unx/nlsupport.cxx b/sal/osl/unx/nlsupport.cxx
index 03107ef..a7e7640 100644
--- a/sal/osl/unx/nlsupport.cxx
+++ b/sal/osl/unx/nlsupport.cxx
@@ -873,7 +873,7 @@ void _imp_getProcessLocale( rtl_Locale ** ppLocale )
             locale = getenv( "LANG" );
 
         if( NULL == locale )
-            locale = "C";
+            locale = strdup("C");
     }
 
     /* return the locale */


More information about the Libreoffice-commits mailing list