diff options
| -rw-r--r-- | cui/source/inc/cuitabline.hxx | 2 | ||||
| -rw-r--r-- | cui/source/tabpages/tpline.cxx | 3 | ||||
| -rw-r--r-- | include/vcl/menubtn.hxx | 6 | ||||
| -rw-r--r-- | svx/source/form/datanavi.cxx | 5 | ||||
| -rw-r--r-- | svx/source/inc/datanavi.hxx | 6 |
5 files changed, 10 insertions, 12 deletions
diff --git a/cui/source/inc/cuitabline.hxx b/cui/source/inc/cuitabline.hxx index c5204b9aa682..e9ff28bbce0e 100644 --- a/cui/source/inc/cuitabline.hxx +++ b/cui/source/inc/cuitabline.hxx @@ -174,7 +174,7 @@ private: // handler for gallery popup menu button + size DECL_LINK_TYPED( GraphicHdl_Impl, MenuButton *, void ); - DECL_LINK( MenuCreateHdl_Impl, MenuButton * ); + DECL_LINK_TYPED( MenuCreateHdl_Impl, MenuButton *, void ); DECL_LINK( SizeHdl_Impl, MetricField * ); DECL_LINK_TYPED( RatioHdl_Impl, Button*, void ); diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx index 1dc40a9d7f95..e270329e1f37 100644 --- a/cui/source/tabpages/tpline.cxx +++ b/cui/source/tabpages/tpline.cxx @@ -1735,10 +1735,9 @@ void SvxLineTabPage::FillUserData() // #58425# Symbols on a list (e.g. StarChart) // Handler for the symbol selection's popup menu (NumMenueButton) // The following link originates from SvxNumOptionsTabPage -IMPL_LINK( SvxLineTabPage, MenuCreateHdl_Impl, MenuButton *, pButton ) +IMPL_LINK_TYPED( SvxLineTabPage, MenuCreateHdl_Impl, MenuButton *, pButton, void ) { InitSymbols(pButton); - return 0; } // #58425# Symbols on a list (e.g. StarChart) diff --git a/include/vcl/menubtn.hxx b/include/vcl/menubtn.hxx index d164ed826aa6..62933f1e45a9 100644 --- a/include/vcl/menubtn.hxx +++ b/include/vcl/menubtn.hxx @@ -41,8 +41,8 @@ private: PopupMenu* mpMenu; sal_uInt16 mnCurItemId; sal_uInt16 mnMenuMode; - Link<> maActivateHdl; - Link<MenuButton *, void> maSelectHdl; + Link<MenuButton*,void> maActivateHdl; + Link<MenuButton*,void> maSelectHdl; SAL_DLLPRIVATE void ImplInitMenuButtonData(); DECL_DLLPRIVATE_LINK_TYPED( ImplMenuTimeoutHdl, Timer*, void ); @@ -75,7 +75,7 @@ public: sal_uInt16 GetCurItemId() const { return mnCurItemId; } OString GetCurItemIdent() const; - void SetActivateHdl( const Link<>& rLink ) { maActivateHdl = rLink; } + void SetActivateHdl( const Link<MenuButton *, void>& rLink ) { maActivateHdl = rLink; } void SetSelectHdl( const Link<MenuButton *, void>& rLink ) { maSelectHdl = rLink; } }; 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(); |