diff options
| author | Noel Grandin <noel@peralex.com> | 2015-09-21 08:55:52 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-09-22 20:21:55 +0200 |
| commit | 6d8124e30c6ce38219ca323f9674f242c822c360 (patch) | |
| tree | 2a05e63023a1ff5cb327ca844d2830c66bf9fbdb /framework/source/services | |
| parent | 3526da14b7c49adff202f32c15948fed8b9915ea (diff) | |
convert Link<> to typed
and remove unused UserEvent class
Change-Id: Ic61c5eef75c36393dbbaa92d93163eab89021ee3
Diffstat (limited to 'framework/source/services')
| -rw-r--r-- | framework/source/services/autorecovery.cxx | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx index 531c443d8ba1..39110f70d5f9 100644 --- a/framework/source/services/autorecovery.cxx +++ b/framework/source/services/autorecovery.cxx @@ -638,7 +638,7 @@ private: /** @short makes our dispatch() method asynchronous! */ - DECL_LINK(implts_asyncDispatch, void*); + DECL_LINK_TYPED(implts_asyncDispatch, LinkParamNone*, void); /** @short implements the dispatch real. */ void implts_dispatch(const DispatchParams& aParams); @@ -1389,7 +1389,7 @@ void SAL_CALL AutoRecovery::dispatch(const css::util::URL& } /* SAFE */ if (bAsync) - m_aAsyncDispatcher.Post(0); + m_aAsyncDispatcher.Post(); else implts_dispatch(aParams); } @@ -2420,14 +2420,14 @@ IMPL_LINK_NOARG_TYPED(AutoRecovery, implts_timerExpired, Timer *, void) } } -IMPL_LINK_NOARG(AutoRecovery, implts_asyncDispatch) +IMPL_LINK_NOARG_TYPED(AutoRecovery, implts_asyncDispatch, LinkParamNone*, void) { DispatchParams aParams; /* SAFE */ { - osl::MutexGuard g(cppu::WeakComponentImplHelperBase::rBHelper.rMutex); - aParams = m_aDispatchParams; - css::uno::Reference< css::uno::XInterface > xHoldRefForMethodAlive = aParams.m_xHoldRefForAsyncOpAlive; - m_aDispatchParams.forget(); // clears all members ... including the ref-hold object .-) + osl::MutexGuard g(cppu::WeakComponentImplHelperBase::rBHelper.rMutex); + aParams = m_aDispatchParams; + css::uno::Reference< css::uno::XInterface > xHoldRefForMethodAlive = aParams.m_xHoldRefForAsyncOpAlive; + m_aDispatchParams.forget(); // clears all members ... including the ref-hold object .-) } /* SAFE */ try @@ -2437,7 +2437,6 @@ IMPL_LINK_NOARG(AutoRecovery, implts_asyncDispatch) catch (...) { } - return 0; } void AutoRecovery::implts_registerDocument(const css::uno::Reference< css::frame::XModel >& xDocument) |