Use typed Timer::SetTimeoutHdl Link

Change-Id: Iaaf0c93e5b28c0f7dbe4f02eda8beeae30708100

14 files changed, 24 insertions, 37 deletions

diff --git a/dbaccess/source/ui/browser/brwctrlr.cxx b/dbaccess/source/ui/browser/brwctrlr.cxx
index d39dd447553b..189117d2a90a 100644
--- a/dbaccess/source/ui/browser/brwctrlr.cxx
+++ b/dbaccess/source/ui/browser/brwctrlr.cxx
@@ -2281,10 +2281,11 @@ void SbaXDataBrowserController::CellDeactivated()
 IMPL_LINK_NOARG(SbaXDataBrowserController, OnClipboardChanged)
 {
     SolarMutexGuard aGuard;
-    return OnInvalidateClipboard( NULL );
+    OnInvalidateClipboard( NULL );
+    return 0;
 }
 
-IMPL_LINK(SbaXDataBrowserController, OnInvalidateClipboard, AutoTimer*, _pTimer)
+IMPL_LINK_TYPED(SbaXDataBrowserController, OnInvalidateClipboard, Timer*, _pTimer, void)
 {
     InvalidateFeature(ID_BROWSER_CUT);
     InvalidateFeature(ID_BROWSER_COPY);
@@ -2296,8 +2297,6 @@ IMPL_LINK(SbaXDataBrowserController, OnInvalidateClipboard, AutoTimer*, _pTimer)
     // changes. This would be much better than this cycle-eating polling mechanism here ....
     if ( _pTimer != &m_aInvalidateClipboard )
         InvalidateFeature(ID_BROWSER_PASTE);
-
-    return 0L;
 }
 
 Reference< XPropertySet >  SbaXDataBrowserController::getBoundField(sal_uInt16 nViewPos) const
diff --git a/dbaccess/source/ui/control/dbtreelistbox.cxx b/dbaccess/source/ui/control/dbtreelistbox.cxx
index afd7b1b60fb0..6ecacbc76a19 100644
--- a/dbaccess/source/ui/control/dbtreelistbox.cxx
+++ b/dbaccess/source/ui/control/dbtreelistbox.cxx
@@ -659,12 +659,11 @@ void DBTreeListBox::ExcecuteContextMenuAction( sal_uInt16 _nSelectedPopupEntry )
         m_pContextMenuProvider->getCommandController().executeChecked( _nSelectedPopupEntry, Sequence< PropertyValue >() );
 }
 
-IMPL_LINK(DBTreeListBox, OnTimeOut, void*, /*EMPTY_ARG*/)
+IMPL_LINK_NOARG_TYPED(DBTreeListBox, OnTimeOut, Timer*, void)
 {
     implStopSelectionTimer();
 
     m_aSelChangeHdl.Call( NULL );
-    return 0L;
 }
 
 void DBTreeListBox::StateChanged( StateChangedType nStateChange )
diff --git a/dbaccess/source/ui/control/sqledit.cxx b/dbaccess/source/ui/control/sqledit.cxx
index 9048294db7c3..77036352e97d 100644
--- a/dbaccess/source/ui/control/sqledit.cxx
+++ b/dbaccess/source/ui/control/sqledit.cxx
@@ -149,7 +149,7 @@ void OSqlEdit::GetFocus()
     MultiLineEditSyntaxHighlight::GetFocus();
 }
 
-IMPL_LINK_NOARG(OSqlEdit, OnUndoActionTimer)
+IMPL_LINK_NOARG_TYPED(OSqlEdit, OnUndoActionTimer, Timer *, void)
 {
     OUString aText = GetText();
     if(aText != m_strOrigText)
@@ -166,18 +166,15 @@ IMPL_LINK_NOARG(OSqlEdit, OnUndoActionTimer)
 
         m_strOrigText  =aText;
     }
-
-    return 0L;
 }
 
