convert Link<> to typed, and introduce LinkParamNone

as a marker type for unused Link#Call(T) param

Change-Id: Ife9149052a52b27fefd4f810309a5004a0f1771b

3 files changed, 18 insertions, 35 deletions

diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx
index 5009cdde3df9..1851ce1c1f7f 100644
--- a/vcl/source/control/combobox.cxx
+++ b/vcl/source/control/combobox.cxx
@@ -79,12 +79,12 @@ struct ComboBox::Impl
     ComboBoxBounds calcComboBoxDropDownComponentBounds(
         const Size &rOutSize, const Size &rBorderOutSize) const;
 
-    DECL_DLLPRIVATE_LINK( ImplSelectHdl, void* );
-    DECL_DLLPRIVATE_LINK( ImplCancelHdl, void* );
-    DECL_DLLPRIVATE_LINK( ImplDoubleClickHdl, void* );
+    DECL_DLLPRIVATE_LINK_TYPED( ImplSelectHdl, LinkParamNone*, void );
+    DECL_DLLPRIVATE_LINK_TYPED( ImplCancelHdl, LinkParamNone*, void );
+    DECL_DLLPRIVATE_LINK_TYPED( ImplDoubleClickHdl, ImplListBoxWindow*, void );
     DECL_DLLPRIVATE_LINK_TYPED( ImplPopupModeEndHdl, FloatingWindow*, void );
     DECL_DLLPRIVATE_LINK_TYPED( ImplSelectionChangedHdl, sal_Int32, void );
-    DECL_DLLPRIVATE_LINK( ImplListItemSelectHdl , void* );
+    DECL_DLLPRIVATE_LINK_TYPED( ImplListItemSelectHdl , LinkParamNone*, void );
 
     void ImplClickButtonHandler( ImplBtn* );
     void ImplUserDrawHandler( UserDrawEvent* );
@@ -410,7 +410,7 @@ void ComboBox::Impl::ImplAutocompleteHandler( Edit* pEdit )
     }
 }
 
-IMPL_LINK_NOARG(ComboBox::Impl, ImplSelectHdl)
+IMPL_LINK_NOARG_TYPED(ComboBox::Impl, ImplSelectHdl, LinkParamNone*, void)
 {
     bool bPopup = m_rThis.IsInDropDown();
     bool bCallSelect = false;
@@ -496,22 +496,17 @@ IMPL_LINK_NOARG(ComboBox::Impl, ImplSelectHdl)
         m_isSyntheticModify = false;
         m_rThis.Select();
     }
-
-    return 0;
 }
 
-IMPL_LINK_NOARG( ComboBox::Impl, ImplListItemSelectHdl )
+IMPL_LINK_NOARG_TYPED( ComboBox::Impl, ImplListItemSelectHdl, LinkParamNone*, void )
 {
     m_rThis.CallEventListeners( VCLEVENT_DROPDOWN_SELECT );
-    return 1;
 }
 
-IMPL_LINK_NOARG(ComboBox::Impl, ImplCancelHdl)
+IMPL_LINK_NOARG_TYPED(ComboBox::Impl, ImplCancelHdl, LinkParamNone*, void)
 {
     if (m_rThis.IsInDropDown())
         m_pFloatWin->EndPopupMode();
-
-    return 1;
 }
 
 IMPL_LINK_TYPED( ComboBox::Impl, ImplSelectionChangedHdl, sal_Int32, nChanged, void )
@@ -523,10 +518,9 @@ IMPL_LINK_TYPED( ComboBox::Impl, ImplSelectionChangedHdl, sal_Int32, nChanged, v
     }
 }
 
-IMPL_LINK_NOARG(ComboBox::Impl, ImplDoubleClickHdl)
+IMPL_LINK_NOARG_TYPED(ComboBox::Impl, ImplDoubleClickHdl, ImplListBoxWindow*, void)
 {
     m_rThis.DoubleClick();
-    return 0;
 }
 
 void ComboBox::ToggleDropDown()
diff --git a/vcl/source/control/ilstbox.cxx b/vcl/source/control/ilstbox.cxx
index cdb82fee4114..35248d9c062e 100644
--- a/vcl/source/control/ilstbox.cxx
+++ b/vcl/source/control/ilstbox.cxx
@@ -1165,7 +1165,7 @@ bool ImplListBoxWindow::SelectEntries( sal_Int32 nSelect, LB_EVENT_TYPE eLET, bo
                 ImplShowFocusRect();
             if (bSelectPosChange)
             {
-                maFocusHdl.Call(reinterpret_cast<void*>(nSelect));
+                maFocusHdl.Call(nSelect);
             }
         }
         ImplClearLayoutData();
