Kaydet (Commit) 96918103 authored tarafından Tor Lillqvist's avatar Tor Lillqvist

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 c3d25b8b.

Change-Id: I2cd8c50a783918c380505e7a3aaf37d578e76031
Reviewed-on: https://gerrit.libreoffice.org/31489Reviewed-by: 's avatarJan Holesovsky <kendy@collabora.com>
Tested-by: 's avatarJan Holesovsky <kendy@collabora.com>
üst a8b98657
...@@ -2939,6 +2939,8 @@ static int lo_initialize(LibreOfficeKit* pThis, const char* pAppPath, const char ...@@ -2939,6 +2939,8 @@ static int lo_initialize(LibreOfficeKit* pThis, const char* pAppPath, const char
// Release Solar Mutex, lo_startmain thread should acquire it. // Release Solar Mutex, lo_startmain thread should acquire it.
Application::ReleaseSolarMutex(); Application::ReleaseSolarMutex();
} }
force_c_locale();
} }
// We could use InitVCL() here -- and used to before using soffice_main, // We could use InitVCL() here -- and used to before using soffice_main,
...@@ -2961,8 +2963,6 @@ static int lo_initialize(LibreOfficeKit* pThis, const char* pAppPath, const char ...@@ -2961,8 +2963,6 @@ static int lo_initialize(LibreOfficeKit* pThis, const char* pAppPath, const char
if (eStage != PRE_INIT) if (eStage != PRE_INIT)
{ {
force_c_locale();
SAL_INFO("lok", "Enabling RequestHandler"); SAL_INFO("lok", "Enabling RequestHandler");
RequestHandler::Enable(false); RequestHandler::Enable(false);
SAL_INFO("lok", "Starting soffice_main"); SAL_INFO("lok", "Starting soffice_main");
......
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