convert Link<> to typed

Change-Id: I473ab8d77273c512e843427c86664f9eefbff116

3 files changed, 7 insertions, 18 deletions

diff --git a/dbaccess/source/ui/browser/AsynchronousLink.cxx b/dbaccess/source/ui/browser/AsynchronousLink.cxx
index 6b2dbe43cbce..92ce231abacb 100644
--- a/dbaccess/source/ui/browser/AsynchronousLink.cxx
+++ b/dbaccess/source/ui/browser/AsynchronousLink.cxx
@@ -23,7 +23,7 @@
 
 // OAsynchronousLink
 using namespace dbaui;
-OAsynchronousLink::OAsynchronousLink( const Link<>& _rHandler )
+OAsynchronousLink::OAsynchronousLink( const Link<void*,void>& _rHandler )
     :m_aHandler(_rHandler)
     ,m_aEventSafety()
     ,m_aDestructionSafety()
diff --git a/dbaccess/source/ui/browser/brwctrlr.cxx b/dbaccess/source/ui/browser/brwctrlr.cxx
index cc3b1c3ade8a..9d1f159bf2b0 100644
--- a/dbaccess/source/ui/browser/brwctrlr.cxx
+++ b/dbaccess/source/ui/browser/brwctrlr.cxx
@@ -1267,14 +1267,13 @@ void SbaXDataBrowserController::frameAction(const css::frame::FrameActionEvent&
         }
 }
 
-IMPL_LINK_NOARG( SbaXDataBrowserController, OnAsyncDisplayError )
+IMPL_LINK_NOARG_TYPED( SbaXDataBrowserController, OnAsyncDisplayError, void*, void )
 {
     if ( m_aCurrentError.isValid() )
     {
         ScopedVclPtrInstance< OSQLMessageBox > aDlg( getBrowserView(), m_aCurrentError );
         aDlg->Execute();
     }
-    return 0L;
 }
 
 void SbaXDataBrowserController::errorOccured(const css::sdb::SQLErrorEvent& aEvent) throw( RuntimeException, std::exception )
@@ -2439,20 +2438,12 @@ IMPL_LINK(SbaXDataBrowserController, OnCanceledNotFound, FmFoundRecordInformatio
     return 0L;
 }
 
-IMPL_LINK_NOARG(SbaXDataBrowserController, OnAsyncGetCellFocus)
+IMPL_LINK_NOARG_TYPED(SbaXDataBrowserController, OnAsyncGetCellFocus, void*, void)
 {
     SbaGridControl* pVclGrid = getBrowserView() ? getBrowserView()->getVclControl() : NULL;
     // if we have a controller, but the window for the controller doesn't have the focus, we correct this
-    if(pVclGrid)
-    {
-        if (!pVclGrid->IsEditing())
-            return 0L;
-
-        if (pVclGrid->HasChildPathFocus())
-            pVclGrid->Controller()->GetWindow().GrabFocus();
-    }
-
-    return 0L;
+    if (pVclGrid && pVclGrid->IsEditing() && pVclGrid->HasChildPathFocus())
+        pVclGrid->Controller()->GetWindow().GrabFocus();
 }
 
 void SbaXDataBrowserController::criticalFail()
diff --git a/dbaccess/source/ui/browser/genericcontroller.cxx b/dbaccess/source/ui/browser/genericcontroller.cxx
index b7d6dffe5dbd..8811b5b71e7f 100644
--- a/dbaccess/source/ui/browser/genericcontroller.cxx
+++ b/dbaccess/source/ui/browser/genericcontroller.cxx
@@ -252,11 +252,10 @@ bool OGenericUnoController::Construct(vcl::Window* /*pParent*/)
     return true;
 }
 
-IMPL_LINK_NOARG(OGenericUnoController, OnAsyncInvalidateAll)
+IMPL_LINK_NOARG_TYPED(OGenericUnoController, OnAsyncInvalidateAll, void*, void)
 {
     if ( !OGenericUnoController_Base::rBHelper.bInDispose && !OGenericUnoController_Base::rBHelper.bDisposed )
         InvalidateFeature_Impl();
-    return 0L;
 }
 
 void OGenericUnoController::impl_initialize()
@@ -1031,7 +1030,7 @@ void OGenericUnoController::closeTask()
     m_aAsyncCloseTask.Call();
 }
 
-IMPL_LINK_NOARG(OGenericUnoController, OnAsyncCloseTask)
+IMPL_LINK_NOARG_TYPED(OGenericUnoController, OnAsyncCloseTask, void*, void)
 {
     if ( !OGenericUnoController_Base::rBHelper.bInDispose )
     {
@@ -1045,7 +1044,6 @@ IMPL_LINK_NOARG(OGenericUnoController, OnAsyncCloseTask)
             DBG_UNHANDLED_EXCEPTION();
         }
     }
-    return 0L;
 }
 
 Any SAL_CALL OGenericUnoController::getViewData() throw( RuntimeException, std::exception )