diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2015-09-25 11:40:34 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2015-09-26 05:27:04 +0000 |
| commit | 73b158e00177b7abd3f0c43dfdc3c3de1321e212 (patch) | |
| tree | 3cc33ace6936730bea6a1e0e9d0ea1b34f4519bc /svx/source | |
| parent | 18c196f0190d9920673cdd9a4dbc158f08959cfd (diff) | |
convert Link<> to typed
Change-Id: If1dcc5e50b08540623bb21067c5f74e47192ef9a
Reviewed-on: https://gerrit.libreoffice.org/18859
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'svx/source')
| -rw-r--r-- | svx/source/form/fmshimp.cxx | 13 | ||||
| -rw-r--r-- | svx/source/inc/fmshimp.hxx | 2 |
2 files changed, 7 insertions, 8 deletions
diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx index c82829ae8234..80b90a1f70bd 100644 --- a/svx/source/form/fmshimp.cxx +++ b/svx/source/form/fmshimp.cxx @@ -2282,24 +2282,24 @@ IMPL_LINK_TYPED(FmXFormShell, OnFoundData, FmFoundRecordInformation&, rfriWhere, } -IMPL_LINK(FmXFormShell, OnCanceledNotFound, FmFoundRecordInformation*, pfriWhere) +IMPL_LINK_TYPED(FmXFormShell, OnCanceledNotFound, FmFoundRecordInformation&, rfriWhere, void) { if ( impl_checkDisposed() ) - return 0; + return; - DBG_ASSERT((pfriWhere->nContext >= 0) && (pfriWhere->nContext < (sal_Int16)m_aSearchForms.size()), + DBG_ASSERT((rfriWhere.nContext >= 0) && (rfriWhere.nContext < (sal_Int16)m_aSearchForms.size()), "FmXFormShell::OnCanceledNotFound : ungueltiger Kontext !"); - Reference< XForm> xForm( m_aSearchForms.at(pfriWhere->nContext)); + Reference< XForm> xForm( m_aSearchForms.at(rfriWhere.nContext)); DBG_ASSERT(xForm.is(), "FmXFormShell::OnCanceledNotFound : ungueltige Form !"); Reference< XRowLocate> xCursor(xForm, UNO_QUERY); if (!xCursor.is()) - return 0; // was soll ich da machen ? + return; // was soll ich da machen ? // zum Datensatz try { - xCursor->moveToBookmark(pfriWhere->aPosition); + xCursor->moveToBookmark(rfriWhere.aPosition); } catch(const SQLException&) { @@ -2308,7 +2308,6 @@ IMPL_LINK(FmXFormShell, OnCanceledNotFound, FmFoundRecordInformation*, pfriWhere m_pShell->GetFormView()->UnMarkAll(m_pShell->GetFormView()->GetSdrPageView()); - return 0L; } diff --git a/svx/source/inc/fmshimp.hxx b/svx/source/inc/fmshimp.hxx index 521e7fb9b02a..e23f3002ec1e 100644 --- a/svx/source/inc/fmshimp.hxx +++ b/svx/source/inc/fmshimp.hxx @@ -465,7 +465,7 @@ public: private: DECL_DLLPRIVATE_LINK_TYPED(OnFoundData, FmFoundRecordInformation&, void); - DECL_DLLPRIVATE_LINK(OnCanceledNotFound, FmFoundRecordInformation*); + DECL_DLLPRIVATE_LINK_TYPED(OnCanceledNotFound, FmFoundRecordInformation&, void); DECL_DLLPRIVATE_LINK_TYPED(OnSearchContextRequest, FmSearchContext&, sal_uInt32); DECL_DLLPRIVATE_LINK_TYPED(OnTimeOut, Timer*, void); DECL_DLLPRIVATE_LINK_TYPED(OnFirstTimeActivation, void*, void); |