diff options
| author | Noel Grandin <noel@peralex.com> | 2015-10-13 13:17:30 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-10-15 09:58:34 +0200 |
| commit | 99b21cc9f3f32284061be255f437b2954a7aada0 (patch) | |
| tree | f26509e7b905d147bc14fcda9fd30e2861ed00e3 /extensions | |
| parent | c837bfda8c646fe2f7ff789032dd9a6ee6fd396f (diff) | |
convert Link<> to typed
Change-Id: I6c55c74d47b13149c2fa210bb9de4e8c430c57cc
Diffstat (limited to 'extensions')
| -rw-r--r-- | extensions/source/dbpilots/listcombowizard.cxx | 8 | ||||
| -rw-r--r-- | extensions/source/dbpilots/listcombowizard.hxx | 1 | ||||
| -rw-r--r-- | extensions/source/propctrlr/standardcontrol.cxx | 3 | ||||
| -rw-r--r-- | extensions/source/propctrlr/standardcontrol.hxx | 2 |
4 files changed, 9 insertions, 5 deletions
diff --git a/extensions/source/dbpilots/listcombowizard.cxx b/extensions/source/dbpilots/listcombowizard.cxx index cca2309137da..2d888a2dba5f 100644 --- a/extensions/source/dbpilots/listcombowizard.cxx +++ b/extensions/source/dbpilots/listcombowizard.cxx @@ -433,8 +433,8 @@ namespace dbp m_pValueListField->SetModifyHdl(LINK(this, OLinkFieldsPage, OnSelectionModified)); m_pTableField->SetModifyHdl(LINK(this, OLinkFieldsPage, OnSelectionModified)); - m_pValueListField->SetSelectHdl(LINK(this, OLinkFieldsPage, OnSelectionModified)); - m_pTableField->SetSelectHdl(LINK(this, OLinkFieldsPage, OnSelectionModified)); + m_pValueListField->SetSelectHdl(LINK(this, OLinkFieldsPage, OnSelectionModifiedCombBox)); + m_pTableField->SetSelectHdl(LINK(this, OLinkFieldsPage, OnSelectionModifiedCombBox)); } OLinkFieldsPage::~OLinkFieldsPage() @@ -494,6 +494,10 @@ namespace dbp return 0L; } + IMPL_LINK_NOARG_TYPED(OLinkFieldsPage, OnSelectionModifiedCombBox, ComboBox&, void) + { + implCheckFinish(); + } bool OLinkFieldsPage::commitPage( ::svt::WizardTypes::CommitPageReason _eReason ) { diff --git a/extensions/source/dbpilots/listcombowizard.hxx b/extensions/source/dbpilots/listcombowizard.hxx index 3bc7f85248de..a65300e8dba3 100644 --- a/extensions/source/dbpilots/listcombowizard.hxx +++ b/extensions/source/dbpilots/listcombowizard.hxx @@ -168,6 +168,7 @@ namespace dbp void implCheckFinish(); DECL_LINK(OnSelectionModified, void*); + DECL_LINK_TYPED(OnSelectionModifiedCombBox, ComboBox&, void); }; class OComboDBFieldPage : public ODBFieldPage diff --git a/extensions/source/propctrlr/standardcontrol.cxx b/extensions/source/propctrlr/standardcontrol.cxx index ad9a2cecf580..200b0f9e65fb 100644 --- a/extensions/source/propctrlr/standardcontrol.cxx +++ b/extensions/source/propctrlr/standardcontrol.cxx @@ -943,12 +943,11 @@ namespace pcr } - IMPL_LINK_NOARG( OComboboxControl, OnEntrySelected ) + IMPL_LINK_NOARG_TYPED( OComboboxControl, OnEntrySelected, ComboBox&, void ) { if ( !getTypedControlWindow()->IsTravelSelect() ) // fire a commit notifyModifiedValue(); - return 0L; } diff --git a/extensions/source/propctrlr/standardcontrol.hxx b/extensions/source/propctrlr/standardcontrol.hxx index b8caab69b5ba..c46659754099 100644 --- a/extensions/source/propctrlr/standardcontrol.hxx +++ b/extensions/source/propctrlr/standardcontrol.hxx @@ -336,7 +336,7 @@ namespace pcr virtual css::uno::Sequence< OUString > SAL_CALL getListEntries( ) throw (css::uno::RuntimeException, std::exception) override; protected: - DECL_LINK( OnEntrySelected, void* ); + DECL_LINK_TYPED( OnEntrySelected, ComboBox&, void ); }; |