Kaydet (Commit) 8db7c0de authored tarafından Stephan Bergmann's avatar Stephan Bergmann

No need for a complicated arg to SetReady

Change-Id: Iacb900ab7de0f01a78441019d2455abacc974617
üst 34eb5546
...@@ -638,7 +638,7 @@ void OfficeIPCThread::DisableOfficeIPCThread(bool join) ...@@ -638,7 +638,7 @@ void OfficeIPCThread::DisableOfficeIPCThread(bool join)
// release mutex to avoid deadlocks // release mutex to avoid deadlocks
aMutex.clear(); aMutex.clear();
OfficeIPCThread::SetReady(pOfficeIPCThread); pOfficeIPCThread->cReady.set();
// exit gracefully and join // exit gracefully and join
if (join) if (join)
...@@ -664,14 +664,11 @@ OfficeIPCThread::~OfficeIPCThread() ...@@ -664,14 +664,11 @@ OfficeIPCThread::~OfficeIPCThread()
pGlobalOfficeIPCThread.clear(); pGlobalOfficeIPCThread.clear();
} }
void OfficeIPCThread::SetReady( void OfficeIPCThread::SetReady()
rtl::Reference< OfficeIPCThread > const & pThread)
{ {
rtl::Reference< OfficeIPCThread > const & t( if (pGlobalOfficeIPCThread.is())
pThread.is() ? pThread : pGlobalOfficeIPCThread);
if (t.is())
{ {
t->cReady.set(); pGlobalOfficeIPCThread->cReady.set();
} }
} }
......
...@@ -117,9 +117,7 @@ class OfficeIPCThread : public salhelper::Thread ...@@ -117,9 +117,7 @@ class OfficeIPCThread : public salhelper::Thread
static Status EnableOfficeIPCThread(); static Status EnableOfficeIPCThread();
static void DisableOfficeIPCThread(bool join = true); static void DisableOfficeIPCThread(bool join = true);
// start dispatching events... // start dispatching events...
static void SetReady( static void SetReady();
rtl::Reference< OfficeIPCThread > const & pThread =
rtl::Reference< OfficeIPCThread >());
static void WaitForReady(); static void WaitForReady();
static bool IsEnabled(); static bool IsEnabled();
......
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