diff options
| author | Noel Grandin <noel@peralex.com> | 2015-09-08 12:45:38 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-09-09 10:06:12 +0200 |
| commit | 78b124143a3c2bd82984c1c06aa3265c211cef13 (patch) | |
| tree | b48ab1bf75f7b9d548bec8b1c0427d733cc48ecf /basctl | |
| parent | 6f4e11a95bcd7a591cb93d1a842bbc8ad1ed31c9 (diff) | |
convert Link<> to typed
Change-Id: I2f36a123662488ef5534f7bf0845d61e497fb0ec
Diffstat (limited to 'basctl')
| -rw-r--r-- | basctl/source/basicide/baside2.hxx | 2 | ||||
| -rw-r--r-- | basctl/source/basicide/baside2b.cxx | 4 | ||||
| -rw-r--r-- | basctl/source/basicide/bastype3.hxx | 8 | ||||
| -rw-r--r-- | basctl/source/basicide/bastypes.cxx | 5 |
4 files changed, 9 insertions, 10 deletions
diff --git a/basctl/source/basicide/baside2.hxx b/basctl/source/basicide/baside2.hxx index 81351a3aeba3..fbadefdc1905 100644 --- a/basctl/source/basicide/baside2.hxx +++ b/basctl/source/basicide/baside2.hxx @@ -236,7 +236,7 @@ protected: DECL_LINK_TYPED( ButtonHdl, Button *, void ); DECL_LINK_TYPED(TreeListHdl, SvTreeListBox*, void); DECL_LINK_TYPED( implEndDragHdl, HeaderBar *, void ); - DECL_LINK_TYPED( EditAccHdl, Accelerator *, void ); + DECL_LINK_TYPED( EditAccHdl, Accelerator&, void ); public: diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx index 95924e329404..b389792fe1b8 100644 --- a/basctl/source/basicide/baside2b.cxx +++ b/basctl/source/basicide/baside2b.cxx @@ -1827,9 +1827,9 @@ IMPL_LINK_NOARG_TYPED( WatchWindow, implEndDragHdl, HeaderBar *, void ) } } -IMPL_LINK_TYPED( WatchWindow, EditAccHdl, Accelerator *, pAcc, void ) +IMPL_LINK_TYPED( WatchWindow, EditAccHdl, Accelerator&, rAcc, void ) { - switch ( pAcc->GetCurKeyCode().GetCode() ) + switch ( rAcc.GetCurKeyCode().GetCode() ) { case KEY_RETURN: { diff --git a/basctl/source/basicide/bastype3.hxx b/basctl/source/basicide/bastype3.hxx index 5974db7c2788..3106cf767fca 100644 --- a/basctl/source/basicide/bastype3.hxx +++ b/basctl/source/basicide/bastype3.hxx @@ -29,19 +29,19 @@ namespace basctl class ExtendedEdit : public Edit { private: - Accelerator aAcc; - Link<Accelerator*,void> aAccHdl; + Accelerator aAcc; + Link<Accelerator&,void> aAccHdl; Link<ExtendedEdit*,void> aLoseFocusHdl; protected: - DECL_LINK( EditAccHdl, Accelerator * ); + DECL_LINK_TYPED( EditAccHdl, Accelerator&, void ); DECL_LINK(ImplGetFocusHdl, void *); DECL_LINK(ImplLoseFocusHdl, void *); public: ExtendedEdit( vcl::Window* pParent, IDEResId nRes ); - void SetAccHdl( const Link<Accelerator*,void>& rLink ) { aAccHdl = rLink; } + void SetAccHdl( const Link<Accelerator&,void>& rLink ) { aAccHdl = rLink; } Accelerator& GetAccelerator() { return aAcc; } }; diff --git a/basctl/source/basicide/bastypes.cxx b/basctl/source/basicide/bastypes.cxx index 8b88008adc5e..92f921c7e04f 100644 --- a/basctl/source/basicide/bastypes.cxx +++ b/basctl/source/basicide/bastypes.cxx @@ -452,10 +452,9 @@ IMPL_LINK_NOARG(ExtendedEdit, ImplLoseFocusHdl) } -IMPL_LINK( ExtendedEdit, EditAccHdl, Accelerator *, pAcc ) +IMPL_LINK_TYPED( ExtendedEdit, EditAccHdl, Accelerator&, rAcc, void ) { - aAccHdl.Call( pAcc ); - return 0; + aAccHdl.Call( rAcc ); } // TabBar |