Use typed Timer::SetTimeoutHdl Link

Change-Id: Iaaf0c93e5b28c0f7dbe4f02eda8beeae30708100

7 files changed, 14 insertions, 22 deletions

diff --git a/framework/inc/services/layoutmanager.hxx b/framework/inc/services/layoutmanager.hxx
index ae1f3008d965..078120e520a2 100644
--- a/framework/inc/services/layoutmanager.hxx
+++ b/framework/inc/services/layoutmanager.hxx
@@ -182,7 +182,7 @@ namespace framework
                     const css::uno::Reference< css::uno::XComponentContext > &rComponentContext );
 
         protected:
-            DECL_LINK(AsyncLayoutHdl, void *);
+            DECL_LINK_TYPED(AsyncLayoutHdl, Timer *, void);
 
         private:
 
diff --git a/framework/inc/uielement/menubarmanager.hxx b/framework/inc/uielement/menubarmanager.hxx
index f985b3601688..62861506b9fb 100644
--- a/framework/inc/uielement/menubarmanager.hxx
+++ b/framework/inc/uielement/menubarmanager.hxx
@@ -154,7 +154,7 @@ class MenuBarManager : public com::sun::star::frame::XStatusListener
         DECL_LINK(Highlight, void *);
         DECL_LINK( Activate, Menu * );
         DECL_LINK( Deactivate, Menu * );
-        DECL_LINK( AsyncSettingsHdl, Timer * );
+        DECL_LINK_TYPED( AsyncSettingsHdl, Timer *, void );
 
         void RemoveListener();
         void RequestImages();
diff --git a/framework/inc/uielement/toolbarmanager.hxx b/framework/inc/uielement/toolbarmanager.hxx
index 95381c3120a4..11163fcb3d79 100644
--- a/framework/inc/uielement/toolbarmanager.hxx
+++ b/framework/inc/uielement/toolbarmanager.hxx
@@ -141,7 +141,7 @@ class ToolBarManager : public ToolbarManager_Base
         DECL_LINK( MenuButton, ToolBox * );
         DECL_LINK( MenuSelect, Menu * );
         DECL_LINK( MenuDeactivate, Menu * );
-        DECL_LINK(AsyncUpdateControllersHdl, void *);
+        DECL_LINK_TYPED(AsyncUpdateControllersHdl, Timer *, void);
         DECL_STATIC_LINK( ToolBarManager, ExecuteHdl_Impl, ExecuteInfo* );
 
         virtual bool MenuItemAllowed( sal_uInt16 ) const;
diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx
index 753ca212fd28..7bcbccd1d70b 100644
--- a/framework/source/layoutmanager/layoutmanager.cxx
+++ b/framework/source/layoutmanager/layoutmanager.cxx
@@ -2677,7 +2677,7 @@ throw( uno::RuntimeException, std::exception )
         m_bMustDoLayout = true;
         if ( !m_aAsyncLayoutTimer.IsActive() )
         {
-            const Link<>& aLink = m_aAsyncLayoutTimer.GetTimeoutHdl();
+            const Link<Timer *, void>& aLink = m_aAsyncLayoutTimer.GetTimeoutHdl();
             if ( aLink.IsSet() )
                 aLink.Call( &m_aAsyncLayoutTimer );
         }
@@ -2749,13 +2749,13 @@ void SAL_CALL LayoutManager::windowHidden( const lang::EventObject& aEvent ) thr
     }
 }
 
-IMPL_LINK_NOARG(LayoutManager, AsyncLayoutHdl)
+IMPL_LINK_NOARG_TYPED(LayoutManager, AsyncLayoutHdl, Timer *, void)
 {
     SolarMutexClearableGuard aReadLock;
     m_aAsyncLayoutTimer.Stop();
 
     if( !m_xContainerWindow.is() )
-        return 0;
+        return;
 
     awt::Rectangle aDockingArea( m_aDockingArea );
     ::Size         aStatusBarSize( implts_getStatusBarSize() );
@@ -2766,8 +2766,6 @@ IMPL_LINK_NOARG(LayoutManager, AsyncLayoutHdl)
 
     implts_setDockingAreaWindowSizes( aDockingArea );
     implts_doLayout( true, false );
-
-    return 0;
 }
 
 //      XFrameActionListener
diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx
index 93679018cc37..8b75271afbac 100644
--- a/framework/source/services/autorecovery.cxx
+++ b/framework/source/services/autorecovery.cxx
@@ -634,7 +634,7 @@ private:
 
     /** @short  callback of our internal timer.
      */
-    DECL_LINK(implts_timerExpired, void*);
+    DECL_LINK_TYPED(implts_timerExpired, Timer*, void);
 
     /** @short  makes our dispatch() method asynchronous!
      */
@@ -2326,7 +2326,7 @@ void AutoRecovery::implts_stopTimer()
     m_aTimer.Stop();
 }
 
-IMPL_LINK_NOARG(AutoRecovery, implts_timerExpired)
+IMPL_LINK_NOARG_TYPED(AutoRecovery, implts_timerExpired, Timer *, void)
 {
     try
     {
@@ -2346,7 +2346,7 @@ IMPL_LINK_NOARG(AutoRecovery, implts_timerExpired)
         /* SAFE */ {
         osl::MutexGuard g(cppu::WeakComponentImplHelperBase::rBHelper.rMutex);
         if ((m_eJob & AutoRecovery::E_DISABLE_AUTORECOVERY) == AutoRecovery::E_DISABLE_AUTORECOVERY)
-           return 0;
+           return;
         } /* SAFE */
 
         // check some "states", where its not allowed (better: not a good idea) to
@@ -2360,7 +2360,7 @@ IMPL_LINK_NOARG(AutoRecovery, implts_timerExpired)
             m_eTimerType = AutoRecovery::E_POLL_TILL_AUTOSAVE_IS_ALLOWED;
             } /* SAFE */
             implts_updateTimer();
-            return 0;
+            return;
         }
 
         // analyze timer type.
@@ -2375,7 +2375,7 @@ IMPL_LINK_NOARG(AutoRecovery, implts_timerExpired)
             if (!bUserIdle)
             {
                 implts_updateTimer();
-                return 0;
+                return;
             }
         }
 
@@ -2418,8 +2418,6 @@ IMPL_LINK_NOARG(AutoRecovery, implts_timerExpired)
     catch(const css::uno::Exception&)
     {
     }
-
-    return 0;
 }
 
 IMPL_LINK_NOARG(AutoRecovery, implts_asyncDispatch)
diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx
index c9eee85bad5e..b06fa6a10751 100644
--- a/framework/source/uielement/menubarmanager.cxx
+++ b/framework/source/uielement/menubarmanager.cxx
@@ -939,7 +939,7 @@ IMPL_LINK( MenuBarManager, Deactivate, Menu *, pMenu )
     return 1;
 }
 
-IMPL_LINK( MenuBarManager, AsyncSettingsHdl, Timer*,)
+IMPL_LINK_NOARG_TYPED( MenuBarManager, AsyncSettingsHdl, Timer*, void)
 {
     SolarMutexGuard g;
     Reference< XInterface > xSelfHold(
@@ -951,8 +951,6 @@ IMPL_LINK( MenuBarManager, AsyncSettingsHdl, Timer*,)
         SetItemContainer( m_xDeferedItemContainer );
         m_xDeferedItemContainer.clear();
     }
-
-    return 0;
 }
 
 IMPL_LINK( MenuBarManager, Select, Menu *, pMenu )
diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx
index 326d55ea8c3e..5a57484d259f 100644
--- a/framework/source/uielement/toolbarmanager.cxx
+++ b/framework/source/uielement/toolbarmanager.cxx
@@ -2100,7 +2100,7 @@ IMPL_LINK_NOARG(ToolBarManager, MiscOptionsChanged)
     return 0;
 }
 
-IMPL_LINK_NOARG(ToolBarManager, AsyncUpdateControllersHdl)
+IMPL_LINK_NOARG_TYPED(ToolBarManager, AsyncUpdateControllersHdl, Timer *, void)
 {
     // The guard must be in its own context as the we can get destroyed when our
     // own xInterface reference get destroyed!
@@ -2109,13 +2109,11 @@ IMPL_LINK_NOARG(ToolBarManager, AsyncUpdateControllersHdl)
     SolarMutexGuard g;
 
     if ( m_bDisposed )
-        return 1;
+        return;
 
     // Request to update our controllers
     m_aAsyncUpdateControllersTimer.Stop();
     UpdateControllers();
-
-    return 0;
 }
 
 IMPL_STATIC_LINK_NOINSTANCE( ToolBarManager, ExecuteHdl_Impl, ExecuteInfo*, pExecuteInfo )