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 /sw/source/ui/dbui | |
parent | c837bfda8c646fe2f7ff789032dd9a6ee6fd396f (diff) |
convert Link<> to typed
Change-Id: I6c55c74d47b13149c2fa210bb9de4e8c430c57cc
Diffstat (limited to 'sw/source/ui/dbui')
-rw-r--r-- | sw/source/ui/dbui/mmaddressblockpage.cxx | 6 | ||||
-rw-r--r-- | sw/source/ui/dbui/mmaddressblockpage.hxx | 1 | ||||
-rw-r--r-- | sw/source/ui/dbui/mmgreetingspage.cxx | 9 | ||||
-rw-r--r-- | sw/source/ui/dbui/mmgreetingspage.hxx | 1 |
4 files changed, 13 insertions, 4 deletions
diff --git a/sw/source/ui/dbui/mmaddressblockpage.cxx b/sw/source/ui/dbui/mmaddressblockpage.cxx index e521f223a6d6..4382ec17ff17 100644 --- a/sw/source/ui/dbui/mmaddressblockpage.cxx +++ b/sw/source/ui/dbui/mmaddressblockpage.cxx @@ -551,7 +551,7 @@ SwCustomizeAddressBlockDialog::SwCustomizeAddressBlockDialog( m_pDragED->SetSelectionChangedHdl( LINK( this, SwCustomizeAddressBlockDialog, SelectionChangedHdl_Impl)); Link<> aFieldsLink = LINK(this, SwCustomizeAddressBlockDialog, FieldChangeHdl_Impl); m_pFieldCB->SetModifyHdl(aFieldsLink); - m_pFieldCB->SetSelectHdl(aFieldsLink); + m_pFieldCB->SetSelectHdl(LINK(this, SwCustomizeAddressBlockDialog, FieldChangeComboBoxHdl_Impl)); Link<Button*,void> aImgButtonHdl = LINK(this, SwCustomizeAddressBlockDialog, ImageButtonHdl_Impl); m_pInsertFieldIB->SetClickHdl(aImgButtonHdl); m_pRemoveFieldIB->SetClickHdl(aImgButtonHdl); @@ -720,6 +720,10 @@ IMPL_LINK_TYPED(SwCustomizeAddressBlockDialog, SelectionChangedHdl_Impl, Address bOnEntry = false; } +IMPL_LINK_NOARG_TYPED(SwCustomizeAddressBlockDialog, FieldChangeComboBoxHdl_Impl, ComboBox&, void) +{ + FieldChangeHdl_Impl(nullptr); +} IMPL_LINK_NOARG(SwCustomizeAddressBlockDialog, FieldChangeHdl_Impl) { //changing the field content changes the related members, too diff --git a/sw/source/ui/dbui/mmaddressblockpage.hxx b/sw/source/ui/dbui/mmaddressblockpage.hxx index 88e653055281..b4abb2befb2e 100644 --- a/sw/source/ui/dbui/mmaddressblockpage.hxx +++ b/sw/source/ui/dbui/mmaddressblockpage.hxx @@ -226,6 +226,7 @@ private: DECL_LINK_TYPED(ImageButtonHdl_Impl, Button*, void); DECL_LINK_TYPED(SelectionChangedHdl_Impl, AddressMultiLineEdit&, void); DECL_LINK(FieldChangeHdl_Impl, void *); + DECL_LINK_TYPED(FieldChangeComboBoxHdl_Impl, ComboBox&, void); bool HasItem_Impl(sal_Int32 nUserData); sal_Int32 GetSelectedItem_Impl(); diff --git a/sw/source/ui/dbui/mmgreetingspage.cxx b/sw/source/ui/dbui/mmgreetingspage.cxx index 5192a7399b9d..7cd8d128175a 100644 --- a/sw/source/ui/dbui/mmgreetingspage.cxx +++ b/sw/source/ui/dbui/mmgreetingspage.cxx @@ -144,11 +144,14 @@ IMPL_LINK_NOARG(SwMailMergeGreetingsPage, GreetingSelectHdl_Impl) UpdatePreview(); return 0; } - IMPL_LINK_NOARG_TYPED(SwMailMergeGreetingsPage, GreetingSelectListBoxHdl_Impl, ListBox&, void) { UpdatePreview(); } +IMPL_LINK_NOARG_TYPED(SwMailMergeGreetingsPage, GreetingSelectComboBoxHdl_Impl, ComboBox&, void) +{ + UpdatePreview(); +} void SwMailMergeGreetingsPage::UpdatePreview() { @@ -269,9 +272,9 @@ SwMailMergeGreetingsPage::SwMailMergeGreetingsPage(SwMailMergeWizard* _pParent) m_pFemaleLB->SetSelectHdl(aLBoxLink2); m_pMaleLB->SetSelectHdl(aLBoxLink2); m_pFemaleColumnLB->SetSelectHdl(aLBoxLink2); - m_pFemaleFieldCB->SetSelectHdl(aLBoxLink); + m_pFemaleFieldCB->SetSelectHdl(LINK(this, SwMailMergeGreetingsPage, GreetingSelectComboBoxHdl_Impl)); m_pFemaleFieldCB->SetModifyHdl(aLBoxLink); - m_pNeutralCB->SetSelectHdl(aLBoxLink); + m_pNeutralCB->SetSelectHdl(LINK(this, SwMailMergeGreetingsPage, GreetingSelectComboBoxHdl_Impl)); m_pNeutralCB->SetModifyHdl(aLBoxLink); Link<Button*,void> aDataLink = LINK(this, SwMailMergeGreetingsPage, InsertDataHdl_Impl); diff --git a/sw/source/ui/dbui/mmgreetingspage.hxx b/sw/source/ui/dbui/mmgreetingspage.hxx index 75472678333b..f0edeaaa6d43 100644 --- a/sw/source/ui/dbui/mmgreetingspage.hxx +++ b/sw/source/ui/dbui/mmgreetingspage.hxx @@ -82,6 +82,7 @@ class SwMailMergeGreetingsPage : public svt::OWizardPage, DECL_LINK_TYPED(ContainsHdl_Impl, Button*, void); DECL_LINK_TYPED(InsertDataHdl_Impl, Button*, void); DECL_LINK(GreetingSelectHdl_Impl, void *); + DECL_LINK_TYPED(GreetingSelectComboBoxHdl_Impl, ComboBox&, void); DECL_LINK_TYPED(GreetingSelectListBoxHdl_Impl, ListBox&, void); DECL_LINK_TYPED(AssignHdl_Impl, Button*, void); |