From 14a5131658cd25009c625fcf2472a49d9392de6c Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Fri, 25 Sep 2015 11:19:01 +0200 Subject: convert Link<> to typed Change-Id: I7fd77490ab49a18f48e248ca277bc30b5a7d2071 Reviewed-on: https://gerrit.libreoffice.org/18858 Tested-by: Jenkins Reviewed-by: Noel Grandin --- cui/source/dialogs/cuifmsearch.cxx | 2 +- cui/source/factory/dlgfact.cxx | 2 +- cui/source/factory/dlgfact.hxx | 3 ++- cui/source/inc/cuifmsearch.hxx | 4 ++-- 4 files changed, 6 insertions(+), 5 deletions(-) (limited to 'cui') diff --git a/cui/source/dialogs/cuifmsearch.cxx b/cui/source/dialogs/cuifmsearch.cxx index b0d80cf2ba40..bb410ac5b460 100644 --- a/cui/source/dialogs/cuifmsearch.cxx +++ b/cui/source/dialogs/cuifmsearch.cxx @@ -696,7 +696,7 @@ void FmSearchDialog::OnFound(const css::uno::Any& aCursorPos, sal_Int16 nFieldPo // this of course implies that I have really searched in the field that is selected in the listbox, // which is made sure in RebuildUsedFields - m_lnkFoundHandler.Call(&friInfo); + m_lnkFoundHandler.Call(friInfo); m_pcmbSearchText->GrabFocus(); } diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx index 426fe2868abf..5b00fd1e0864 100644 --- a/cui/source/factory/dlgfact.cxx +++ b/cui/source/factory/dlgfact.cxx @@ -694,7 +694,7 @@ bool AbstractSvxHpLinkDlg_Impl::QueryClose() } -void AbstractFmSearchDialog_Impl::SetFoundHandler(const Link<>& lnk) +void AbstractFmSearchDialog_Impl::SetFoundHandler(const Link& lnk) { pDlg->SetFoundHandler(lnk); } diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx index f7d9e6bd7bfb..2fd4ebf42954 100644 --- a/cui/source/factory/dlgfact.hxx +++ b/cui/source/factory/dlgfact.hxx @@ -389,10 +389,11 @@ class AbstractSvxHpLinkDlg_Impl :public AbstractSvxHpLinkDlg }; class FmSearchDialog; +struct FmFoundRecordInformation; class AbstractFmSearchDialog_Impl :public AbstractFmSearchDialog { DECL_ABSTDLG_BASE(AbstractFmSearchDialog_Impl,FmSearchDialog) - virtual void SetFoundHandler(const Link<>& lnk) SAL_OVERRIDE ; + virtual void SetFoundHandler(const Link& lnk) SAL_OVERRIDE ; virtual void SetCanceledNotFoundHdl(const Link<>& lnk) SAL_OVERRIDE; virtual void SetActiveField(const OUString& strField) SAL_OVERRIDE; }; diff --git a/cui/source/inc/cuifmsearch.hxx b/cui/source/inc/cuifmsearch.hxx index c41ea5c886e3..c52fd387cdf9 100644 --- a/cui/source/inc/cuifmsearch.hxx +++ b/cui/source/inc/cuifmsearch.hxx @@ -78,7 +78,7 @@ class FmSearchDialog : public ModalDialog VclPtr m_pPreSearchFocus; - Link<> m_lnkFoundHandler; ///< Handler for "found" + Link m_lnkFoundHandler; ///< Handler for "found" Link<> m_lnkCanceledNotFoundHdl; ///< Handler for Positioning the Cursors Link m_lnkContextSupplier; ///< for search in contexts @@ -119,7 +119,7 @@ public: This handler MUST be set. Furthermore, it should be considered, that during the handler the search-dialog is still modal. */ - void SetFoundHandler(const Link<>& lnk) { m_lnkFoundHandler = lnk; } + void SetFoundHandler(const Link& lnk) { m_lnkFoundHandler = lnk; } /** If the search has been cancelled or has been finished without success, the current data set is always displayed in the search dialog. This handler exists to make this synchronous with the possible display of the caller (it does not -- cgit