[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.1' - desktop/source

[Tor Lillqvist]

 desktop/source/lib/init.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 8acf12bc65db272c1ea55e6ccf08ece7ce71f5fb
Author: Tor Lillqvist <tml at collabora.com>
Date:   Thu Dec 1 14:18:19 2016 +0200

    Revert "lok: in preinit stage, do not force locale"
    
    Fixes unit-prefork in online for me.
    
    Kendy suggested to also change the forced locale to en-US.UTF-8
    instead of just en-US, but that caused:
    warn:i18nlangtag:32416:1:i18nlangtag/source/languagetag/languagetag.cxx:1369:
    LanguageTagImpl::convertLocaleToLang: with bAllowOnTheFlyID invalid
    'en-US.UTF-8'.
    
    This reverts commit c3d25b8b74867b5b8419d09f6e362aa6c8eae34f.
    
    Change-Id: I2cd8c50a783918c380505e7a3aaf37d578e76031
    Reviewed-on: https://gerrit.libreoffice.org/31489
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    Tested-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index cce6117..61a85ae 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -2895,6 +2895,8 @@ static int lo_initialize(LibreOfficeKit* pThis, const char* pAppPath, const char
                 // Release Solar Mutex, lo_startmain thread should acquire it.
                 Application::ReleaseSolarMutex();
             }
+
+            force_c_locale();
         }
 
         // This is horrible crack. I really would want to go back to simply just call
@@ -2918,8 +2920,6 @@ static int lo_initialize(LibreOfficeKit* pThis, const char* pAppPath, const char
 
         if (eStage != PRE_INIT)
         {
-            force_c_locale();
-
             SAL_INFO("lok", "Enabling OfficeIPCThread");
             OfficeIPCThread::EnableOfficeIPCThread();
             SAL_INFO("lok", "Starting soffice_main");