Kaydet (Commit) 4eef543e authored tarafından Michael Meeks's avatar Michael Meeks Kaydeden (comit) Jan Holesovsky

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/71761Reviewed-by: 's avatarJan Holesovsky <kendy@collabora.com>
Tested-by: 's avatarJan Holesovsky <kendy@collabora.com>
üst 283d7235
...@@ -4604,6 +4604,7 @@ static bool initialize_uno(const OUString& aAppProgramURL) ...@@ -4604,6 +4604,7 @@ static bool initialize_uno(const OUString& aAppProgramURL)
return true; return true;
} }
// pre-unipoll version.
static void lo_startmain(void*) static void lo_startmain(void*)
{ {
osl_setThreadName("lo_startmain"); osl_setThreadName("lo_startmain");
...@@ -4618,15 +4619,17 @@ static void lo_startmain(void*) ...@@ -4618,15 +4619,17 @@ static void lo_startmain(void*)
Application::ReleaseSolarMutex(); Application::ReleaseSolarMutex();
} }
// pre-unipoll version.
static void lo_runLoop(LibreOfficeKit* /*pThis*/, static void lo_runLoop(LibreOfficeKit* /*pThis*/,
LibreOfficeKitPollCallback pPollCallback, LibreOfficeKitPollCallback pPollCallback,
LibreOfficeKitWakeCallback pWakeCallback, LibreOfficeKitWakeCallback pWakeCallback,
void* pData) void* pData)
{ {
SolarMutexGuard aGuard; SolarMutexGuard aGuard;
vcl::lok::registerPollCallbacks(pPollCallback, pWakeCallback, pData); vcl::lok::registerPollCallbacks(pPollCallback, pWakeCallback, pData);
lo_startmain(nullptr); Application::UpdateMainThread();
Application::AcquireSolarMutex(1); // startmain releases it. soffice_main();
} }
static bool bInitialized = false; 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