cui/source/dialogs/cuifmsearch.cxx | 2 +-
cui/source/factory/dlgfact.cxx | 2 +-
cui/source/factory/dlgfact.hxx | 2 +-
cui/source/inc/cuifmsearch.hxx | 4 ++--
dbaccess/source/ui/browser/brwctrlr.cxx | 6 ++----
dbaccess/source/ui/inc/brwctrlr.hxx | 2 +-
include/svx/svxdlg.hxx | 2 +-
svx/source/form/fmshimp.cxx | 13 ++++++-------
svx/source/inc/fmshimp.hxx | 2 +-
9 files changed, 16 insertions(+), 19 deletions(-)
New commits:
commit 73b158e00177b7abd3f0c43dfdc3c3de1321e212
Author: Noel Grandin <noelgran...@gmail.com>
Date: Fri Sep 25 11:40:34 2015 +0200
convert Link<> to typed
Change-Id: If1dcc5e50b08540623bb21067c5f74e47192ef9a
Reviewed-on: https://gerrit.libreoffice.org/18859
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Noel Grandin <noelgran...@gmail.com>
diff --git a/cui/source/dialogs/cuifmsearch.cxx
b/cui/source/dialogs/cuifmsearch.cxx
index bb410ac..a51a017 100644
--- a/cui/source/dialogs/cuifmsearch.cxx
+++ b/cui/source/dialogs/cuifmsearch.cxx
@@ -751,7 +751,7 @@ IMPL_LINK_TYPED(FmSearchDialog, OnSearchProgress, const
FmSearchProgress*, pProg
friInfo.nContext = m_plbForm->GetSelectEntryPos();
// if I don't do a search in a context, this has an invalid
value - but then it doesn't matter anyway
friInfo.aPosition = pProgress->aBookmark;
- m_lnkCanceledNotFoundHdl.Call(&friInfo);
+ m_lnkCanceledNotFoundHdl.Call(friInfo);
}
break;
}
diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx
index 5b00fd1..f81372a 100644
--- a/cui/source/factory/dlgfact.cxx
+++ b/cui/source/factory/dlgfact.cxx
@@ -698,7 +698,7 @@ void AbstractFmSearchDialog_Impl::SetFoundHandler(const
Link<FmFoundRecordInform
{
pDlg->SetFoundHandler(lnk);
}
-void AbstractFmSearchDialog_Impl::SetCanceledNotFoundHdl(const Link<>& lnk)
+void AbstractFmSearchDialog_Impl::SetCanceledNotFoundHdl(const
Link<FmFoundRecordInformation&,void>& lnk)
{
pDlg->SetCanceledNotFoundHdl(lnk);
}
diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx
index 2fd4ebf..5e94fcb 100644
--- a/cui/source/factory/dlgfact.hxx
+++ b/cui/source/factory/dlgfact.hxx
@@ -394,7 +394,7 @@ class AbstractFmSearchDialog_Impl :public
AbstractFmSearchDialog
{
DECL_ABSTDLG_BASE(AbstractFmSearchDialog_Impl,FmSearchDialog)
virtual void SetFoundHandler(const Link<FmFoundRecordInformation&,void>&
lnk) SAL_OVERRIDE ;
- virtual void SetCanceledNotFoundHdl(const Link<>& lnk) SAL_OVERRIDE;
+ virtual void SetCanceledNotFoundHdl(const
Link<FmFoundRecordInformation&,void>& 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 c52fd38..eb304a7 100644
--- a/cui/source/inc/cuifmsearch.hxx
+++ b/cui/source/inc/cuifmsearch.hxx
@@ -79,7 +79,7 @@ class FmSearchDialog : public ModalDialog
VclPtr<vcl::Window> m_pPreSearchFocus;
Link<FmFoundRecordInformation&,void> m_lnkFoundHandler; ///<
Handler for "found"
- Link<> m_lnkCanceledNotFoundHdl; ///< Handler for Positioning the
Cursors
+ Link<FmFoundRecordInformation&,void> m_lnkCanceledNotFoundHdl; ///<
Handler for Positioning the Cursors
Link<FmSearchContext&,sal_uInt32> m_lnkContextSupplier; ///< for
search in contexts
@@ -127,7 +127,7 @@ public:
The pointer that is passed to the handler points to a
FmFoundRecordInformation-structure, for which aPosition and
possibly (in a search with contexts) nContext are valid.
*/
- void SetCanceledNotFoundHdl(const Link<>& lnk) { m_lnkCanceledNotFoundHdl
= lnk; }
+ void SetCanceledNotFoundHdl(const Link<FmFoundRecordInformation&,void>&
lnk) { m_lnkCanceledNotFoundHdl = lnk; }
inline void SetActiveField(const OUString& strField);
diff --git a/dbaccess/source/ui/browser/brwctrlr.cxx
b/dbaccess/source/ui/browser/brwctrlr.cxx
index 10fbab4..b0b8d6b 100644
--- a/dbaccess/source/ui/browser/brwctrlr.cxx
+++ b/dbaccess/source/ui/browser/brwctrlr.cxx
@@ -2404,7 +2404,7 @@ IMPL_LINK_TYPED(SbaXDataBrowserController, OnFoundData,
FmFoundRecordInformation
xGrid->setCurrentColumnPosition(nViewPos);
}
-IMPL_LINK(SbaXDataBrowserController, OnCanceledNotFound,
FmFoundRecordInformation*, pInfo)
+IMPL_LINK_TYPED(SbaXDataBrowserController, OnCanceledNotFound,
FmFoundRecordInformation&, rInfo, void)
{
Reference< css::sdbcx::XRowLocate > xCursor(getRowSet(), UNO_QUERY);
@@ -2412,7 +2412,7 @@ IMPL_LINK(SbaXDataBrowserController, OnCanceledNotFound,
FmFoundRecordInformatio
{
OSL_ENSURE(xCursor.is(),
"SbaXDataBrowserController::OnCanceledNotFound : xCursor is empty");
// move the cursor
- xCursor->moveToBookmark(pInfo->aPosition);
+ xCursor->moveToBookmark(rInfo.aPosition);
}
catch( const Exception& )
{
@@ -2432,8 +2432,6 @@ IMPL_LINK(SbaXDataBrowserController, OnCanceledNotFound,
FmFoundRecordInformatio
{
DBG_UNHANDLED_EXCEPTION();
}
-
- return 0L;
}
IMPL_LINK_NOARG_TYPED(SbaXDataBrowserController, OnAsyncGetCellFocus, void*,
void)
diff --git a/dbaccess/source/ui/inc/brwctrlr.hxx
b/dbaccess/source/ui/inc/brwctrlr.hxx
index e340c04..4005aaf 100644
--- a/dbaccess/source/ui/inc/brwctrlr.hxx
+++ b/dbaccess/source/ui/inc/brwctrlr.hxx
@@ -333,7 +333,7 @@ namespace dbaui
// search callbacks
DECL_LINK_TYPED(OnSearchContextRequest, FmSearchContext&, sal_uInt32);
DECL_LINK_TYPED(OnFoundData, FmFoundRecordInformation&, void);
- DECL_LINK(OnCanceledNotFound, FmFoundRecordInformation*);
+ DECL_LINK_TYPED(OnCanceledNotFound, FmFoundRecordInformation&, void);
DECL_LINK_TYPED( OnAsyncGetCellFocus, void*, void );
DECL_LINK_TYPED( OnAsyncDisplayError, void*, void );
diff --git a/include/svx/svxdlg.hxx b/include/svx/svxdlg.hxx
index 30f0dacf..de777fe 100644
--- a/include/svx/svxdlg.hxx
+++ b/include/svx/svxdlg.hxx
@@ -203,7 +203,7 @@ class AbstractFmSearchDialog :public VclAbstractDialog
{
public:
virtual void SetFoundHandler(const Link<FmFoundRecordInformation&,void>&
lnk) = 0;
- virtual void SetCanceledNotFoundHdl(const Link<>& lnk)=0;
+ virtual void SetCanceledNotFoundHdl(const
Link<FmFoundRecordInformation&,void>& lnk)=0;
virtual void SetActiveField(const OUString& strField)=0;
};
diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx
index c82829a..80b90a1 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 521e7fb..e23f300 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);
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
