desktop/source/lib/init.cxx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit c3d25b8b74867b5b8419d09f6e362aa6c8eae34f
Author: Henry Castro <hcas...@collabora.com>
Date: Sun Nov 27 19:24:16 2016 -0400
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/31280
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Henry Castro <hcas...@collabora.com>
Conflicts:
desktop/source/lib/init.cxx
Change-Id: I25f00e5bb947753b820c6966a99a6c3849413315
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 2ea1165..8b8391f 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -2891,8 +2891,6 @@ 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
@@ -2916,6 +2914,8 @@ 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");
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
