diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2016-03-11 16:08:05 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2016-03-11 16:41:59 +0100 |
| commit | 8db7c0de57d3c5129236fc6cfc37e93cfb75e49f (patch) | |
| tree | 5d12896813e6f98c19361422bf6ba9a1c87d9715 | |
| parent | 34eb5546a1f8824c275337644d6db1c344e596fc (diff) | |
No need for a complicated arg to SetReady
Change-Id: Iacb900ab7de0f01a78441019d2455abacc974617
| -rw-r--r-- | desktop/source/app/officeipcthread.cxx | 11 | ||||
| -rw-r--r-- | desktop/source/app/officeipcthread.hxx | 4 |
2 files changed, 5 insertions, 10 deletions
diff --git a/desktop/source/app/officeipcthread.cxx b/desktop/source/app/officeipcthread.cxx index 6c94f62d5356..5662823fa59c 100644 --- a/desktop/source/app/officeipcthread.cxx +++ b/desktop/source/app/officeipcthread.cxx @@ -638,7 +638,7 @@ void OfficeIPCThread::DisableOfficeIPCThread(bool join) // release mutex to avoid deadlocks aMutex.clear(); - OfficeIPCThread::SetReady(pOfficeIPCThread); + pOfficeIPCThread->cReady.set(); // exit gracefully and join if (join) @@ -664,14 +664,11 @@ OfficeIPCThread::~OfficeIPCThread() pGlobalOfficeIPCThread.clear(); } -void OfficeIPCThread::SetReady( - rtl::Reference< OfficeIPCThread > const & pThread) +void OfficeIPCThread::SetReady() { - rtl::Reference< OfficeIPCThread > const & t( - pThread.is() ? pThread : pGlobalOfficeIPCThread); - if (t.is()) + if (pGlobalOfficeIPCThread.is()) { - t->cReady.set(); + pGlobalOfficeIPCThread->cReady.set(); } } diff --git a/desktop/source/app/officeipcthread.hxx b/desktop/source/app/officeipcthread.hxx index 1319d39c4af6..919ec44d8938 100644 --- a/desktop/source/app/officeipcthread.hxx +++ b/desktop/source/app/officeipcthread.hxx @@ -117,9 +117,7 @@ class OfficeIPCThread : public salhelper::Thread static Status EnableOfficeIPCThread(); static void DisableOfficeIPCThread(bool join = true); // start dispatching events... - static void SetReady( - rtl::Reference< OfficeIPCThread > const & pThread = - rtl::Reference< OfficeIPCThread >()); + static void SetReady(); static void WaitForReady(); static bool IsEnabled(); |