diff options
| author | Tor Lillqvist <tml@collabora.com> | 2016-12-01 14:18:19 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2016-12-05 09:47:25 +0200 |
| commit | 96918103a07ae984befceb4dc579b004216bbc9f (patch) | |
| tree | 2ad19af1c21ad5f6c4b6f9f64c898eeed19a9c56 /desktop/source/lib | |
| parent | a8b986572c288860f2076a50cdeadb1ee4aecd6d (diff) | |
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@collabora.com>
Tested-by: Jan Holesovsky <kendy@collabora.com>
Diffstat (limited to 'desktop/source/lib')
| -rw-r--r-- | desktop/source/lib/init.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx index 073be47e681f..ea947b8cd5b8 100644 --- a/desktop/source/lib/init.cxx +++ b/desktop/source/lib/init.cxx @@ -2939,6 +2939,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(); } // 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 if (eStage != PRE_INIT) { - force_c_locale(); - SAL_INFO("lok", "Enabling RequestHandler"); RequestHandler::Enable(false); SAL_INFO("lok", "Starting soffice_main"); |