diff options
| author | Noel Grandin <noel@peralex.com> | 2015-10-15 08:13:49 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2015-10-16 09:11:29 +0000 |
| commit | 6f1313b3d44ea54e9a331e0fc00871081fa662fe (patch) | |
| tree | fa6d9b6da04daedcb63ea2a0bc8c414288ed8bc6 /sw/source/ui/dbui/mmaddressblockpage.cxx | |
| parent | 14bf708ef586b15dffed66ffaf524baf4d8fcbfa (diff) | |
convert Link<> to typed
Change-Id: Icbba339dac0be31e30dff021bba06a219f8aecd6
Reviewed-on: https://gerrit.libreoffice.org/19405
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'sw/source/ui/dbui/mmaddressblockpage.cxx')
| -rw-r--r-- | sw/source/ui/dbui/mmaddressblockpage.cxx | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/sw/source/ui/dbui/mmaddressblockpage.cxx b/sw/source/ui/dbui/mmaddressblockpage.cxx index 4382ec17ff17..3eaf0e8d1bef 100644 --- a/sw/source/ui/dbui/mmaddressblockpage.cxx +++ b/sw/source/ui/dbui/mmaddressblockpage.cxx @@ -549,7 +549,7 @@ SwCustomizeAddressBlockDialog::SwCustomizeAddressBlockDialog( m_pAddressElementsLB->SetSelectHdl(LINK(this, SwCustomizeAddressBlockDialog, ListBoxSelectHdl_Impl )); m_pDragED->SetModifyHdl(LINK(this, SwCustomizeAddressBlockDialog, EditModifyHdl_Impl)); m_pDragED->SetSelectionChangedHdl( LINK( this, SwCustomizeAddressBlockDialog, SelectionChangedHdl_Impl)); - Link<> aFieldsLink = LINK(this, SwCustomizeAddressBlockDialog, FieldChangeHdl_Impl); + Link<Edit&,void> aFieldsLink = LINK(this, SwCustomizeAddressBlockDialog, FieldChangeHdl_Impl); m_pFieldCB->SetModifyHdl(aFieldsLink); m_pFieldCB->SetSelectHdl(LINK(this, SwCustomizeAddressBlockDialog, FieldChangeComboBoxHdl_Impl)); Link<Button*,void> aImgButtonHdl = LINK(this, SwCustomizeAddressBlockDialog, ImageButtonHdl_Impl); @@ -598,11 +598,10 @@ IMPL_LINK_TYPED(SwCustomizeAddressBlockDialog, ListBoxSelectHdl_Impl, SvTreeList m_pInsertFieldIB->Enable(nUserData >= 0 || !HasItem_Impl(nUserData)); } -IMPL_LINK_NOARG(SwCustomizeAddressBlockDialog, EditModifyHdl_Impl) +IMPL_LINK_NOARG_TYPED(SwCustomizeAddressBlockDialog, EditModifyHdl_Impl, Edit&, void) { m_pPreviewWIN->SetAddress(SwAddressPreview::FillData(GetAddress(), m_rConfigItem)); UpdateImageButtons_Impl(); - return 0; } IMPL_LINK_TYPED(SwCustomizeAddressBlockDialog, ImageButtonHdl_Impl, Button*, pButton, void) @@ -722,9 +721,9 @@ IMPL_LINK_TYPED(SwCustomizeAddressBlockDialog, SelectionChangedHdl_Impl, Address IMPL_LINK_NOARG_TYPED(SwCustomizeAddressBlockDialog, FieldChangeComboBoxHdl_Impl, ComboBox&, void) { - FieldChangeHdl_Impl(nullptr); + FieldChangeHdl_Impl(*m_pFieldCB); } -IMPL_LINK_NOARG(SwCustomizeAddressBlockDialog, FieldChangeHdl_Impl) +IMPL_LINK_NOARG_TYPED(SwCustomizeAddressBlockDialog, FieldChangeHdl_Impl, Edit&, void) { //changing the field content changes the related members, too sal_Int32 nSelected = GetSelectedItem_Impl(); @@ -743,7 +742,6 @@ IMPL_LINK_NOARG(SwCustomizeAddressBlockDialog, FieldChangeHdl_Impl) UpdateImageButtons_Impl(); m_pPreviewWIN->SetAddress(GetAddress()); m_pDragED->Modify(); - return 0; } void SwCustomizeAddressBlockDialog::UpdateImageButtons_Impl() |