diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-09-13 09:23:29 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-09-13 12:51:15 +0200 |
| commit | 53548b8d74a34aa30b36b44f6e41f5949da9681d (patch) | |
| tree | 46c49b8a391a72bd2b965e5851c249e33fd70011 /vcl | |
| parent | 0e3911478349349fb59dcc52cb5f5419fbdc7c0e (diff) | |
drop first/last link callback
of course this stuff is exposed through uno through
com::sun::star::awt::XSpinListener so VclEventId::SpinfieldFirst
and VclEventId::SpinfieldLast have to be retained
Change-Id: Icbf31cc8c62f2bc3bc0ccf966c0fd4f5c43dcf6b
Reviewed-on: https://gerrit.libreoffice.org/42231
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/control/slider.cxx | 24 | ||||
| -rw-r--r-- | vcl/source/control/spinfld.cxx | 4 |
2 files changed, 2 insertions, 26 deletions
diff --git a/vcl/source/control/slider.cxx b/vcl/source/control/slider.cxx index 102e10aae82a..61075e8b89e4 100644 --- a/vcl/source/control/slider.cxx +++ b/vcl/source/control/slider.cxx @@ -815,36 +815,12 @@ void Slider::Resize() void Slider::SetLinkedField(VclPtr<NumericField> const & pField) { if (mpLinkedField) - { mpLinkedField->SetModifyHdl(Link<Edit&,void>()); - mpLinkedField->SetUpHdl(Link<SpinField&,void>()); - mpLinkedField->SetDownHdl(Link<SpinField&,void>()); - mpLinkedField->SetFirstHdl(Link<SpinField&,void>()); - mpLinkedField->SetLastHdl(Link<SpinField&,void>()); - mpLinkedField->SetLoseFocusHdl(Link<Control&,void>()); - } mpLinkedField = pField; if (mpLinkedField) - { mpLinkedField->SetModifyHdl(LINK(this, Slider, LinkedFieldModifyHdl)); - mpLinkedField->SetUpHdl(LINK(this, Slider, LinkedFieldSpinnerHdl)); - mpLinkedField->SetDownHdl(LINK(this, Slider, LinkedFieldSpinnerHdl)); - mpLinkedField->SetFirstHdl(LINK(this, Slider, LinkedFieldSpinnerHdl)); - mpLinkedField->SetLastHdl(LINK(this, Slider, LinkedFieldSpinnerHdl)); - mpLinkedField->SetLoseFocusHdl(LINK(this, Slider, LinkedFieldLoseFocusHdl)); - } } -IMPL_LINK_NOARG(Slider, LinkedFieldSpinnerHdl, SpinField&, void) -{ - if (mpLinkedField) - SetThumbPos(mpLinkedField->GetValue()); -} -IMPL_LINK_NOARG(Slider, LinkedFieldLoseFocusHdl, Control&, void) -{ - if (mpLinkedField) - SetThumbPos(mpLinkedField->GetValue()); -} IMPL_LINK_NOARG(Slider, LinkedFieldModifyHdl, Edit&, void) { if (mpLinkedField) diff --git a/vcl/source/control/spinfld.cxx b/vcl/source/control/spinfld.cxx index 0459160a9b03..37f88ea6b252 100644 --- a/vcl/source/control/spinfld.cxx +++ b/vcl/source/control/spinfld.cxx @@ -366,12 +366,12 @@ void SpinField::Down() void SpinField::First() { - ImplCallEventListenersAndHandler( VclEventId::SpinfieldFirst, [this] () { maFirstHdlLink.Call(*this); } ); + ImplCallEventListenersAndHandler(VclEventId::SpinfieldFirst, nullptr); } void SpinField::Last() { - ImplCallEventListenersAndHandler( VclEventId::SpinfieldLast, [this] () { maLastHdlLink.Call(*this); } ); + ImplCallEventListenersAndHandler(VclEventId::SpinfieldLast, nullptr); } void SpinField::MouseButtonDown( const MouseEvent& rMEvt ) |