-IMPL_LINK_NOARG(OSqlEdit, OnInvalidateTimer)
+IMPL_LINK_NOARG_TYPED(OSqlEdit, OnInvalidateTimer, Timer *, void)
 {
     OJoinController& rController = m_pView->getContainerWindow()->getDesignView()->getController();
     rController.InvalidateFeature(SID_CUT);
     rController.InvalidateFeature(SID_COPY);
     if(!m_bStopTimer)
         m_timerInvalidate.Start();
-    return 0L;
 }
 
 IMPL_LINK(OSqlEdit, ModifyHdl, void*, /*EMPTYTAG*/)
diff --git a/dbaccess/source/ui/dlg/paramdialog.cxx b/dbaccess/source/ui/dlg/paramdialog.cxx
index 30f898773fd7..3b34eabc3406 100644
--- a/dbaccess/source/ui/dlg/paramdialog.cxx
+++ b/dbaccess/source/ui/dlg/paramdialog.cxx
@@ -319,7 +319,7 @@ namespace dbaui
         return 0L;
     }
 
-    IMPL_LINK(OParameterDialog, OnVisitedTimeout, Timer*, /*pTimer*/)
+    IMPL_LINK_NOARG_TYPED(OParameterDialog, OnVisitedTimeout, Timer*, void)
     {
         OSL_ENSURE(m_nCurrentlySelected != LISTBOX_ENTRY_NOTFOUND, "OParameterDialog::OnVisitedTimeout : invalid call !");
 
@@ -363,8 +363,6 @@ namespace dbaui
                 m_pParam->SetSelection(aSel);
             }
         }
-
-        return 0L;
     }
 
     IMPL_LINK(OParameterDialog, OnValueModified, Control*, /*pBox*/)
diff --git a/dbaccess/source/ui/inc/TableWindowListBox.hxx b/dbaccess/source/ui/inc/TableWindowListBox.hxx
index dfd8f4b39e21..c6199d3c087f 100644
--- a/dbaccess/source/ui/inc/TableWindowListBox.hxx
+++ b/dbaccess/source/ui/inc/TableWindowListBox.hxx
@@ -48,8 +48,8 @@ namespace dbaui
             ,public IDragTransferableListener
     {
         DECL_LINK( OnDoubleClick, SvTreeListBox* );
-        DECL_LINK( ScrollUpHdl, SvTreeListBox* );
-        DECL_LINK( ScrollDownHdl, SvTreeListBox* );
+        DECL_LINK_TYPED( ScrollUpHdl, Timer*, void );
+        DECL_LINK_TYPED( ScrollDownHdl, Timer*, void );
         DECL_LINK( DropHdl, void* );
         DECL_LINK( LookForUiHdl, void* );
 
diff --git a/dbaccess/source/ui/inc/brwctrlr.hxx b/dbaccess/source/ui/inc/brwctrlr.hxx
index 5cbc9361e5ed..1f30a833c0f6 100644
--- a/dbaccess/source/ui/inc/brwctrlr.hxx
+++ b/dbaccess/source/ui/inc/brwctrlr.hxx
@@ -330,7 +330,7 @@ namespace dbaui
         void        impl_checkForCannotSelectUnfiltered( const ::dbtools::SQLExceptionInfo& _rError );
 
         // time to check the CUT/COPY/PASTE-slot-states
-        DECL_LINK( OnInvalidateClipboard, AutoTimer* );
+        DECL_LINK_TYPED( OnInvalidateClipboard, Timer*, void );
         DECL_LINK( OnClipboardChanged, void* );
 
         // search callbacks
diff --git a/dbaccess/source/ui/inc/dbtreelistbox.hxx b/dbaccess/source/ui/inc/dbtreelistbox.hxx
index 4dfd3c84a713..a47af3e632d9 100644
--- a/dbaccess/source/ui/inc/dbtreelistbox.hxx
+++ b/dbaccess/source/ui/inc/dbtreelistbox.hxx
@@ -74,7 +74,7 @@ namespace dbaui
 
     private:
         void init();
-        DECL_LINK( OnTimeOut, void* );
+        DECL_LINK_TYPED( OnTimeOut, Timer*, void );
         DECL_LINK( OnResetEntry, SvTreeListEntry* );
         DECL_LINK( ScrollUpHdl, SvTreeListBox* );
         DECL_LINK( ScrollDownHdl, SvTreeListBox* );
diff --git a/dbaccess/source/ui/inc/paramdialog.hxx b/dbaccess/source/ui/inc/paramdialog.hxx
index 11db9808841f..7a52aa15d9a7 100644
--- a/dbaccess/source/ui/inc/paramdialog.hxx
+++ b/dbaccess/source/ui/inc/paramdialog.hxx
@@ -95,7 +95,7 @@ namespace dbaui
         ::connectivity::OSQLParseNode* implPredicateTree(OUString& _rErrorMessage, const OUString& _rStatement, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & _rxField);
 
     private:
-        DECL_LINK(OnVisitedTimeout, Timer*);
+        DECL_LINK_TYPED(OnVisitedTimeout, Timer*, void);
         DECL_LINK(OnValueModified, Control*);
         DECL_LINK(OnEntrySelected, ListBox*);
         DECL_LINK(OnButtonClicked, PushButton*);
diff --git a/dbaccess/source/ui/inc/sqledit.hxx b/dbaccess/source/ui/inc/sqledit.hxx
index 81695cc21f72..2e8a8a2be294 100644
--- a/dbaccess/source/ui/inc/sqledit.hxx
+++ b/dbaccess/source/ui/inc/sqledit.hxx
@@ -53,8 +53,8 @@ namespace dbaui
         com::sun::star::uno::Reference<
             com::sun::star::beans::XMultiPropertySet > m_notifier;
 
-        DECL_LINK(OnUndoActionTimer, void*);
-        DECL_LINK(OnInvalidateTimer, void*);
+        DECL_LINK_TYPED(OnUndoActionTimer, Timer*, void);
+        DECL_LINK_TYPED(OnInvalidateTimer, Timer*, void);
 
     private:
         void            ImplSetFont();
diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
index 05d3d05219db..65ffa8fec570 100644
--- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
+++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
@@ -2487,14 +2487,13 @@ void OSelectionBrowseBox::appendUndoAction(const OUString& _rOldValue,const OUSt
     }
 }
 
