diff options
| author | Michael Meeks <michael.meeks@collabora.com> | 2019-05-03 17:24:13 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2019-05-04 20:36:34 +0200 |
| commit | 7889e35dedb15d55dfcacb1a388689e16a807834 (patch) | |
| tree | 7ee7a1a7b44715e2406dda9dfeeb6fa26bbbf584 | |
| parent | 35608a192df5529d8a0df4ad2f6bce42fc64a9ab (diff) | |
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/71762
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Tested-by: Michael Meeks <michael.meeks@collabora.com>
| -rw-r--r-- | desktop/source/lib/init.cxx | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx index da2d44f5a8dd..c6fe2d8c2636 100644 --- a/desktop/source/lib/init.cxx +++ b/desktop/source/lib/init.cxx @@ -4490,6 +4490,7 @@ static bool initialize_uno(const OUString& aAppProgramURL) return true; } +// pre-unipoll version. static void lo_startmain(void*) { osl_setThreadName("lo_startmain"); @@ -4504,6 +4505,7 @@ static void lo_startmain(void*) Application::ReleaseSolarMutex(); } +// pre-unipoll version. static void lo_runLoop(LibreOfficeKit* /*pThis*/, LibreOfficeKitPollCallback pPollCallback, LibreOfficeKitWakeCallback pWakeCallback, @@ -4514,9 +4516,10 @@ static void lo_runLoop(LibreOfficeKit* /*pThis*/, #endif 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; |