diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-04-30 16:58:33 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-04-30 16:59:09 +0200 |
| commit | 4d28399ccdeeb43655aba89f14c58b26d379c780 (patch) | |
| tree | cf520fb6e895566417b54ba26e90675a063681c4 /svx | |
| parent | b705075634d54a57e5edfeae1791869186bf149a (diff) | |
Use typed Link for MenuButton::SetSelectHdl
(and MenuButton::GetSelectHdl was unused)
Change-Id: I94df06bcda9e041fde65553e30247874b20ff74b
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/form/datanavi.cxx | 15 | ||||
| -rw-r--r-- | svx/source/inc/datanavi.hxx | 2 |
2 files changed, 8 insertions, 9 deletions
diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx index a92cca0876da..9799222dc063 100644 --- a/svx/source/form/datanavi.cxx +++ b/svx/source/form/datanavi.cxx @@ -1375,12 +1375,12 @@ namespace svxform // handler m_pModelsBox->SetSelectHdl( LINK( this, DataNavigatorWindow, ModelSelectHdl ) ); - Link<> aLink = LINK( this, DataNavigatorWindow, MenuSelectHdl ); - m_pModelBtn->SetSelectHdl( aLink ); - m_pInstanceBtn->SetSelectHdl( aLink ); - aLink = LINK( this, DataNavigatorWindow, MenuActivateHdl ); - m_pModelBtn->SetActivateHdl( aLink ); - m_pInstanceBtn->SetActivateHdl( aLink ); + Link<MenuButton *, void> aLink1 = LINK( this, DataNavigatorWindow, MenuSelectHdl ); + m_pModelBtn->SetSelectHdl( aLink1 ); + m_pInstanceBtn->SetSelectHdl( aLink1 ); + Link<> aLink2 = LINK( this, DataNavigatorWindow, MenuActivateHdl ); + m_pModelBtn->SetActivateHdl( aLink2 ); + m_pInstanceBtn->SetActivateHdl( aLink2 ); m_pTabCtrl->SetActivatePageHdl( LINK( this, DataNavigatorWindow, ActivatePageHdl ) ); m_aUpdateTimer.SetTimeout( 2000 ); m_aUpdateTimer.SetTimeoutHdl( LINK( this, DataNavigatorWindow, UpdateHdl ) ); @@ -1470,7 +1470,7 @@ namespace svxform return 0; } - IMPL_LINK( DataNavigatorWindow, MenuSelectHdl, MenuButton *, pBtn ) + IMPL_LINK_TYPED( DataNavigatorWindow, MenuSelectHdl, MenuButton *, pBtn, void ) { bool bIsDocModified = false; Reference< css::xforms::XFormsUIHelper1 > xUIHelper; @@ -1770,7 +1770,6 @@ namespace svxform if ( bIsDocModified ) SetDocModified(); - return 0; } bool DataNavigatorWindow::IsAdditionalPage(sal_uInt16 nId) const diff --git a/svx/source/inc/datanavi.hxx b/svx/source/inc/datanavi.hxx index 00b2efb57ea9..2232b6ad50c5 100644 --- a/svx/source/inc/datanavi.hxx +++ b/svx/source/inc/datanavi.hxx @@ -351,7 +351,7 @@ namespace svxform XFrameModel_ref m_xFrameModel; DECL_LINK( ModelSelectHdl, ListBox * ); - DECL_LINK( MenuSelectHdl, MenuButton * ); + DECL_LINK_TYPED( MenuSelectHdl, MenuButton *, void ); DECL_LINK( MenuActivateHdl, MenuButton * ); DECL_LINK(ActivatePageHdl, void *); DECL_LINK(UpdateHdl, void *); |