From 6741a0f25a0193941135636833e1068ee12fc77f Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Thu, 3 Sep 2015 16:59:55 +0200 Subject: convert Link<> to typed Change-Id: I5469c9983ef94b418b729af841f8db10b9116667 Reviewed-on: https://gerrit.libreoffice.org/18316 Reviewed-by: Noel Grandin Tested-by: Noel Grandin --- svx/source/form/datanavi.cxx | 5 ++--- svx/source/inc/datanavi.hxx | 6 +++--- 2 files changed, 5 insertions(+), 6 deletions(-) (limited to 'svx') diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx index 875e9282c35e..1879f0d13c52 100644 --- a/svx/source/form/datanavi.cxx +++ b/svx/source/form/datanavi.cxx @@ -1375,7 +1375,7 @@ namespace svxform Link aLink1 = LINK( this, DataNavigatorWindow, MenuSelectHdl ); m_pModelBtn->SetSelectHdl( aLink1 ); m_pInstanceBtn->SetSelectHdl( aLink1 ); - Link<> aLink2 = LINK( this, DataNavigatorWindow, MenuActivateHdl ); + Link aLink2 = LINK( this, DataNavigatorWindow, MenuActivateHdl ); m_pModelBtn->SetActivateHdl( aLink2 ); m_pInstanceBtn->SetActivateHdl( aLink2 ); m_pTabCtrl->SetActivatePageHdl( LINK( this, DataNavigatorWindow, ActivatePageHdl ) ); @@ -1774,7 +1774,7 @@ namespace svxform return m_pTabCtrl->GetPagePos(nId) >= 3; } - IMPL_LINK( DataNavigatorWindow, MenuActivateHdl, MenuButton *, pBtn ) + IMPL_LINK_TYPED( DataNavigatorWindow, MenuActivateHdl, MenuButton *, pBtn, void ) { Menu* pMenu = pBtn->GetPopupMenu(); @@ -1796,7 +1796,6 @@ namespace svxform { SAL_WARN( "svx.form", "DataNavigatorWindow::MenuActivateHdl(): wrong button" ); } - return 0; } IMPL_LINK_NOARG_TYPED(DataNavigatorWindow, ActivatePageHdl, TabControl*, void) diff --git a/svx/source/inc/datanavi.hxx b/svx/source/inc/datanavi.hxx index a6e82f9d7413..e37521bba127 100644 --- a/svx/source/inc/datanavi.hxx +++ b/svx/source/inc/datanavi.hxx @@ -349,9 +349,9 @@ namespace svxform DECL_LINK( ModelSelectHdl, ListBox * ); DECL_LINK_TYPED( MenuSelectHdl, MenuButton *, void ); - DECL_LINK( MenuActivateHdl, MenuButton * ); - DECL_LINK_TYPED(ActivatePageHdl, TabControl*, void); - DECL_LINK_TYPED(UpdateHdl, Timer *, void); + DECL_LINK_TYPED( MenuActivateHdl, MenuButton *, void ); + DECL_LINK_TYPED( ActivatePageHdl, TabControl*, void); + DECL_LINK_TYPED( UpdateHdl, Timer *, void); XFormsPage* GetCurrentPage( sal_uInt16& rCurId ); void LoadModels(); -- cgit