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 --- dbaccess/source/ui/browser/brwctrlr.cxx | 10 ++++------ dbaccess/source/ui/inc/brwctrlr.hxx | 2 +- 2 files changed, 5 insertions(+), 7 deletions(-) (limited to 'dbaccess') diff --git a/dbaccess/source/ui/browser/brwctrlr.cxx b/dbaccess/source/ui/browser/brwctrlr.cxx index 8783d3114b32..10fbab45ed52 100644 --- a/dbaccess/source/ui/browser/brwctrlr.cxx +++ b/dbaccess/source/ui/browser/brwctrlr.cxx @@ -2369,13 +2369,13 @@ IMPL_LINK_TYPED(SbaXDataBrowserController, OnSearchContextRequest, FmSearchConte return rContext.arrFields.size(); } -IMPL_LINK(SbaXDataBrowserController, OnFoundData, FmFoundRecordInformation*, pInfo) +IMPL_LINK_TYPED(SbaXDataBrowserController, OnFoundData, FmFoundRecordInformation&, rInfo, void) { Reference< css::sdbcx::XRowLocate > xCursor(getRowSet(), UNO_QUERY); OSL_ENSURE(xCursor.is(), "SbaXDataBrowserController::OnFoundData : xCursor is empty"); // move the cursor - xCursor->moveToBookmark(pInfo->aPosition); + xCursor->moveToBookmark(rInfo.aPosition); // let the grid snyc it's display with the cursor Reference< XPropertySet > xModelSet(getControlModel(), UNO_QUERY); @@ -2393,8 +2393,8 @@ IMPL_LINK(SbaXDataBrowserController, OnFoundData, FmFoundRecordInformation*, pIn Reference< XInterface > xCurrent(aColumnControls->getByIndex(nViewPos),UNO_QUERY); if (IsSearchableControl(xCurrent)) { - if (pInfo->nFieldPos) - --pInfo->nFieldPos; + if (rInfo.nFieldPos) + --rInfo.nFieldPos; else break; } @@ -2402,8 +2402,6 @@ IMPL_LINK(SbaXDataBrowserController, OnFoundData, FmFoundRecordInformation*, pIn Reference< css::form::XGrid > xGrid(getBrowserView()->getGridControl(), UNO_QUERY); xGrid->setCurrentColumnPosition(nViewPos); - - return 0; } IMPL_LINK(SbaXDataBrowserController, OnCanceledNotFound, FmFoundRecordInformation*, pInfo) diff --git a/dbaccess/source/ui/inc/brwctrlr.hxx b/dbaccess/source/ui/inc/brwctrlr.hxx index 8bcab45a054a..e340c0426891 100644 --- a/dbaccess/source/ui/inc/brwctrlr.hxx +++ b/dbaccess/source/ui/inc/brwctrlr.hxx @@ -332,7 +332,7 @@ namespace dbaui // search callbacks DECL_LINK_TYPED(OnSearchContextRequest, FmSearchContext&, sal_uInt32); - DECL_LINK(OnFoundData, FmFoundRecordInformation*); + DECL_LINK_TYPED(OnFoundData, FmFoundRecordInformation&, void); DECL_LINK(OnCanceledNotFound, FmFoundRecordInformation*); DECL_LINK_TYPED( OnAsyncGetCellFocus, void*, void ); -- cgit