-IMPL_LINK_NOARG(OSelectionBrowseBox, OnInvalidateTimer)
+IMPL_LINK_NOARG_TYPED(OSelectionBrowseBox, OnInvalidateTimer, Timer *, void)
 {
     static_cast<OQueryController&>(getDesignView()->getController()).InvalidateFeature(SID_CUT);
     static_cast<OQueryController&>(getDesignView()->getController()).InvalidateFeature(SID_COPY);
     static_cast<OQueryController&>(getDesignView()->getController()).InvalidateFeature(SID_PASTE);
     if(!m_bStopTimer)
         m_timerInvalidate.Start();
-    return 0L;
 }
 
 void OSelectionBrowseBox::stopTimer()
diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx
index 45dbfcbe4fd8..4a1276767862 100644
--- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx
+++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx
@@ -77,7 +77,7 @@ namespace dbaui
         bool                            m_bDisableErrorBox;
         bool                            m_bInUndoMode;
 
-        DECL_LINK(OnInvalidateTimer, void*);
+        DECL_LINK_TYPED(OnInvalidateTimer, Timer*, void);
     public:                         OSelectionBrowseBox( vcl::Window* pParent );
                                     virtual ~OSelectionBrowseBox();
         virtual void                dispose() SAL_OVERRIDE;
diff --git a/dbaccess/source/ui/querydesign/TableWindowListBox.cxx b/dbaccess/source/ui/querydesign/TableWindowListBox.cxx
index 2453bd292f67..545e7712d361 100644
--- a/dbaccess/source/ui/querydesign/TableWindowListBox.cxx
+++ b/dbaccess/source/ui/querydesign/TableWindowListBox.cxx
@@ -167,11 +167,11 @@ bool OTableWindowListBox::PreNotify(NotifyEvent& rNEvt)
     return true;
 }
 
