Use typed Timer::SetTimeoutHdl Link

Change-Id: Iaaf0c93e5b28c0f7dbe4f02eda8beeae30708100

6 files changed, 6 insertions, 11 deletions

diff --git a/chart2/inc/ChartView.hxx b/chart2/inc/ChartView.hxx
index 9f901e7cd176..0da480d54f6b 100644
--- a/chart2/inc/ChartView.hxx
+++ b/chart2/inc/ChartView.hxx
@@ -233,7 +233,7 @@ private: //methods
 
     css::awt::Rectangle impl_createDiagramAndContent( const CreateShapeParam2D& rParam, const css::awt::Size& rPageSize );
 
-    DECL_LINK( UpdateTimeBased, void* );
+    DECL_LINK_TYPED( UpdateTimeBased, Timer*, void );
 
 private: //member
     ::osl::Mutex m_aMutex;
diff --git a/chart2/source/controller/dialogs/TimerTriggeredControllerLock.cxx b/chart2/source/controller/dialogs/TimerTriggeredControllerLock.cxx
index 34aec553d199..565c0e74718c 100644
--- a/chart2/source/controller/dialogs/TimerTriggeredControllerLock.cxx
+++ b/chart2/source/controller/dialogs/TimerTriggeredControllerLock.cxx
@@ -45,10 +45,9 @@ void TimerTriggeredControllerLock::startTimer()
         m_apControllerLockGuard.reset( new  ControllerLockGuardUNO(m_xModel) );
     m_aTimer.Start();
 }
-IMPL_LINK_NOARG(TimerTriggeredControllerLock, TimerTimeout)
+IMPL_LINK_NOARG_TYPED(TimerTriggeredControllerLock, TimerTimeout, Timer *, void)
 {
     m_apControllerLockGuard.reset();
-    return 0;
 }
 
 } //namespace chart
diff --git a/chart2/source/controller/inc/TimerTriggeredControllerLock.hxx b/chart2/source/controller/inc/TimerTriggeredControllerLock.hxx
index 9b724e24f2df..c3250375791d 100644
--- a/chart2/source/controller/inc/TimerTriggeredControllerLock.hxx
+++ b/chart2/source/controller/inc/TimerTriggeredControllerLock.hxx
@@ -43,7 +43,7 @@ private:
     boost::scoped_ptr< ControllerLockGuardUNO > m_apControllerLockGuard;
     AutoTimer       m_aTimer;
 
-    DECL_LINK( TimerTimeout, void* );
+    DECL_LINK_TYPED( TimerTimeout, Timer*, void );
 };
 
 } //namespace chart
diff --git a/chart2/source/controller/main/ChartController.hxx b/chart2/source/controller/main/ChartController.hxx
index f5c73bff7459..9462df665397 100644
--- a/chart2/source/controller/main/ChartController.hxx
+++ b/chart2/source/controller/main/ChartController.hxx
@@ -625,7 +625,7 @@ private:
     void impl_ShapeControllerDispatch( const ::com::sun::star::util::URL& rURL,
         const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rArgs );
 
-    DECL_LINK( DoubleClickWaitingHdl, void* );
+    DECL_LINK_TYPED( DoubleClickWaitingHdl, Timer*, void );
     void execute_DoubleClick( const Point* pMousePixel = NULL );
     void startDoubleClickWaiting();
     void stopDoubleClickWaiting();
diff --git a/chart2/source/controller/main/ChartController_Window.cxx b/chart2/source/controller/main/ChartController_Window.cxx
index 685560558603..9d0f94a71839 100644
--- a/chart2/source/controller/main/ChartController_Window.cxx
+++ b/chart2/source/controller/main/ChartController_Window.cxx
@@ -533,7 +533,7 @@ void ChartController::stopDoubleClickWaiting()
     m_bWaitingForDoubleClick = false;
 }
 
-IMPL_LINK_NOARG(ChartController, DoubleClickWaitingHdl)
+IMPL_LINK_NOARG_TYPED(ChartController, DoubleClickWaitingHdl, Timer *, void)
 {
     m_bWaitingForDoubleClick = false;
 
@@ -553,8 +553,6 @@ IMPL_LINK_NOARG(ChartController, DoubleClickWaitingHdl)
             impl_SetMousePointer( aMouseEvent );
         }
     }
-
-    return 0;
 }
 
 void ChartController::execute_MouseButtonDown( const MouseEvent& rMEvt )
diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx
index 1ef10303457e..c85da489eaa5 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -3151,12 +3151,10 @@ void ChartView::setViewDirty()
     m_bViewDirty = true;
 }
 
-IMPL_LINK_NOARG(ChartView, UpdateTimeBased)
+IMPL_LINK_NOARG_TYPED(ChartView, UpdateTimeBased, Timer *, void)
 {
     setViewDirty();
     update();
-
-    return 0;
 }
 
 void ChartView::createShapes2D( const awt::Size& rPageSize )