diff options
| author | Noel Grandin <noel@peralex.com> | 2015-09-18 09:03:07 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2015-09-20 06:33:11 +0000 |
| commit | 9b47e752419b03b96e17cb776eb4db374a6d09c1 (patch) | |
| tree | 2f36f7beefc9189ce1115ad88bdb2a94ce4a428f /sw/source/ui/dbui/mmaddressblockpage.cxx | |
| parent | b1326ecbb793a5940719b59a049368e7be45147a (diff) | |
convert Link<> to typed
Change-Id: I8db191c87e80b11fe20370703f4bd6780d18f378
Reviewed-on: https://gerrit.libreoffice.org/18695
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 | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/sw/source/ui/dbui/mmaddressblockpage.cxx b/sw/source/ui/dbui/mmaddressblockpage.cxx index e0821ee696d5..4b4d6b7564d6 100644 --- a/sw/source/ui/dbui/mmaddressblockpage.cxx +++ b/sw/source/ui/dbui/mmaddressblockpage.cxx @@ -668,19 +668,19 @@ bool SwCustomizeAddressBlockDialog::HasItem_Impl(sal_Int32 nUserData) return m_pDragED->GetText().indexOf("<" + sEntry + ">") >= 0; } -IMPL_LINK(SwCustomizeAddressBlockDialog, SelectionChangedHdl_Impl, AddressMultiLineEdit*, pEdit) +IMPL_LINK_TYPED(SwCustomizeAddressBlockDialog, SelectionChangedHdl_Impl, AddressMultiLineEdit&, rEdit, void) { // called in case the selection of the edit field changes. // determine selection - if it's one of the editable fields then // enable the related ComboBox and fill it static bool bOnEntry = false; if(bOnEntry) - return 0; + return; bOnEntry = true; sal_Int32 nSelected = GetSelectedItem_Impl(); if(USER_DATA_NONE != nSelected) - pEdit->SelectCurrentItem(); + rEdit.SelectCurrentItem(); if(m_pFieldCB->IsVisible() && (USER_DATA_NONE != nSelected) && (nSelected < 0)) { @@ -718,7 +718,6 @@ IMPL_LINK(SwCustomizeAddressBlockDialog, SelectionChangedHdl_Impl, AddressMultiL UpdateImageButtons_Impl(); bOnEntry = false; - return 0; } IMPL_LINK_NOARG(SwCustomizeAddressBlockDialog, FieldChangeHdl_Impl) @@ -1354,7 +1353,7 @@ void AddressMultiLineEdit::Notify(SfxBroadcaster& /*rBC*/, const SfxHint& rHint) if (rTextHint.GetId() == TEXT_HINT_VIEWSELECTIONCHANGED || rTextHint.GetId() == TEXT_HINT_VIEWCARETCHANGED) { - m_aSelectionLink.Call(this); + m_aSelectionLink.Call(*this); } } } @@ -1457,7 +1456,7 @@ void AddressMultiLineEdit::InsertNewEntryAtPosition( const OUString& rStr, sal_u TextSelection aEntrySel(aInsertPos); ExtTextView* pTextView = GetTextView(); pTextView->SetSelection(aEntrySel); - m_aSelectionLink.Call(this); + m_aSelectionLink.Call(*this); } void AddressMultiLineEdit::RemoveCurrentEntry() |