convert Link<> to typed

Change-Id: I473ab8d77273c512e843427c86664f9eefbff116

7 files changed, 13 insertions, 27 deletions

diff --git a/dbaccess/source/ui/app/AppController.cxx b/dbaccess/source/ui/app/AppController.cxx
index 69bb9279d5f4..037802a8e6bf 100644
--- a/dbaccess/source/ui/app/AppController.cxx
+++ b/dbaccess/source/ui/app/AppController.cxx
@@ -1881,12 +1881,11 @@ Reference< XComponent > OApplicationController::openElementWithArguments( const
     return xRet;
 }
 
-IMPL_LINK( OApplicationController, OnSelectContainer, void*, _pType )
+IMPL_LINK_TYPED( OApplicationController, OnSelectContainer, void*, _pType, void )
 {
     ElementType eType = (ElementType)reinterpret_cast< sal_IntPtr >( _pType );
     if (getContainer())
         getContainer()->selectContainer(eType);
-    return 0L;
 }
 
 IMPL_LINK_TYPED( OApplicationController, OnCreateWithPilot, void*, _pType, void )
diff --git a/dbaccess/source/ui/app/AppController.hxx b/dbaccess/source/ui/app/AppController.hxx
index 034a69aec8c4..899a9cad17b4 100644
--- a/dbaccess/source/ui/app/AppController.hxx
+++ b/dbaccess/source/ui/app/AppController.hxx
@@ -527,7 +527,7 @@ namespace dbaui
         DECL_LINK_TYPED( OnClipboardChanged, TransferableDataHelper*, void );
         DECL_LINK_TYPED( OnAsyncDrop, void*, void );
         DECL_LINK_TYPED( OnCreateWithPilot, void*, void );
-        DECL_LINK( OnSelectContainer, void* );
+        DECL_LINK_TYPED( OnSelectContainer, void*, void );
         void OnFirstControllerConnected();
 
     protected:
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 )
diff --git a/dbaccess/source/ui/dlg/dbwizsetup.cxx b/dbaccess/source/ui/dlg/dbwizsetup.cxx
index 9a3f2ed10cfb..ea230da8b916 100644
--- a/dbaccess/source/ui/dlg/dbwizsetup.cxx
+++ b/dbaccess/source/ui/dlg/dbwizsetup.cxx
@@ -902,7 +902,7 @@ bool ODbTypeWizDialogSetup::SaveDatabaseDocument()
             virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
         private:
-            DECL_LINK( OnOpenDocument, void* );
+            DECL_LINK_TYPED( OnOpenDocument, void*, void );
         };
 
         AsyncLoader::AsyncLoader( const Reference< XComponentContext >& _rxORB, const OUString& _rURL )
@@ -936,7 +936,7 @@ bool ODbTypeWizDialogSetup::SaveDatabaseDocument()
             m_aAsyncCaller.Call( NULL );
         }
 
-        IMPL_LINK_NOARG( AsyncLoader, OnOpenDocument )
+        IMPL_LINK_NOARG_TYPED( AsyncLoader, OnOpenDocument, void*, void )
         {
             try
             {
@@ -970,7 +970,6 @@ bool ODbTypeWizDialogSetup::SaveDatabaseDocument()
             catch( const Exception& ) { DBG_UNHANDLED_EXCEPTION(); }
 
             release();
-            return 0L;
         }
 
         void SAL_CALL AsyncLoader::queryTermination( const css::lang::EventObject& /*Event*/ ) throw (TerminationVetoException, RuntimeException, std::exception)
diff --git a/dbaccess/source/ui/inc/brwctrlr.hxx b/dbaccess/source/ui/inc/brwctrlr.hxx
index 2b1d027952c8..b18b26758f26 100644
--- a/dbaccess/source/ui/inc/brwctrlr.hxx
+++ b/dbaccess/source/ui/inc/brwctrlr.hxx
@@ -335,9 +335,8 @@ namespace dbaui
         DECL_LINK(OnFoundData, FmFoundRecordInformation*);
         DECL_LINK(OnCanceledNotFound, FmFoundRecordInformation*);
 
-        DECL_LINK(OnAsyncGetCellFocus, void*);
-
-        DECL_LINK( OnAsyncDisplayError, void* );
+        DECL_LINK_TYPED( OnAsyncGetCellFocus, void*, void );
+        DECL_LINK_TYPED( OnAsyncDisplayError, void*, void );
     };
 }