[Libreoffice-commits] core.git: desktop/source
jan Iversen
jani at libreoffice.org
Wed Oct 25 16:47:42 UTC 2017
desktop/source/lib/init.cxx | 6 ++++++
1 file changed, 6 insertions(+)
New commits:
commit 37eeb4767b7bad61436e645007780a040720476b
Author: jan Iversen <jani at libreoffice.org>
Date: Wed Oct 25 15:10:59 2017 +0200
iOS, soffice not needed for iOS
Removed the IPC part of init for iOS.
Lo_init() completes for iOS without errors.
Change-Id: I7ce38758883bebea1de6ac149ba8768593c7cb78
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 10a8ff1f51e6..bd09ed1dd987 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -3280,6 +3280,7 @@ static bool initialize_uno(const OUString& aAppProgramURL)
return true;
}
+#ifndef IOS
static void lo_startmain(void*)
{
osl_setThreadName("lo_startmain");
@@ -3291,6 +3292,7 @@ static void lo_startmain(void*)
Application::ReleaseSolarMutex();
}
+#endif
static bool bInitialized = false;
@@ -3482,12 +3484,16 @@ static int lo_initialize(LibreOfficeKit* pThis, const char* pAppPath, const char
if (eStage != PRE_INIT)
{
SAL_INFO("lok", "Enabling RequestHandler");
+#ifdef IOS
+ RequestHandler::Enable(true);
+#else
RequestHandler::Enable(false);
SAL_INFO("lok", "Starting soffice_main");
RequestHandler::SetReady(false);
pLib->maThread = osl_createThread(lo_startmain, nullptr);
SAL_INFO("lok", "Waiting for RequestHandler");
RequestHandler::WaitForReady();
+#endif
SAL_INFO("lok", "RequestHandler ready -- continuing");
}
More information about the Libreoffice-commits
mailing list