diff options
author | Michael Meeks <michael.meeks@collabora.com> | 2019-05-03 17:24:13 +0100 |
---|---|---|
committer | Jan Holesovsky <kendy@collabora.com> | 2019-05-03 18:32:48 +0200 |
commit | 4eef543e27baacffb23225af1a4d5adcb79cb9a1 (patch) | |
tree | 682dc94d4a8b169f9345a1c93ec9c8df83f06d0f /desktop | |
parent | 283d7235c8e38d391f450cd725c1e74a35b5a29d (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/71761
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
Tested-by: Jan Holesovsky <kendy@collabora.com>
Diffstat (limited to 'desktop')
-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 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; |