-IMPL_LINK( OTableWindowListBox, ScrollUpHdl, SvTreeListBox*, /*pBox*/ )
+IMPL_LINK_NOARG_TYPED( OTableWindowListBox, ScrollUpHdl, Timer*, void )
 {
     SvTreeListEntry* pEntry = GetEntry( m_aMousePos );
     if( !pEntry )
-        return 0;
+        return;
 
     if( pEntry != Last() )
     {
@@ -179,15 +179,13 @@ IMPL_LINK( OTableWindowListBox, ScrollUpHdl, SvTreeListBox*, /*pBox*/ )
         pEntry = GetEntry( m_aMousePos );
         Select( pEntry, true );
     }
-
-    return 0;
 }
 
-IMPL_LINK( OTableWindowListBox, ScrollDownHdl, SvTreeListBox*, /*pBox*/ )
+IMPL_LINK_NOARG_TYPED( OTableWindowListBox, ScrollDownHdl, Timer*, void )
 {
     SvTreeListEntry* pEntry = GetEntry( m_aMousePos );
     if( !pEntry )
-        return 0;
+        return;
 
     if( pEntry != Last() )
     {
@@ -195,8 +193,6 @@ IMPL_LINK( OTableWindowListBox, ScrollDownHdl, SvTreeListBox*, /*pBox*/ )
         pEntry = GetEntry( m_aMousePos );
         Select( pEntry, true );
     }
-
-    return 0;
 }
 
 void OTableWindowListBox::StartDrag( sal_Int8 /*nAction*/, const Point& /*rPosPixel*/ )
@@ -247,7 +243,7 @@ sal_Int8 OTableWindowListBox::AcceptDrop( const AcceptDropEvent& _rEvt )
                 if( !m_aScrollTimer.IsActive() )
                 {
                     m_aScrollTimer.SetTimeoutHdl( LINK(this, OTableWindowListBox, ScrollUpHdl) );
-                    ScrollUpHdl( this );
+                    ScrollUpHdl( nullptr );
                 }
             }
 
@@ -257,7 +253,7 @@ sal_Int8 OTableWindowListBox::AcceptDrop( const AcceptDropEvent& _rEvt )
                 if( !m_aScrollTimer.IsActive() )
                 {
                     m_aScrollTimer.SetTimeoutHdl( LINK(this, OTableWindowListBox, ScrollDownHdl) );
-                    ScrollDownHdl( this );
+                    ScrollDownHdl( nullptr );
                 }
             }
             else
diff --git a/dbaccess/source/ui/tabledesign/TEditControl.cxx b/dbaccess/source/ui/tabledesign/TEditControl.cxx
index d8321b173b39..c47fc25d70a1 100644
--- a/dbaccess/source/ui/tabledesign/TEditControl.cxx
+++ b/dbaccess/source/ui/tabledesign/TEditControl.cxx
@@ -88,12 +88,11 @@ OTableEditorCtrl::ClipboardInvalidator::~ClipboardInvalidator()
 
 }
 
-IMPL_LINK_NOARG(OTableEditorCtrl::ClipboardInvalidator, OnInvalidate)
+IMPL_LINK_NOARG_TYPED(OTableEditorCtrl::ClipboardInvalidator, OnInvalidate, Timer *, void)
 {
     m_pOwner->GetView()->getController().InvalidateFeature(SID_CUT);
     m_pOwner->GetView()->getController().InvalidateFeature(SID_COPY);
     m_pOwner->GetView()->getController().InvalidateFeature(SID_PASTE);
-    return 0L;
 }
 
 void OTableEditorCtrl::Init()
diff --git a/dbaccess/source/ui/tabledesign/TEditControl.hxx b/dbaccess/source/ui/tabledesign/TEditControl.hxx
index a91c88396737..bbd4d18e0184 100644
--- a/dbaccess/source/ui/tabledesign/TEditControl.hxx
+++ b/dbaccess/source/ui/tabledesign/TEditControl.hxx
@@ -78,7 +78,7 @@ namespace dbaui
             ~ClipboardInvalidator();
 
         protected:
-            DECL_LINK(OnInvalidate, void*);
+            DECL_LINK_TYPED(OnInvalidate, Timer*, void);
         };
 
         friend class OTableEditorCtrl::ClipboardInvalidator;