diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2015-09-23 13:30:21 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2015-09-23 13:10:00 +0000 |
| commit | c24ce843619416f1e6c082a6e8e512310e6e0040 (patch) | |
| tree | 2edbc3f05abbaf45cd19d3d55984d27cd7537787 /sc/source | |
| parent | df9dbfc1b187c6acdf864f8a169e5782aac61285 (diff) | |
convert Link<> to typed
Change-Id: I245ba9e550c7b833fe184a24b63b55027aeecac9
Reviewed-on: https://gerrit.libreoffice.org/18809
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'sc/source')
| -rw-r--r-- | sc/source/ui/inc/scuitphfedit.hxx | 2 | ||||
| -rw-r--r-- | sc/source/ui/inc/tphfedit.hxx | 4 | ||||
| -rw-r--r-- | sc/source/ui/pagedlg/scuitphfedit.cxx | 4 | ||||
| -rw-r--r-- | sc/source/ui/pagedlg/tphfedit.cxx | 2 |
4 files changed, 5 insertions, 7 deletions
diff --git a/sc/source/ui/inc/scuitphfedit.hxx b/sc/source/ui/inc/scuitphfedit.hxx index 127767f531f3..d0767fc88acf 100644 --- a/sc/source/ui/inc/scuitphfedit.hxx +++ b/sc/source/ui/inc/scuitphfedit.hxx @@ -85,7 +85,7 @@ private: sal_uInt16 nWhich; OUString aCmdArr[6]; - DECL_LINK( ObjectSelectHdl, ScEditWindow* ); + DECL_LINK_TYPED( ObjectSelectHdl, ScEditWindow&, void ); private: void FillCmdArr(); diff --git a/sc/source/ui/inc/tphfedit.hxx b/sc/source/ui/inc/tphfedit.hxx index aedb2e8c3b44..60cab0275647 100644 --- a/sc/source/ui/inc/tphfedit.hxx +++ b/sc/source/ui/inc/tphfedit.hxx @@ -71,7 +71,7 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible() SAL_OVERRIDE; ScHeaderEditEngine* GetEditEngine() const { return pEdEngine; } - void SetObjectSelectHdl( const Link<>& aLink) { aObjectSelectLink = aLink; } + void SetObjectSelectHdl( const Link<ScEditWindow&,void>& aLink) { aObjectSelectLink = aLink; } void SetLocation(ScEditWindowLocation eLoc) { eLocation = eLoc; } protected: @@ -94,7 +94,7 @@ private: com::sun::star::uno::WeakReference< ::com::sun::star::accessibility::XAccessible > xAcc; ScAccessibleEditObject* pAcc; - Link<> aObjectSelectLink; + Link<ScEditWindow&,void> aObjectSelectLink; }; class SC_DLLPUBLIC ScExtIButton : public ImageButton diff --git a/sc/source/ui/pagedlg/scuitphfedit.cxx b/sc/source/ui/pagedlg/scuitphfedit.cxx index b043dc4ba9cd..b4df75a6a126 100644 --- a/sc/source/ui/pagedlg/scuitphfedit.cxx +++ b/sc/source/ui/pagedlg/scuitphfedit.cxx @@ -149,11 +149,9 @@ ScHFEditPage::ScHFEditPage( vcl::Window* pParent, } -IMPL_LINK( ScHFEditPage, ObjectSelectHdl, ScEditWindow*, pEdit ) +IMPL_LINK_NOARG_TYPED( ScHFEditPage, ObjectSelectHdl, ScEditWindow&, void ) { - (void)pEdit; m_pBtnText->GrabFocus(); - return 0; } ScHFEditPage::~ScHFEditPage() diff --git a/sc/source/ui/pagedlg/tphfedit.cxx b/sc/source/ui/pagedlg/tphfedit.cxx index 968886e1f1d7..0452e9c470dd 100644 --- a/sc/source/ui/pagedlg/tphfedit.cxx +++ b/sc/source/ui/pagedlg/tphfedit.cxx @@ -272,7 +272,7 @@ void ScEditWindow::KeyInput( const KeyEvent& rKEvt ) rKEvt.GetKeyCode().IsMod2() && rKEvt.GetKeyCode().GetCode() == KEY_DOWN ) { if (aObjectSelectLink.IsSet() ) - aObjectSelectLink.Call(this); + aObjectSelectLink.Call(*this); } } |