diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2015-09-03 16:59:55 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2015-09-04 06:32:36 +0000 |
| commit | 6741a0f25a0193941135636833e1068ee12fc77f (patch) | |
| tree | 9d75041275c3f276eeb37ebcdff4c84eae1afa95 /svx | |
| parent | 5702e894b89505e3e3ebd76826c477a7d6efecb5 (diff) | |
convert Link<> to typed
Change-Id: I5469c9983ef94b418b729af841f8db10b9116667
Reviewed-on: https://gerrit.libreoffice.org/18316
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/form/datanavi.cxx | 5 | ||||
| -rw-r--r-- | svx/source/inc/datanavi.hxx | 6 |
2 files changed, 5 insertions, 6 deletions
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<MenuButton *, void> aLink1 = LINK( this, DataNavigatorWindow, MenuSelectHdl ); m_pModelBtn->SetSelectHdl( aLink1 ); m_pInstanceBtn->SetSelectHdl( aLink1 ); - Link<> aLink2 = LINK( this, DataNavigatorWindow, MenuActivateHdl ); + Link<MenuButton*,void> 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(); |