convert Link<> to typed

Change-Id: I3127752785b77672d37f99bc9eaa881377dabe7c
Reviewed-on: https://gerrit.libreoffice.org/18431
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>

5 files changed, 7 insertions, 13 deletions

diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx
index 9473edc1ccb8..4de4ec97ffda 100644
--- a/vcl/source/control/combobox.cxx
+++ b/vcl/source/control/combobox.cxx
@@ -82,7 +82,7 @@ struct ComboBox::Impl
     DECL_DLLPRIVATE_LINK( ImplSelectHdl, void* );
     DECL_DLLPRIVATE_LINK( ImplCancelHdl, void* );
     DECL_DLLPRIVATE_LINK( ImplDoubleClickHdl, void* );
-    DECL_DLLPRIVATE_LINK( ImplPopupModeEndHdl, void* );
+    DECL_DLLPRIVATE_LINK_TYPED( ImplPopupModeEndHdl, FloatingWindow*, void );
     DECL_DLLPRIVATE_LINK( ImplSelectionChangedHdl, void* );
     DECL_DLLPRIVATE_LINK( ImplListItemSelectHdl , void* );
 
@@ -327,7 +327,7 @@ void ComboBox::Impl::ImplClickButtonHandler( ImplBtn* )
         m_pImplLB->GetMainWindow()->ImplClearLayoutData();
 }
 
-IMPL_LINK_NOARG(ComboBox::Impl, ImplPopupModeEndHdl)
+IMPL_LINK_NOARG_TYPED(ComboBox::Impl, ImplPopupModeEndHdl, FloatingWindow*, void)
 {
     if (m_pFloatWin->IsPopupModeCanceled())
     {
@@ -348,7 +348,6 @@ IMPL_LINK_NOARG(ComboBox::Impl, ImplPopupModeEndHdl)
 
     m_pBtn->SetPressed( false );
     m_rThis.CallEventListeners( VCLEVENT_DROPDOWN_CLOSE );
-    return 0;
 }
 
 void ComboBox::Impl::ImplAutocompleteHandler( Edit* pEdit )
diff --git a/vcl/source/control/lstbox.cxx b/vcl/source/control/lstbox.cxx
index b89f7f3a524d..a108a537b578 100644
--- a/vcl/source/control/lstbox.cxx
+++ b/vcl/source/control/lstbox.cxx
@@ -318,7 +318,7 @@ void ListBox::ImplClickButtonHandler( Control* )
     }
 }
 
-IMPL_LINK_NOARG(ListBox, ImplPopupModeEndHdl)
+IMPL_LINK_NOARG_TYPED(ListBox, ImplPopupModeEndHdl, FloatingWindow*, void)
 {
     if( mpFloatWin->IsPopupModeCanceled() )
     {
@@ -333,7 +333,7 @@ IMPL_LINK_NOARG(ListBox, ImplPopupModeEndHdl)
             ImplAddDel( &aCheckDelete );
             Select();
             if ( aCheckDelete.IsDead() )
-                return 0;
+                return;
             ImplRemoveDel( &aCheckDelete );
 
             mpImplLB->SetTravelSelect( bTravelSelect );
@@ -348,7 +348,6 @@ IMPL_LINK_NOARG(ListBox, ImplPopupModeEndHdl)
 
     mpBtn->SetPressed( false );
     CallEventListeners( VCLEVENT_DROPDOWN_CLOSE );
-    return 0;
 }
 
 void ListBox::ToggleDropDown()
diff --git a/vcl/source/window/dockmgr.cxx b/vcl/source/window/dockmgr.cxx
index e8006c48c209..0de1c433e3bd 100644
--- a/vcl/source/window/dockmgr.cxx
+++ b/vcl/source/window/dockmgr.cxx
@@ -1158,7 +1158,7 @@ void ImplDockingWindowWrapper::StartPopupMode( ToolBox *pParentToolBox, FloatWin
     }
 }
 
-IMPL_LINK_NOARG(ImplDockingWindowWrapper, PopupModeEnd)
+IMPL_LINK_NOARG_TYPED(ImplDockingWindowWrapper, PopupModeEnd, FloatingWindow*, void)
 {
     GetWindow()->Show( false, ShowFlags::NoFocusChange );
 
@@ -1185,8 +1185,6 @@ IMPL_LINK_NOARG(ImplDockingWindowWrapper, PopupModeEnd)
 
     // call handler - which will destroy the window and thus the wrapper as well !
     GetWindow()->CallEventListeners( VCLEVENT_WINDOW_ENDPOPUPMODE, &aData );
-
-    return 0;
 }
 
 bool ImplDockingWindowWrapper::IsInPopupMode() const
diff --git a/vcl/source/window/menufloatingwindow.cxx b/vcl/source/window/menufloatingwindow.cxx
index a9fc9b4814e8..33d33e0ad324 100644
--- a/vcl/source/window/menufloatingwindow.cxx
+++ b/vcl/source/window/menufloatingwindow.cxx
@@ -260,7 +260,7 @@ void MenuFloatingWindow::ImplHighlightItem( const MouseEvent& rMEvt, bool bMBDow
     }
 }
 
-IMPL_LINK_NOARG(MenuFloatingWindow, PopupEnd)
+IMPL_LINK_NOARG_TYPED(MenuFloatingWindow, PopupEnd, FloatingWindow*, void)
 {
     // "this" will be deleted before the end of this method!
     Menu* pM = pMenu;
@@ -285,8 +285,6 @@ IMPL_LINK_NOARG(MenuFloatingWindow, PopupEnd)
 
     if ( pM )
         pM->pStartedFrom = 0;
-
-    return 0;
 }
 
 IMPL_LINK_NOARG_TYPED(MenuFloatingWindow, AutoScroll, Timer *, void)
diff --git a/vcl/source/window/menufloatingwindow.hxx b/vcl/source/window/menufloatingwindow.hxx
index 00c797d6942e..60a688bad775 100644
--- a/vcl/source/window/menufloatingwindow.hxx
+++ b/vcl/source/window/menufloatingwindow.hxx
@@ -57,7 +57,7 @@ private:
     bool bIgnoreFirstMove : 1;
     bool bKeyInput : 1;
 
-    DECL_LINK(PopupEnd, void *);
+    DECL_LINK_TYPED(PopupEnd, FloatingWindow*, void);
     DECL_LINK_TYPED( HighlightChanged, Timer*, void );
     DECL_LINK_TYPED(SubmenuClose, Timer *, void);
     DECL_LINK_TYPED(AutoScroll, Timer *, void);