Kaydet (Commit) 7889e35d authored tarafından Michael Meeks's avatar Michael Meeks

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/71762Reviewed-by: 's avatarMichael Meeks <michael.meeks@collabora.com>
Tested-by: 's avatarMichael Meeks <michael.meeks@collabora.com>
üst 35608a19
......@@ -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;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment