Kaydet (Commit) c3d25b8b authored tarafından Henry Castro's avatar Henry Castro

lok: in preinit stage, do not force locale

force locale load some fonts before the lokit process
is jail rooted, so it causes invalid rendering special
characters in doc_renderFont function

Reviewed-on: https://gerrit.libreoffice.org/31280Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarHenry Castro <hcastro@collabora.com>

Conflicts:
	desktop/source/lib/init.cxx

Change-Id: I25f00e5bb947753b820c6966a99a6c3849413315
üst 7868b24a
...@@ -2891,8 +2891,6 @@ static int lo_initialize(LibreOfficeKit* pThis, const char* pAppPath, const char ...@@ -2891,8 +2891,6 @@ 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();
} }
// This is horrible crack. I really would want to go back to simply just call // This is horrible crack. I really would want to go back to simply just call
...@@ -2916,6 +2914,8 @@ static int lo_initialize(LibreOfficeKit* pThis, const char* pAppPath, const char ...@@ -2916,6 +2914,8 @@ 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 OfficeIPCThread"); SAL_INFO("lok", "Enabling OfficeIPCThread");
OfficeIPCThread::EnableOfficeIPCThread(); OfficeIPCThread::EnableOfficeIPCThread();
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