convert Link<> to typed

and remove unused UserEvent class

Change-Id: Ic61c5eef75c36393dbbaa92d93163eab89021ee3

3 files changed, 11 insertions, 14 deletions

diff --git a/framework/inc/dispatch/closedispatcher.hxx b/framework/inc/dispatch/closedispatcher.hxx
index 0617bc003927..edce4d7dac15 100644
--- a/framework/inc/dispatch/closedispatcher.hxx
+++ b/framework/inc/dispatch/closedispatcher.hxx
@@ -165,7 +165,7 @@ class CloseDispatcher : public  ::cppu::WeakImplHelper<
                     asynchronous. Otherwise our callis kill its own environment
                     during they call us ...
         */
-        DECL_LINK( impl_asyncCallback, void* );
+        DECL_LINK_TYPED( impl_asyncCallback, LinkParamNone*, void );
 
         /** @short  prepare m_xCloseFrame so it should be closeable without problems.
 
diff --git a/framework/source/dispatch/closedispatcher.cxx b/framework/source/dispatch/closedispatcher.cxx
index a59e201d5118..9e7b29f5af19 100644
--- a/framework/source/dispatch/closedispatcher.cxx
+++ b/framework/source/dispatch/closedispatcher.cxx
@@ -221,7 +221,7 @@ void SAL_CALL CloseDispatcher::dispatchWithNotification(const css::util::URL&
     else
     {
         SolarMutexGuard g;
-        m_aAsyncCallback->Post(0);
+        m_aAsyncCallback->Post();
     }
 }
 
@@ -241,7 +241,7 @@ void SAL_CALL CloseDispatcher::dispatchWithNotification(const css::util::URL&
                 - decide then, if we must close this frame only, establish the backing mode
                   or shutdown the whole application.
 */
-IMPL_LINK_NOARG(CloseDispatcher, impl_asyncCallback)
+IMPL_LINK_NOARG_TYPED(CloseDispatcher, impl_asyncCallback, LinkParamNone*, void)
 {
     try
     {
@@ -273,7 +273,7 @@ IMPL_LINK_NOARG(CloseDispatcher, impl_asyncCallback)
     // frame already dead ?!
     // Nothing to do !
     if (! xCloseFrame.is())
-        return 0;
+        return;
 
     bool bCloseFrame           = false;
     bool bEstablishBackingMode = false;
@@ -418,8 +418,6 @@ IMPL_LINK_NOARG(CloseDispatcher, impl_asyncCallback)
     catch(const css::lang::DisposedException&)
     {
     }
-
-    return 0;
 }
 
 bool CloseDispatcher::implts_prepareFrameForClosing(const css::uno::Reference< css::frame::XFrame >& xFrame                ,
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)