desktop/source/lib/init.cxx | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 4eef543e27baacffb23225af1a4d5adcb79cb9a1
Author: Michael Meeks <michael.me...@collabora.com>
AuthorDate: Fri May 3 17:24:13 2019 +0100
Commit: Jan Holesovsky <ke...@collabora.com>
CommitDate: Fri May 3 18:32:48 2019 +0200
unipoll: cleanup runPoll.
Setting a custom thread name is a terrible idea for online unit tests.
Change-Id: I1f5843255ab59072f806587ffcf655958380fe8e
Reviewed-on: https://gerrit.libreoffice.org/71761
Reviewed-by: Jan Holesovsky <ke...@collabora.com>
Tested-by: Jan Holesovsky <ke...@collabora.com>
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 1311a014bdc8..da88ae1b28f8 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -4604,6 +4604,7 @@ static bool initialize_uno(const OUString& aAppProgramURL)
return true;
}
+// pre-unipoll version.
static void lo_startmain(void*)
{
osl_setThreadName("lo_startmain");
@@ -4618,15 +4619,17 @@ static void lo_startmain(void*)
Application::ReleaseSolarMutex();
}
+// pre-unipoll version.
static void lo_runLoop(LibreOfficeKit* /*pThis*/,
LibreOfficeKitPollCallback pPollCallback,
LibreOfficeKitWakeCallback pWakeCallback,
void* pData)
{
SolarMutexGuard aGuard;
+
vcl::lok::registerPollCallbacks(pPollCallback, pWakeCallback, pData);
- lo_startmain(nullptr);
- Application::AcquireSolarMutex(1); // startmain releases it.
+ Application::UpdateMainThread();
+ soffice_main();
}
static bool bInitialized = false;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