@@ -2255,13 +2255,12 @@ void ImplListBox::Resize()
     ImplCheckScrollBars();
 }
 
-IMPL_LINK_NOARG(ImplListBox, MRUChanged)
+IMPL_LINK_NOARG_TYPED(ImplListBox, MRUChanged, LinkParamNone*, void)
 {
     CompatStateChanged( StateChangedType::Data );
-    return 1;
 }
 
-IMPL_LINK_NOARG(ImplListBox, LBWindowScrolled)
+IMPL_LINK_NOARG_TYPED(ImplListBox, LBWindowScrolled, ImplListBoxWindow*, void)
 {
     long nSet = GetTopEntry();
     if( nSet > mpVScrollBar->GetRangeMax() )
@@ -2271,8 +2270,6 @@ IMPL_LINK_NOARG(ImplListBox, LBWindowScrolled)
     mpHScrollBar->SetThumbPos( GetLeftIndent() );
 
     maScrollHdl.Call( this );
-
-    return 1;
 }
 
 IMPL_LINK_TYPED( ImplListBox, ScrollBarHdl, ScrollBar*, pSB, void )
diff --git a/vcl/source/control/lstbox.cxx b/vcl/source/control/lstbox.cxx
index 3516bbb3cc4f..c6ab23b444d3 100644
--- a/vcl/source/control/lstbox.cxx
+++ b/vcl/source/control/lstbox.cxx
@@ -210,7 +210,7 @@ void ListBox::ImplLoadRes( const ResId& rResId )
         SelectEntryPos( nSelPos );
 }
 
-IMPL_LINK_NOARG(ListBox, ImplSelectHdl)
+IMPL_LINK_NOARG_TYPED(ListBox, ImplSelectHdl, LinkParamNone*, void)
 {
     bool bPopup = IsInDropDown();
     if( IsDropDownBox() )
@@ -233,34 +233,27 @@ IMPL_LINK_NOARG(ListBox, ImplSelectHdl)
 
     if ( ( !IsTravelSelect() || mpImplLB->IsSelectionChanged() ) || ( bPopup && !IsMultiSelectionEnabled() ) )
         Select();
-
-    return 1;
 }
 
-IMPL_LINK( ListBox, ImplFocusHdl, void *, nPos )
+IMPL_LINK_TYPED( ListBox, ImplFocusHdl, sal_Int32, nPos, void )
 {
-    CallEventListeners( VCLEVENT_LISTBOX_FOCUS , nPos);
-    return 1;
+    CallEventListeners( VCLEVENT_LISTBOX_FOCUS, reinterpret_cast<void*>(nPos) );
 }
 
-IMPL_LINK_NOARG( ListBox, ImplListItemSelectHdl )
+IMPL_LINK_NOARG_TYPED( ListBox, ImplListItemSelectHdl, LinkParamNone*, void )
 {
     CallEventListeners( VCLEVENT_DROPDOWN_SELECT );
-    return 1;
 }
 
-IMPL_LINK_NOARG(ListBox, ImplScrollHdl)
+IMPL_LINK_NOARG_TYPED(ListBox, ImplScrollHdl, ImplListBox*, void)
 {
     CallEventListeners( VCLEVENT_LISTBOX_SCROLLED );
-    return 1;
 }
 
-IMPL_LINK_NOARG(ListBox, ImplCancelHdl)
+IMPL_LINK_NOARG_TYPED(ListBox, ImplCancelHdl, LinkParamNone*, void)
 {
     if( IsInDropDown() )
         mpFloatWin->EndPopupMode();
-
-    return 1;
 }
 
 IMPL_LINK_TYPED( ListBox, ImplSelectionChangedHdl, sal_Int32, nChanged, void )
@@ -292,10 +285,9 @@ IMPL_LINK_TYPED( ListBox, ImplSelectionChangedHdl, sal_Int32, nChanged, void )
     }
 }
 
-IMPL_LINK_NOARG(ListBox, ImplDoubleClickHdl)
+IMPL_LINK_NOARG_TYPED(ListBox, ImplDoubleClickHdl, ImplListBoxWindow*, void)
 {
     DoubleClick();
-    return 1;
 }
 
 void ListBox::ImplClickButtonHandler( Control* )