sw/source/uibase/cctrl/actctrl.cxx | 2 +- sw/source/uibase/inc/actctrl.hxx | 4 ++-- sw/source/uibase/inc/navipi.hxx | 2 +- sw/source/uibase/utlui/navipi.cxx | 7 +++---- 4 files changed, 7 insertions(+), 8 deletions(-)
New commits: commit 28329d7cacdf8c37a9c1863530615e1b9cfa6935 Author: Noel Grandin <noelgran...@gmail.com> Date: Tue Sep 22 21:53:44 2015 +0200 convert Link<> to typed Change-Id: I9a7f38b2babf6c599f0c2709b32ecb8083fd32cc Reviewed-on: https://gerrit.libreoffice.org/18799 Reviewed-by: Noel Grandin <noelgran...@gmail.com> Tested-by: Noel Grandin <noelgran...@gmail.com> diff --git a/sw/source/uibase/cctrl/actctrl.cxx b/sw/source/uibase/cctrl/actctrl.cxx index a0f1bd7..af79651 100644 --- a/sw/source/uibase/cctrl/actctrl.cxx +++ b/sw/source/uibase/cctrl/actctrl.cxx @@ -23,7 +23,7 @@ void NumEditAction::Action() { - aActionLink.Call( this ); + aActionLink.Call( *this ); } bool NumEditAction::Notify( NotifyEvent& rNEvt ) diff --git a/sw/source/uibase/inc/actctrl.hxx b/sw/source/uibase/inc/actctrl.hxx index 5412103..dee1cc8 100644 --- a/sw/source/uibase/inc/actctrl.hxx +++ b/sw/source/uibase/inc/actctrl.hxx @@ -25,7 +25,7 @@ // numerical input class SW_DLLPUBLIC NumEditAction: public NumericField { - Link<> aActionLink; + Link<NumEditAction&,void> aActionLink; protected: void Action(); @@ -34,7 +34,7 @@ public: NumEditAction( vcl::Window* pParent, const ResId& rResId ) : NumericField(pParent, rResId) {} - void SetActionHdl( const Link<>& rLink ) { aActionLink = rLink;} + void SetActionHdl( const Link<NumEditAction&,void>& rLink ) { aActionLink = rLink;} }; // call a link when KEY_RETURN is pressed diff --git a/sw/source/uibase/inc/navipi.hxx b/sw/source/uibase/inc/navipi.hxx index cb5dae7..59b6d4c8 100644 --- a/sw/source/uibase/inc/navipi.hxx +++ b/sw/source/uibase/inc/navipi.hxx @@ -105,7 +105,7 @@ class SwNavigationPI : public vcl::Window, DECL_LINK_TYPED( ToolBoxSelectHdl, ToolBox *, void ); DECL_LINK_TYPED( ToolBoxClickHdl, ToolBox *, void ); DECL_LINK_TYPED( ToolBoxDropdownClickHdl, ToolBox*, void ); - DECL_LINK( EditAction, NumEditAction * ); + DECL_LINK_TYPED( EditAction, NumEditAction&, void ); DECL_LINK( EditGetFocus, NumEditAction * ); DECL_LINK_TYPED( DoneLink, SfxPoolItem *, void ); DECL_LINK_TYPED( MenuSelectHdl, Menu *, bool ); diff --git a/sw/source/uibase/utlui/navipi.cxx b/sw/source/uibase/utlui/navipi.cxx index d20b7e9..8386674 100644 --- a/sw/source/uibase/utlui/navipi.cxx +++ b/sw/source/uibase/utlui/navipi.cxx @@ -454,18 +454,17 @@ void SwNavHelpToolBox::RequestHelp( const HelpEvent& rHEvt ) // Action-Handler Edit: // Switches to the page if the structure view is not turned on. -IMPL_LINK( SwNavigationPI, EditAction, NumEditAction *, pEdit ) +IMPL_LINK_TYPED( SwNavigationPI, EditAction, NumEditAction&, rEdit, void ) { SwView *pView = GetCreateView(); if (pView) { if(aPageChgIdle.IsActive()) aPageChgIdle.Stop(); - pCreateView->GetWrtShell().GotoPage((sal_uInt16)pEdit->GetValue(), true); + pCreateView->GetWrtShell().GotoPage((sal_uInt16)rEdit.GetValue(), true); pCreateView->GetEditWin().GrabFocus(); pCreateView->GetViewFrame()->GetBindings().Invalidate(FN_STAT_PAGE); } - return 0; } // If the page can be set here, the maximum is set. @@ -1250,7 +1249,7 @@ IMPL_LINK_NOARG_TYPED(SwNavigationPI, ChangePageHdl, Idle *, void) { if (!IsDisposed()) { - EditAction(&GetPageEdit()); + EditAction(GetPageEdit()); GetPageEdit().GrabFocus(); } } _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits