desktop/source/lib/init.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
New commits: commit af18b7d60f4320fc01b84593af404dbfb4237fcf 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 Change-Id: I25f00e5bb947753b820c6966a99a6c3849413315 Reviewed-on: https://gerrit.libreoffice.org/31280 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Henry Castro <hcas...@collabora.com> diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx index 362ee61..0d403e3 100644 --- a/desktop/source/lib/init.cxx +++ b/desktop/source/lib/init.cxx @@ -2903,8 +2903,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(); } // We could use InitVCL() here -- and used to before using soffice_main, @@ -2927,6 +2925,8 @@ 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"); _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits