Convert vcl Button Link<> click handler to typed Link<Button*,void>

Change-Id: Ie80dfb003118d40741549c41ebcc7eda4819f05b

53 files changed, 148 insertions, 202 deletions

diff --git a/dbaccess/source/ui/control/FieldDescControl.cxx b/dbaccess/source/ui/control/FieldDescControl.cxx
index 6440a2c3b2bf..d2a95d8d6fb3 100644
--- a/dbaccess/source/ui/control/FieldDescControl.cxx
+++ b/dbaccess/source/ui/control/FieldDescControl.cxx
@@ -584,18 +584,18 @@ void OFieldDescControl::SetControlText( sal_uInt16 nControlId, const OUString& r
     }
 }
 
-IMPL_LINK( OFieldDescControl, FormatClickHdl, Button *, /*pButton*/ )
+IMPL_LINK_NOARG_TYPED( OFieldDescControl, FormatClickHdl, Button *, void )
 {
     // Create temporary Column, which is used for data exchange with Dialog
     if( !pActFieldDescr )
-        return 0;
+        return;
 
     sal_Int32 nOldFormatKey(pActFieldDescr->GetFormatKey());
     SvxCellHorJustify rOldJustify = pActFieldDescr->GetHorJustify();
     Reference< XNumberFormatsSupplier >  xSupplier = GetFormatter()->getNumberFormatsSupplier();
     SvNumberFormatsSupplierObj* pSupplierImpl = SvNumberFormatsSupplierObj::getImplementation( xSupplier );
     if (!pSupplierImpl)
-        return 0;
+        return;
 
     SvNumberFormatter* pFormatter = pSupplierImpl->GetNumberFormatter();
     if(::dbaui::callColumnFormatDialog(this,pFormatter,pActFieldDescr->GetType(),nOldFormatKey,rOldJustify,true))
@@ -618,7 +618,6 @@ IMPL_LINK( OFieldDescControl, FormatClickHdl, Button *, /*pButton*/ )
             UpdateFormatSample(pActFieldDescr);
         }
     }
-    return 0;
 }
 
 void OFieldDescControl::SetModified(bool /*bModified*/)
diff --git a/dbaccess/source/ui/dlg/CollectionView.cxx b/dbaccess/source/ui/dlg/CollectionView.cxx
index e90f0fd153e9..57d42019cd78 100644
--- a/dbaccess/source/ui/dlg/CollectionView.cxx
+++ b/dbaccess/source/ui/dlg/CollectionView.cxx
@@ -107,11 +107,11 @@ void OCollectionView::dispose()
     ModalDialog::dispose();
 }
 
-IMPL_LINK_NOARG(OCollectionView, Save_Click)
+IMPL_LINK_NOARG_TYPED(OCollectionView, Save_Click, Button*, void)
 {
     OUString sName = m_pName->GetText();
     if ( sName.isEmpty() )
-        return 0;
+        return;
     try
     {
         OUString sSubFolder = m_pView->GetCurrentURL();
@@ -170,7 +170,7 @@ IMPL_LINK_NOARG(OCollectionView, Save_Click)
                     pRequest->addContinuation(pApprove);
                     xHandler->handle(xRequest);
 
-                    return 0;
+                    return;
                 }
             }
         }
@@ -182,7 +182,7 @@ IMPL_LINK_NOARG(OCollectionView, Save_Click)
             {
                 ScopedVclPtrInstance< QueryBox > aBox( this, WB_YES_NO, ModuleRes( STR_ALREADYEXISTOVERWRITE ) );
                 if ( aBox->Execute() != RET_YES )
-                    return 0;
+                    return;
             }
             m_pName->SetText(sName);
             EndDialog( RET_OK );
@@ -192,10 +192,9 @@ IMPL_LINK_NOARG(OCollectionView, Save_Click)
     {
         DBG_UNHANDLED_EXCEPTION();
     }
-    return 0;
 }
 
-IMPL_LINK_NOARG(OCollectionView, NewFolder_Click)
+IMPL_LINK_NOARG_TYPED(OCollectionView, NewFolder_Click, Button*, void)
 {
     try
     {
@@ -211,10 +210,9 @@ IMPL_LINK_NOARG(OCollectionView, NewFolder_Click)
     {
         DBG_UNHANDLED_EXCEPTION();
     }
-    return 0;
 }
 
-IMPL_LINK_NOARG(OCollectionView, Up_Click)
+IMPL_LINK_NOARG_TYPED(OCollectionView, Up_Click, Button*, void)
 {
     try
     {
@@ -236,7 +234,6 @@ IMPL_LINK_NOARG(OCollectionView, Up_Click)
     {
         DBG_UNHANDLED_EXCEPTION();
     }
-    return 0;
 }
 
 IMPL_LINK_NOARG(OCollectionView, Dbl_Click_FileView)
diff --git a/dbaccess/source/ui/dlg/ConnectionHelper.cxx b/dbaccess/source/ui/dlg/ConnectionHelper.cxx
index 24d1ebd66871..a28fd3a9b402 100644
--- a/dbaccess/source/ui/dlg/ConnectionHelper.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionHelper.cxx
@@ -164,7 +164,7 @@ namespace dbaui
             m_pAdminDialog->enableConfirmSettings( !getURLNoPrefix().isEmpty() );
     }
 
-    IMPL_LINK(OConnectionHelper, OnBrowseConnections, PushButton*, /*_pButton*/)
+    IMPL_LINK_NOARG_TYPED(OConnectionHelper, OnBrowseConnections, Button*, void)
     {
         OSL_ENSURE(m_pAdminDialog,"No Admin dialog set! ->GPF");
         const ::dbaccess::DATASOURCE_TYPE eType = m_pCollection->determineType(m_eType);
@@ -185,7 +185,7 @@ namespace dbaui
                             xFolderPicker->setDisplayDirectory(sOldPath);
                         if (0 == xFolderPicker->execute())
                             // cancelled by the user
-                            return 0L;
+                            return;
 
                         sOldPath = xFolderPicker->getDirectory();
                         switch (checkPathExistence(sOldPath))
@@ -194,7 +194,7 @@ namespace dbaui
                                 bDoBrowse = true;
                                 break;
                             case RET_CANCEL:
-                                return 0L;
+                                return;
                             default:
                                 break;
                         }
@@ -265,7 +265,7 @@ namespace dbaui
                     callModifiedHdl();
                 }
                 else
-                    return 1L;
+                    return;
             }
             break;
 #ifdef _ADO_DATALINK_BROWSE_
@@ -282,7 +282,7 @@ namespace dbaui
                     callModifiedHdl();
                 }
                 else
-                    return 1L;
+                    return;
             }
             break;
 #endif
@@ -337,11 +337,9 @@ namespace dbaui
         }
 
         checkTestConnection();
-
-        return 0L;
     }
 
-    IMPL_LINK(OConnectionHelper, OnCreateDatabase, PushButton*, /*_pButton*/)
+    IMPL_LINK_NOARG_TYPED(OConnectionHelper, OnCreateDatabase, Button*, void)
     {
         OSL_ENSURE(m_pAdminDialog,"No Admin dialog set! ->GPF");
         const ::dbaccess::DATASOURCE_TYPE eType = m_pCollection->determineType(m_eType);
@@ -363,8 +361,6 @@ namespace dbaui
         }
 
         checkTestConnection();
-
-        return 0L;
     }
 
     bool OConnectionHelper::checkTestConnection()
diff --git a/dbaccess/source/ui/dlg/ConnectionHelper.hxx b/dbaccess/source/ui/dlg/ConnectionHelper.hxx
index 9fd69e7459c4..2f80e5d3c678 100644
--- a/dbaccess/source/ui/dlg/ConnectionHelper.hxx
+++ b/dbaccess/source/ui/dlg/ConnectionHelper.hxx
@@ -91,8 +91,8 @@ namespace dbaui
         virtual bool    checkTestConnection();
 
     private:
-        DECL_LINK(OnBrowseConnections, PushButton*);
-        DECL_LINK(OnCreateDatabase, PushButton*);
+        DECL_LINK_TYPED(OnBrowseConnections, Button*, void);
+        DECL_LINK_TYPED(OnCreateDatabase, Button*, void);
         OUString    impl_getURL( bool _bPrefix ) const;
         void        impl_setURL( const OUString& _rURL, bool _bPrefix );
         void        implUpdateURLDependentStates() const;
diff --git a/dbaccess/source/ui/dlg/ConnectionPage.cxx b/dbaccess/source/ui/dlg/ConnectionPage.cxx
index b9c8fba68944..5d79776b5cca 100644
--- a/dbaccess/source/ui/dlg/ConnectionPage.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionPage.cxx
@@ -104,7 +104,7 @@ namespace dbaui
         m_pJavaDriver->SetModifyHdl(getControlModifiedLink());
         m_pJavaDriver->SetModifyHdl(LINK(this, OConnectionTabPage, OnEditModified));
         m_pUserName->SetModifyHdl(getControlModifiedLink());
-        m_pPasswordRequired->SetClickHdl(getControlModifiedLink());
+        m_pPasswordRequired->SetClickHdl(getControlModifiedClickLink());
 
         m_pTestConnection->SetClickHdl(LINK(this,OGenericAdministrationPage,OnTestConnectionClickHdl));
         m_pTestJavaDriver->SetClickHdl(LINK(this,OConnectionTabPage,OnTestJavaClickHdl));
@@ -288,7 +288,7 @@ namespace dbaui
 
         return bChangedSomething;
     }
-    IMPL_LINK(OConnectionTabPage, OnTestJavaClickHdl, PushButton*, /*_pButton*/)
+    IMPL_LINK_NOARG_TYPED(OConnectionTabPage, OnTestJavaClickHdl, Button*, void)
     {
         OSL_ENSURE(m_pAdminDialog,"No Admin dialog set! ->GPF");
         bool bSuccess = false;
@@ -311,7 +311,6 @@ namespace dbaui
         const OSQLMessageBox::MessageType mt = bSuccess ? OSQLMessageBox::Info : OSQLMessageBox::Error;
         ScopedVclPtrInstance< OSQLMessageBox > aMsg( this, OUString( ModuleRes( nMessage ) ), OUString(), WB_OK | WB_DEF_OK, mt );
         aMsg->Execute();
-        return 0L;
     }
     bool OConnectionTabPage::checkTestConnection()
     {
diff --git a/dbaccess/source/ui/dlg/ConnectionPage.hxx b/dbaccess/source/ui/dlg/ConnectionPage.hxx
index 6f373cc24426..e7f41afbda7e 100644
--- a/dbaccess/source/ui/dlg/ConnectionPage.hxx
+++ b/dbaccess/source/ui/dlg/ConnectionPage.hxx
@@ -52,7 +52,7 @@ namespace dbaui
         VclPtr<PushButton>         m_pTestConnection;
 
         // called when the test connection button was clicked
-        DECL_LINK(OnTestJavaClickHdl, PushButton*);
+        DECL_LINK_TYPED(OnTestJavaClickHdl, Button*, void);
         DECL_LINK(OnEditModified, Edit*);
 
     public:
diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
index 4d3a5817fd77..54ae2b4e6138 100644
--- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
+++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
@@ -373,11 +373,6 @@ using namespace ::com::sun::star;
         OnModified( NULL );
     }
 
-    Link<> MySQLNativeSetupPage::getControlModifiedLink()
-    {
-        return LINK( this, MySQLNativeSetupPage, OnModified );
-    }
-
     IMPL_LINK( MySQLNativeSetupPage, OnModified, Edit*, _pEdit )
     {
         SetRoadmapStateValue( m_aMySQLSettings->canAdvance() );
@@ -540,7 +535,7 @@ using namespace ::com::sun::star;
         SetRoadmapStateValue(bRoadmapState);
     }
 
-    IMPL_LINK(OGeneralSpecialJDBCConnectionPageSetup, OnTestJavaClickHdl, PushButton*, /*_pButton*/)
+    IMPL_LINK_NOARG_TYPED(OGeneralSpecialJDBCConnectionPageSetup, OnTestJavaClickHdl, Button*, void)
     {
         OSL_ENSURE(m_pAdminDialog,"No Admin dialog set! ->GPF");
 
@@ -564,7 +559,6 @@ using namespace ::com::sun::star;
         const OSQLMessageBox::MessageType mt = bSuccess ? OSQLMessageBox::Info : OSQLMessageBox::Error;
         ScopedVclPtrInstance< OSQLMessageBox > aMsg( this, OUString( ModuleRes( nMessage ) ), OUString(), WB_OK | WB_DEF_OK, mt );
         aMsg->Execute();
-        return 0L;
     }
 
     IMPL_LINK(OGeneralSpecialJDBCConnectionPageSetup, OnEditModified, Edit*, _pEdit)
@@ -664,7 +658,7 @@ using namespace ::com::sun::star;
         return bEnableTestConnection;
     }
 
-    IMPL_LINK(OJDBCConnectionPageSetup, OnTestJavaClickHdl, PushButton*, /*_pButton*/)
+    IMPL_LINK_NOARG_TYPED(OJDBCConnectionPageSetup, OnTestJavaClickHdl, Button*, void)
     {
         OSL_ENSURE(m_pAdminDialog,"No Admin dialog set! ->GPF");
         bool bSuccess = false;
@@ -686,7 +680,6 @@ using namespace ::com::sun::star;
         sal_uInt16 nMessage = bSuccess ? STR_JDBCDRIVER_SUCCESS : STR_JDBCDRIVER_NO_SUCCESS;
         ScopedVclPtrInstance< OSQLMessageBox > aMsg( this, OUString( ModuleRes( nMessage ) ), OUString() );
         aMsg->Execute();
-        return 0L;
     }
 
     IMPL_LINK(OJDBCConnectionPageSetup, OnEditModified, Edit*, _pEdit)
@@ -761,8 +754,8 @@ using namespace ::com::sun::star;
         get(m_pCBPasswordRequired, "passRequiredCheckbutton");
         get(m_pPBTestConnection, "testConnectionButton");
         m_pETUserName->SetModifyHdl(getControlModifiedLink());
-        m_pCBPasswordRequired->SetClickHdl(getControlModifiedLink());
-           m_pPBTestConnection->SetClickHdl(LINK(this,OGenericAdministrationPage,OnTestConnectionClickHdl));
+        m_pCBPasswordRequired->SetClickHdl(getControlModifiedClickLink());
+        m_pPBTestConnection->SetClickHdl(LINK(this,OGenericAdministrationPage,OnTestConnectionClickHdl));
 
         LayoutHelper::fitSizeRightAligned( *m_pPBTestConnection );
     }
@@ -843,7 +836,7 @@ using namespace ::com::sun::star;
         get(m_pFTFinalText, "finishText");
 
         m_pCBOpenAfterwards->SetClickHdl(LINK(this, OFinalDBPageSetup, OnOpenSelected));
-        m_pCBStartTableWizard->SetClickHdl(getControlModifiedLink());
+        m_pCBStartTableWizard->SetClickHdl(getControlModifiedClickLink());
         m_pRBRegisterDataSource->SetState(true);
     }
 
@@ -911,12 +904,10 @@ using namespace ::com::sun::star;
         return true;
     }
 
-    IMPL_LINK(OFinalDBPageSetup, OnOpenSelected, CheckBox*, _pBox)
+    IMPL_LINK_TYPED(OFinalDBPageSetup, OnOpenSelected, Button*, _pBox, void)
     {
-        m_pCBStartTableWizard->Enable( _pBox->IsEnabled() && _pBox->IsChecked() );
+        m_pCBStartTableWizard->Enable( _pBox->IsEnabled() && static_cast<CheckBox*>(_pBox)->IsChecked() );
         callModifiedHdl();
-        // outta here
-        return 0L;
     }
 }
 
diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx
index 4cb177cceb82..2bdaef0aa384 100644
--- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx
+++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx
@@ -127,7 +127,7 @@ namespace dbaui
         virtual bool FillItemSet( SfxItemSet* _rCoreAttrs ) SAL_OVERRIDE;
         virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) SAL_OVERRIDE;
 
-        virtual Link<> getControlModifiedLink() SAL_OVERRIDE;
+        virtual Link<> getControlModifiedLink() SAL_OVERRIDE { return LINK( this, MySQLNativeSetupPage, OnModified ); }
 
     private:
         DECL_LINK( OnModified, Edit* );
@@ -156,7 +156,7 @@ namespace dbaui
         virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE;
         virtual Link<> getControlModifiedLink() SAL_OVERRIDE { return LINK(this, OGeneralSpecialJDBCConnectionPageSetup, OnEditModified); }
 
-        DECL_LINK(OnTestJavaClickHdl,PushButton*);
+        DECL_LINK_TYPED(OnTestJavaClickHdl, Button*, void);
         DECL_LINK(OnEditModified,Edit*);
         VclPtr<FixedText>          m_pHeaderText;
         VclPtr<FixedText>          m_pFTHelpText;
@@ -193,7 +193,7 @@ namespace dbaui
         virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE;
         virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE;
 
-        DECL_LINK(OnTestJavaClickHdl,PushButton*);
+        DECL_LINK_TYPED(OnTestJavaClickHdl, Button*, void);
         DECL_LINK(OnEditModified,Edit*);
         VclPtr<FixedText>          m_pFTDriverClass;
         VclPtr<Edit>               m_pETDriverClass;
@@ -286,7 +286,7 @@ namespace dbaui
         /// may be used in SetXXXHdl calls to controls, is a link to <method>OnControlModified</method>
         Link<> getControlModifiedLink() SAL_OVERRIDE { return LINK(this, OGenericAdministrationPage, OnControlModified); }
 
-        DECL_LINK(OnOpenSelected, CheckBox*);
+        DECL_LINK_TYPED(OnOpenSelected, Button*, void);
     protected:
         virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) SAL_OVERRIDE;
         virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE;
diff --git a/dbaccess/source/ui/dlg/RelationDlg.cxx b/dbaccess/source/ui/dlg/RelationDlg.cxx
index a408c34b9786..7ce766d8c96f 100644
--- a/dbaccess/source/ui/dlg/RelationDlg.cxx
+++ b/dbaccess/source/ui/dlg/RelationDlg.cxx
@@ -152,7 +152,7 @@ void ORelationDialog::Init(const TTableConnectionData::value_type& _pConnectionD
     }
 }
 
-IMPL_LINK( ORelationDialog, OKClickHdl, Button*, /*pButton*/ )
+IMPL_LINK_NOARG_TYPED( ORelationDialog, OKClickHdl, Button*, void )
 {
     // RadioButtons auslesen
     sal_uInt16 nAttrib = 0;
@@ -197,7 +197,7 @@ IMPL_LINK( ORelationDialog, OKClickHdl, Button*, /*pButton*/ )
         {
             m_pOrigConnData->CopyFrom( *m_pConnData );
             EndDialog( RET_OK );
-            return 0L;
+            return;
         }
     }
     catch( const SQLException& )
@@ -219,8 +219,6 @@ IMPL_LINK( ORelationDialog, OKClickHdl, Button*, /*pButton*/ )
     Init(m_pConnData);
     m_xTableControl->Init( m_pConnData );
     m_xTableControl->lateInit();
-
-    return 0;
 }
 
 short ORelationDialog::Execute()
diff --git a/dbaccess/source/ui/dlg/UserAdmin.cxx b/dbaccess/source/ui/dlg/UserAdmin.cxx
index 5e9afea0f7ea..e4a7c8d46e9a 100644
--- a/dbaccess/source/ui/dlg/UserAdmin.cxx
+++ b/dbaccess/source/ui/dlg/UserAdmin.cxx
@@ -57,7 +57,7 @@ class OPasswordDialog : public ModalDialog
     VclPtr<Edit>     m_pEDPasswordRepeat;
     VclPtr<OKButton> m_pOKBtn;
 
-    DECL_LINK( OKHdl_Impl, void * );
+    DECL_LINK_TYPED( OKHdl_Impl, Button*, void );
     DECL_LINK( ModifiedHdl, Edit * );
 
 public:
@@ -95,7 +95,7 @@ OPasswordDialog::OPasswordDialog(vcl::Window* _pParent,const OUString& _sUserNam
     m_pEDOldPassword->SetModifyHdl( LINK( this, OPasswordDialog, ModifiedHdl ) );
 }
 
-IMPL_LINK_NOARG(OPasswordDialog, OKHdl_Impl)
+IMPL_LINK_NOARG_TYPED(OPasswordDialog, OKHdl_Impl, Button*, void)
 {
     if( m_pEDPassword->GetText() == m_pEDPasswordRepeat->GetText() )
         EndDialog( RET_OK );
@@ -108,7 +108,6 @@ IMPL_LINK_NOARG(OPasswordDialog, OKHdl_Impl)
         m_pEDPasswordRepeat->SetText( OUString() );
         m_pEDPassword->GrabFocus();
     }
-    return 0;
 }
 
 IMPL_LINK( OPasswordDialog, ModifiedHdl, Edit *, pEdit )
@@ -207,7 +206,7 @@ VclPtr<SfxTabPage> OUserAdmin::Create( vcl::Window* pParent, const SfxItemSet* _
     return VclPtr<OUserAdmin>::Create( pParent, *_rAttrSet );
 }
 
-IMPL_LINK( OUserAdmin, UserHdl, PushButton *, pButton )
+IMPL_LINK_TYPED( OUserAdmin, UserHdl, Button *, pButton, void )
 {
     try
     {
@@ -270,14 +269,10 @@ IMPL_LINK( OUserAdmin, UserHdl, PushButton *, pButton )
     catch(const SQLException& e)
     {
         ::dbaui::showError(::dbtools::SQLExceptionInfo(e), this, m_xORB);
-        return 0;
     }
     catch(Exception& )
     {
-        return 0;
     }
-
-    return 0;
 }
 
 IMPL_LINK( OUserAdmin, ListDblClickHdl, ListBox *, /*pListBox*/ )
diff --git a/dbaccess/source/ui/dlg/UserAdmin.hxx b/dbaccess/source/ui/dlg/UserAdmin.hxx
index d3084e220bc1..7aad1f80e3e9 100644
--- a/dbaccess/source/ui/dlg/UserAdmin.hxx
+++ b/dbaccess/source/ui/dlg/UserAdmin.hxx
@@ -57,7 +57,7 @@ protected:
     // methods
     DECL_LINK( ListDblClickHdl, ListBox * );
     DECL_LINK( CloseHdl,        PushButton * );
-    DECL_LINK( UserHdl,         PushButton * );
+    DECL_LINK_TYPED( UserHdl,   Button *, void );
 
     void        FillUserNames();
 
diff --git a/dbaccess/source/ui/dlg/adminpages.cxx b/dbaccess/source/ui/dlg/adminpages.cxx
index 1b5dbba4fb9c..8e8b0f4a3080 100644
--- a/dbaccess/source/ui/dlg/adminpages.cxx
+++ b/dbaccess/source/ui/dlg/adminpages.cxx
@@ -102,10 +102,14 @@ namespace dbaui
         _rReadonly = !_rValid || (pReadonly && pReadonly->GetValue());
     }
 
-    IMPL_LINK_NOARG(OGenericAdministrationPage, OnControlModified)
+    IMPL_LINK(OGenericAdministrationPage, OnControlModified, Button*, /*pCtrl*/)
     {
         callModifiedHdl();
-        return 0L;
+        return 0;
+    }
+    IMPL_LINK_TYPED(OGenericAdministrationPage, OnControlModifiedClick, Button*, pCtrl, void)
+    {
+        getControlModifiedLink().Call(pCtrl);
     }
     bool OGenericAdministrationPage::getSelectedDataSource(OUString& _sReturn, OUString& _sCurr)
     {
@@ -209,7 +213,7 @@ namespace dbaui
         }
     }
 
-    IMPL_LINK(OGenericAdministrationPage, OnTestConnectionClickHdl, PushButton*, /*_pButton*/)
+    IMPL_LINK_NOARG_TYPED(OGenericAdministrationPage, OnTestConnectionClickHdl, Button*, void)
     {
         OSL_ENSURE(m_pAdminDialog,"No Admin dialog set! ->GPF");
         bool bSuccess = false;
@@ -248,7 +252,6 @@ namespace dbaui
             if ( !bSuccess )
                 m_pAdminDialog->clearPassword();
         }
-        return 0L;
     }
 
     // LayoutHelper
diff --git a/dbaccess/source/ui/dlg/adminpages.hxx b/dbaccess/source/ui/dlg/adminpages.hxx
index dfc47c8e11a7..a87342fed9bb 100644
--- a/dbaccess/source/ui/dlg/adminpages.hxx
+++ b/dbaccess/source/ui/dlg/adminpages.hxx
@@ -230,11 +230,15 @@ namespace dbaui
         /** This link be used for controls where the tabpage does not need to take any special action when the control
             is modified. The implementation just calls callModifiedHdl.
         */
-        DECL_LINK(OnControlModified, void*);
-        DECL_LINK(OnTestConnectionClickHdl, PushButton*);
+        DECL_LINK(OnControlModified, Button*);
+        DECL_LINK_TYPED(OnTestConnectionClickHdl, Button*, void);
 
         /// may be used in SetXXXHdl calls to controls, is a link to <method>OnControlModified</method>
         virtual Link<> getControlModifiedLink() { return LINK(this, OGenericAdministrationPage, OnControlModified); }
+        // calls via getControlModifiedLink()
+        Link<Button*,void> getControlModifiedClickLink() { return LINK(this, OGenericAdministrationPage, OnControlModifiedClick); }
+    private:
+        DECL_LINK_TYPED(OnControlModifiedClick, Button*, void);
     };
 
     // ControlRelation
diff --git a/dbaccess/source/ui/dlg/adtabdlg.cxx b/dbaccess/source/ui/dlg/adtabdlg.cxx
index cd5e097f8165..575af56e9b00 100644
--- a/dbaccess/source/ui/dlg/adtabdlg.cxx
+++ b/dbaccess/source/ui/dlg/adtabdlg.cxx
@@ -417,10 +417,9 @@ void OAddTableDlg::impl_addTable()
     }
 }
 
-IMPL_LINK( OAddTableDlg, AddClickHdl, Button*, /*pButton*/ )
+IMPL_LINK_NOARG_TYPED( OAddTableDlg, AddClickHdl, Button*, void )
 {
     TableListDoubleClickHdl(NULL);
-    return 0;
 }
 
 IMPL_LINK_NOARG( OAddTableDlg, TableListDoubleClickHdl )
@@ -442,18 +441,17 @@ IMPL_LINK_NOARG( OAddTableDlg, TableListSelectHdl )
     return 0;
 }
 
-IMPL_LINK( OAddTableDlg, CloseClickHdl, Button*, /*pButton*/ )
+IMPL_LINK_NOARG_TYPED( OAddTableDlg, CloseClickHdl, Button*, void )
 {
-    return int(Close());
+    Close();
 }
 
-IMPL_LINK_NOARG( OAddTableDlg, OnTypeSelected )
+IMPL_LINK_NOARG_TYPED( OAddTableDlg, OnTypeSelected, Button*, void )
 {
     if ( m_pCaseTables->IsChecked() )
         impl_switchTo( Tables );
     else
         impl_switchTo( Queries );
-    return 0;
 }
 
 bool OAddTableDlg::Close()
diff --git a/dbaccess/source/ui/dlg/advancedsettings.cxx b/dbaccess/source/ui/dlg/advancedsettings.cxx
index 45d57e73db2d..0f6e7bc6985f 100644
--- a/dbaccess/source/ui/dlg/advancedsettings.cxx
+++ b/dbaccess/source/ui/dlg/advancedsettings.cxx
@@ -100,7 +100,7 @@ namespace dbaui
             if ( rFeatures.has( nItemId ) )
             {
                 get(*setting->ppControl, setting->sControlId);
-                (*setting->ppControl)->SetClickHdl( getControlModifiedLink() );
+                (*setting->ppControl)->SetClickHdl( getControlModifiedClickLink() );
                 (*setting->ppControl)->Show();
 
                 // check whether this must be a tristate check box
@@ -336,7 +336,7 @@ namespace dbaui
         get(m_pAutoRetrievingLabel, "queryft");
         get(m_pAutoRetrieving, "query");
 
-        m_pAutoRetrievingEnabled->SetClickHdl( getControlModifiedLink() );
+        m_pAutoRetrievingEnabled->SetClickHdl( getControlModifiedClickLink() );
         m_pAutoIncrement->SetModifyHdl( getControlModifiedLink() );
         m_pAutoRetrieving->SetModifyHdl( getControlModifiedLink() );
 
diff --git a/dbaccess/source/ui/dlg/advancedsettings.hxx b/dbaccess/source/ui/dlg/advancedsettings.hxx
index 7c08e920a687..accd6c301d95 100644
--- a/dbaccess/source/ui/dlg/advancedsettings.hxx
+++ b/dbaccess/source/ui/dlg/advancedsettings.hxx
@@ -91,6 +91,7 @@ namespace dbaui
 
     private:
         void    impl_initBooleanSettings();
+        DECL_LINK(ClickHdl, Button*);
     };
 
     // GeneratedValuesPage
diff --git a/dbaccess/source/ui/dlg/dbfindex.cxx b/dbaccess/source/ui/dlg/dbfindex.cxx
index 2ee6700967c4..6bea91f71364 100644
--- a/dbaccess/source/ui/dlg/dbfindex.cxx
+++ b/dbaccess/source/ui/dlg/dbfindex.cxx
@@ -188,7 +188,7 @@ void ODbaseIndexDialog::InsertTableIndex( const OUString& _rTableName, const OTa
     implInsertIndex(_rIndex, aTablePos->aIndexList, *m_pLB_TableIndexes);
 }
 
-IMPL_LINK( ODbaseIndexDialog, OKClickHdl, PushButton*, /*pButton*/ )
+IMPL_LINK_NOARG_TYPED( ODbaseIndexDialog, OKClickHdl, Button*, void )
 {
     // let all tables write their INF file
 
@@ -199,10 +199,9 @@ IMPL_LINK( ODbaseIndexDialog, OKClickHdl, PushButton*, /*pButton*/ )
         aLoop->WriteInfFile(m_aDSN);
 
     EndDialog();
-    return 0;
 }
 
-IMPL_LINK( ODbaseIndexDialog, AddClickHdl, PushButton*, /*pButton*/ )
+IMPL_LINK_NOARG_TYPED( ODbaseIndexDialog, AddClickHdl, Button*, void )
 {
     OUString aSelection = m_pLB_FreeIndexes->GetSelectEntry();
     OUString aTableName = m_pCB_Tables->GetText();
@@ -210,10 +209,9 @@ IMPL_LINK( ODbaseIndexDialog, AddClickHdl, PushButton*, /*pButton*/ )
     InsertTableIndex( aTableName, aIndex );
 
     checkButtons();
-    return 0;
 }
 
-IMPL_LINK( ODbaseIndexDialog, RemoveClickHdl, PushButton*, /*pButton*/ )
+IMPL_LINK_NOARG_TYPED( ODbaseIndexDialog, RemoveClickHdl, Button*, void )
 {
     OUString aSelection = m_pLB_TableIndexes->GetSelectEntry();
     OUString aTableName = m_pCB_Tables->GetText();
@@ -221,10 +219,9 @@ IMPL_LINK( ODbaseIndexDialog, RemoveClickHdl, PushButton*, /*pButton*/ )
     InsertFreeIndex( aIndex );
 
     checkButtons();
-    return 0;
 }
 
-IMPL_LINK( ODbaseIndexDialog, AddAllClickHdl, PushButton*, /*pButton*/ )
+IMPL_LINK_NOARG_TYPED( ODbaseIndexDialog, AddAllClickHdl, Button*, void )
 {
     sal_uInt16 nCnt = m_pLB_FreeIndexes->GetEntryCount();
     OUString aTableName = m_pCB_Tables->GetText();
@@ -233,10 +230,9 @@ IMPL_LINK( ODbaseIndexDialog, AddAllClickHdl, PushButton*, /*pButton*/ )
         InsertTableIndex( aTableName, RemoveFreeIndex( m_pLB_FreeIndexes->GetEntry(0), true ) );
 
     checkButtons();
-    return 0;
 }
 
-IMPL_LINK( ODbaseIndexDialog, RemoveAllClickHdl, PushButton*, /*pButton*/ )
+IMPL_LINK_NOARG_TYPED( ODbaseIndexDialog, RemoveAllClickHdl, Button*, void )
 {
     sal_uInt16 nCnt = m_pLB_TableIndexes->GetEntryCount();
     OUString aTableName = m_pCB_Tables->GetText();
@@ -245,7 +241,6 @@ IMPL_LINK( ODbaseIndexDialog, RemoveAllClickHdl, PushButton*, /*pButton*/ )
         InsertFreeIndex( RemoveTableIndex( aTableName, m_pLB_TableIndexes->GetEntry(0), true ) );
 
     checkButtons();
-    return 0;
 }
 
 IMPL_LINK( ODbaseIndexDialog, OnListEntrySelected, ListBox*, /*NOTINTERESTEDIN*/ )
diff --git a/dbaccess/source/ui/dlg/dbfindex.hxx b/dbaccess/source/ui/dlg/dbfindex.hxx
index 8feeff259ca9..ef0c43a7dde4 100644
--- a/dbaccess/source/ui/dlg/dbfindex.hxx
+++ b/dbaccess/source/ui/dlg/dbfindex.hxx
@@ -85,11 +85,11 @@ protected:
     VclPtr<PushButton>     m_pRemoveAll;
 
     DECL_LINK( TableSelectHdl, ComboBox* );
-    DECL_LINK( AddClickHdl, PushButton* );
-    DECL_LINK( RemoveClickHdl, PushButton* );
-    DECL_LINK( AddAllClickHdl, PushButton* );
-    DECL_LINK( RemoveAllClickHdl, PushButton* );
-    DECL_LINK( OKClickHdl, PushButton* );
+    DECL_LINK_TYPED( AddClickHdl, Button*, void );
+    DECL_LINK_TYPED( RemoveClickHdl, Button*, void );
+    DECL_LINK_TYPED( AddAllClickHdl, Button*, void );
+    DECL_LINK_TYPED( RemoveAllClickHdl, Button*, void );
+    DECL_LINK_TYPED( OKClickHdl, Button*, void );
     DECL_LINK( OnListEntrySelected, ListBox* );
 
     OUString            m_aDSN;
diff --git a/dbaccess/source/ui/dlg/detailpages.cxx b/dbaccess/source/ui/dlg/detailpages.cxx
index b090ddc8df06..d51829ca1655 100644
--- a/dbaccess/source/ui/dlg/detailpages.cxx
+++ b/dbaccess/source/ui/dlg/detailpages.cxx
@@ -243,7 +243,7 @@ namespace dbaui
         return bChangedSomething;
     }
 
-    IMPL_LINK( ODbaseDetailsPage, OnButtonClicked, Button*, pButton )
+    IMPL_LINK_TYPED( ODbaseDetailsPage, OnButtonClicked, Button*, pButton, void )
     {
         if (m_pIndexes == pButton)
         {
@@ -256,8 +256,6 @@ namespace dbaui
             // it was one of the checkboxes -> we count as modified from now on
             callModifiedHdl();
         }
-
-        return 0;
     }
 
     // OAdoDetailsPage
@@ -516,7 +514,7 @@ namespace dbaui
             m_pEDDriverClass->SetModifyFlag();
         }
     }
-    IMPL_LINK(OGeneralSpecialJDBCDetailsPage, OnTestJavaClickHdl, PushButton*, /*_pButton*/)
+    IMPL_LINK_NOARG_TYPED(OGeneralSpecialJDBCDetailsPage, OnTestJavaClickHdl, Button*, void)
     {
         OSL_ENSURE(m_pAdminDialog,"No Admin dialog set! ->GPF");
         OSL_ENSURE(m_bUseClass,"Who called me?");
@@ -541,7 +539,6 @@ namespace dbaui
         const OSQLMessageBox::MessageType mt = bSuccess ? OSQLMessageBox::Info : OSQLMessageBox::Error;
         ScopedVclPtrInstance< OSQLMessageBox > aMsg( this, OUString( ModuleRes( nMessage ) ), OUString(), WB_OK | WB_DEF_OK, mt );
         aMsg->Execute();
-        return 0L;
     }
     IMPL_LINK(OGeneralSpecialJDBCDetailsPage, OnEditModified, Edit*, _pEdit)
     {
@@ -704,7 +701,7 @@ namespace dbaui
         fillBool(*_rSet,m_pCBUseSSL,DSID_CONN_LDAP_USESSL,bChangedSomething);
         return bChangedSomething;
     }
-    IMPL_LINK( OLDAPDetailsPage, OnCheckBoxClick, CheckBox*, pCheckBox )
+    IMPL_LINK_TYPED( OLDAPDetailsPage, OnCheckBoxClick, Button*, pCheckBox, void )
     {
         callModifiedHdl();
         if ( pCheckBox == m_pCBUseSSL)
@@ -720,7 +717,6 @@ namespace dbaui
                 m_pNFPortNumber->SetValue(m_iNormalPort);
             }
         }
-        return 0;
     }
 
     void OLDAPDetailsPage::implInitControls(const SfxItemSet& _rSet, bool _bSaveValue)
diff --git a/dbaccess/source/ui/dlg/detailpages.hxx b/dbaccess/source/ui/dlg/detailpages.hxx
index 407a986c2c1c..7ab4d970a469 100644
--- a/dbaccess/source/ui/dlg/detailpages.hxx
+++ b/dbaccess/source/ui/dlg/detailpages.hxx
@@ -104,7 +104,7 @@ namespace dbaui
         virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) SAL_OVERRIDE;
 
     private:
-        DECL_LINK( OnButtonClicked, Button * );
+        DECL_LINK_TYPED( OnButtonClicked, Button *, void );
     };
 
     // OAdoDetailsPage
@@ -174,7 +174,7 @@ namespace dbaui
         virtual bool FillItemSet( SfxItemSet* _rCoreAttrs ) SAL_OVERRIDE;
         virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) SAL_OVERRIDE;
 
-        DECL_LINK(OnTestJavaClickHdl,PushButton*);
+        DECL_LINK_TYPED(OnTestJavaClickHdl, Button*, void);
         DECL_LINK(OnEditModified,Edit*);
 
         VclPtr<Edit>               m_pEDHostname;
@@ -235,7 +235,7 @@ namespace dbaui
 
         sal_Int32           m_iSSLPort;
         sal_Int32           m_iNormalPort;
-        DECL_LINK( OnCheckBoxClick, CheckBox * );
+        DECL_LINK_TYPED( OnCheckBoxClick, Button*, void );
     };
 
     // OMozillaDetailsPage Detail page for Mozilla and Thunderbird addressbook
diff --git a/dbaccess/source/ui/dlg/directsql.cxx b/dbaccess/source/ui/dlg/directsql.cxx
index 120d075411f5..b97d8ed546cc 100644
--- a/dbaccess/source/ui/dlg/directsql.cxx
+++ b/dbaccess/source/ui/dlg/directsql.cxx
@@ -60,7 +60,7 @@ namespace dbaui
         m_pSQL->GrabFocus();
 
         m_pExecute->SetClickHdl(LINK(this, DirectSQLDialog, OnExecute));
-        m_pClose->SetClickHdl(LINK(this, DirectSQLDialog, OnClose));
+        m_pClose->SetClickHdl(LINK(this, DirectSQLDialog, OnCloseClick));
         m_pSQLHistory->SetSelectHdl(LINK(this, DirectSQLDialog, OnListEntrySelected));
         m_pSQLHistory->SetDropDownLineCount(10);
 
@@ -314,16 +314,19 @@ namespace dbaui
         return 0L;
     }
 
+    IMPL_LINK_NOARG_TYPED( DirectSQLDialog, OnCloseClick, Button*, void )
+    {
+        EndDialog( RET_OK );
+    }
     IMPL_LINK_NOARG( DirectSQLDialog, OnClose )
     {
         EndDialog( RET_OK );
         return 0L;
     }
 
-    IMPL_LINK_NOARG( DirectSQLDialog, OnExecute )
+    IMPL_LINK_NOARG_TYPED( DirectSQLDialog, OnExecute, Button*, void )
     {
         executeCurrent();
-        return 0L;
     }
 
     IMPL_LINK_NOARG( DirectSQLDialog, OnListEntrySelected )
diff --git a/dbaccess/source/ui/dlg/dlgsave.cxx b/dbaccess/source/ui/dlg/dlgsave.cxx
index 39239d839d11..dbb78c608a93 100644
--- a/dbaccess/source/ui/dlg/dlgsave.cxx
+++ b/dbaccess/source/ui/dlg/dlgsave.cxx
@@ -293,7 +293,7 @@ void OSaveAsDlg::dispose()
     ModalDialog::dispose();
 }
 
-IMPL_LINK(OSaveAsDlg, ButtonClickHdl, Button *, pButton)
+IMPL_LINK_TYPED(OSaveAsDlg, ButtonClickHdl, Button *, pButton, void)
 {
     if (pButton == m_pImpl->m_pPB_OK)
     {
@@ -320,7 +320,6 @@ IMPL_LINK(OSaveAsDlg, ButtonClickHdl, Button *, pButton)
         showError( aNameError, this, m_xContext );
         m_pImpl->m_pTitle->GrabFocus();
     }
-    return 0;
 }
 
 IMPL_LINK(OSaveAsDlg, EditModifyHdl, Edit *, pEdit )
diff --git a/dbaccess/source/ui/dlg/dlgsize.cxx b/dbaccess/source/ui/dlg/dlgsize.cxx
index 6c254a494e84..eee8a4dd2097 100644
--- a/dbaccess/source/ui/dlg/dlgsize.cxx
+++ b/dbaccess/source/ui/dlg/dlgsize.cxx
@@ -76,9 +76,8 @@ sal_Int32 DlgSize::GetValue()
     return (sal_Int32)m_pMF_VALUE->GetValue( FUNIT_CM );
 }
 
-IMPL_LINK( DlgSize, CbClickHdl, Button *, pButton )
+IMPL_LINK_TYPED( DlgSize, CbClickHdl, Button *, pButton, void )
 {
-
     if( pButton == m_pCB_STANDARD )
     {
         m_pMF_VALUE->Enable(!m_pCB_STANDARD->IsChecked());
@@ -93,7 +92,6 @@ IMPL_LINK( DlgSize, CbClickHdl, Button *, pButton )
             SetValue( m_nPrevValue );
         }
     }
-    return 0;
 }
 
 }   // namespace dbaui
diff --git a/dbaccess/source/ui/dlg/generalpage.cxx b/dbaccess/source/ui/dlg/generalpage.cxx
index 663f0e0a04af..08bc95202364 100644
--- a/dbaccess/source/ui/dlg/generalpage.cxx
+++ b/dbaccess/source/ui/dlg/generalpage.cxx
@@ -699,21 +699,19 @@ namespace dbaui
         return aDocument;
     }
 
-    IMPL_LINK( OGeneralPageWizard, OnCreateDatabaseModeSelected, RadioButton*, /*_pBox*/ )
+    IMPL_LINK_NOARG_TYPED( OGeneralPageWizard, OnCreateDatabaseModeSelected, Button*, void )
     {
         if ( m_aCreationModeHandler.IsSet() )
             m_aCreationModeHandler.Call( this );
 
         OnEmbeddedDBTypeSelected( m_pEmbeddedDBType );
-        return 1L;
     }
 
-    IMPL_LINK( OGeneralPageWizard, OnSetupModeSelected, RadioButton*, /*_pBox*/ )
+    IMPL_LINK_NOARG_TYPED( OGeneralPageWizard, OnSetupModeSelected, Button*, void )
     {
         if ( m_aCreationModeHandler.IsSet() )
             m_aCreationModeHandler.Call( this );
         OnDatasourceTypeSelected(m_pDatasourceType);
-        return 1L;
     }
 
     IMPL_LINK( OGeneralPageWizard, OnDocumentSelected, ListBox*, /*_pBox*/ )
@@ -722,7 +720,7 @@ namespace dbaui
         return 0L;
     }
 
-    IMPL_LINK( OGeneralPageWizard, OnOpenDocument, PushButton*, /*_pBox*/ )
+    IMPL_LINK_NOARG_TYPED( OGeneralPageWizard, OnOpenDocument, Button*, void )
     {
         ::sfx2::FileDialogHelper aFileDlg(
                 ui::dialogs::TemplateDescription::FILEOPEN_READONLY_VERSION,
@@ -742,15 +740,12 @@ namespace dbaui
                 aError->Execute();
                 m_pRB_ConnectDatabase->Check();
                 OnSetupModeSelected( m_pRB_ConnectDatabase );
-                return 0L;
+                return;
             }
             m_aBrowsedDocument.sURL = sPath;
             m_aBrowsedDocument.sFilter.clear();
             m_aChooseDocumentHandler.Call( this );
-            return 1L;
         }
-
-        return 0L;
     }
 
 }   // namespace dbaui
diff --git a/dbaccess/source/ui/dlg/generalpage.hxx b/dbaccess/source/ui/dlg/generalpage.hxx
index 30b012cb7031..320b619ecd3b 100644
--- a/dbaccess/source/ui/dlg/generalpage.hxx
+++ b/dbaccess/source/ui/dlg/generalpage.hxx
@@ -186,10 +186,10 @@ namespace dbaui
 
     protected:
         DECL_LINK( OnEmbeddedDBTypeSelected, ListBox* );
-        DECL_LINK( OnCreateDatabaseModeSelected, RadioButton* );
-        DECL_LINK( OnSetupModeSelected, RadioButton* );
+        DECL_LINK_TYPED( OnCreateDatabaseModeSelected, Button*, void );
+        DECL_LINK_TYPED( OnSetupModeSelected, Button*, void );
         DECL_LINK( OnDocumentSelected, ListBox* );
-        DECL_LINK( OnOpenDocument, PushButton* );
+        DECL_LINK_TYPED( OnOpenDocument, Button*, void );
     };
 
 }   // namespace dbaui
diff --git a/dbaccess/source/ui/dlg/indexdialog.cxx b/dbaccess/source/ui/dlg/indexdialog.cxx
index 9f0e584c2a4e..6fff7c236cd1 100644
--- a/dbaccess/source/ui/dlg/indexdialog.cxx
+++ b/dbaccess/source/ui/dlg/indexdialog.cxx
@@ -237,7 +237,7 @@ namespace dbaui
 
         fillIndexList();
 
-        m_pUnique->SetClickHdl(LINK(this, DbaIndexDialog, OnModified));
+        m_pUnique->SetClickHdl(LINK(this, DbaIndexDialog, OnModifiedClick));
         m_pFields->SetModifyHdl(LINK(this, DbaIndexDialog, OnModified));
 
         m_pClose->SetClickHdl(LINK(this, DbaIndexDialog, OnCloseDialog));
@@ -557,7 +557,7 @@ namespace dbaui
             OnResetIndex();
     }
 
-    IMPL_LINK_NOARG( DbaIndexDialog, OnCloseDialog )
+    IMPL_LINK_NOARG_TYPED( DbaIndexDialog, OnCloseDialog, Button*, void )
     {
         if (m_pIndexList->IsEditingActive())
         {
@@ -567,7 +567,7 @@ namespace dbaui
             m_pIndexList->EndEditing();
             if (m_bEditAgain)
                 // could not commit the new name (started a new - asynchronous - edit trial)
-                return 1L;
+                return;
         }
 
         // the currently selected entry
@@ -592,17 +592,15 @@ namespace dbaui
         {
             case RET_YES:
                 if (!implCommitPreviouslySelected())
-                    return 1L;
+                    return;
                 break;
             case RET_NO:
                 break;
             default:
-                return 1L;
+                return;
         }
 
         EndDialog(RET_OK);
-
-        return 0L;
     }
 
     IMPL_LINK( DbaIndexDialog, OnEditIndexAgain, SvTreeListEntry*, _pEntry )
@@ -733,6 +731,10 @@ namespace dbaui
         return true;
     }
 
+    IMPL_LINK_NOARG_TYPED( DbaIndexDialog, OnModifiedClick, Button*, void )
+    {
+        OnModified(NULL);
+    }
     IMPL_LINK_NOARG( DbaIndexDialog, OnModified )
     {
         OSL_ENSURE(m_pPreviousSelection, "DbaIndexDialog, OnModified: invalid call!");
diff --git a/dbaccess/source/ui/dlg/paramdialog.cxx b/dbaccess/source/ui/dlg/paramdialog.cxx
index e20d01c813c2..36766be76ca3 100644
--- a/dbaccess/source/ui/dlg/paramdialog.cxx
+++ b/dbaccess/source/ui/dlg/paramdialog.cxx
@@ -208,14 +208,14 @@ namespace dbaui
         return 0L;
     }
 
-    IMPL_LINK(OParameterDialog, OnButtonClicked, PushButton*, pButton)
+    IMPL_LINK_TYPED(OParameterDialog, OnButtonClicked, Button*, pButton, void)
     {
         if (m_pCancelBtn == pButton)
         {
             // no interpreting of the given values anymore ....
             m_pParam->SetLoseFocusHdl(Link<>()); // no direct call from the control anymore ...
             m_bNeedErrorOnCurrent = false;      // in case of any indirect calls -> no error message
-            m_pCancelBtn->SetClickHdl(Link<>());
+            m_pCancelBtn->SetClickHdl(Link<Button*,void>());
             m_pCancelBtn->Click();
         }
         else if (m_pOKBtn == pButton)
@@ -227,7 +227,7 @@ namespace dbaui
                     // we're are out of the complex web :) of direct and indirect calls to OnValueLoseFocus now,
                     // so the next time it is called we need an error message, again ....
                     // (TODO : there surely are better solutions for this ...)
-                return 1L;
+                return;
             }
 
             if (m_xParams.is())
@@ -253,7 +253,7 @@ namespace dbaui
 
             }
             // to close the dialog (which is more code than a simple EndDialog)
-            m_pOKBtn->SetClickHdl(Link<>());
+            m_pOKBtn->SetClickHdl(Link<Button*,void>());
             m_pOKBtn->Click();
         }
         else if (m_pTravelNext == pButton)
@@ -278,8 +278,6 @@ namespace dbaui
                 // so the next time it is called we need an error message, again ....
                 // (TODO : there surely are better solutions for this ...)
         }
-
-        return 0L;
     }
 
     IMPL_LINK(OParameterDialog, OnEntrySelected, ListBox*, /*pList*/)
diff --git a/dbaccess/source/ui/dlg/sqlmessage.cxx b/dbaccess/source/ui/dlg/sqlmessage.cxx
index 8fd564ba9e3a..1189f79f9a0c 100644
--- a/dbaccess/source/ui/dlg/sqlmessage.cxx
+++ b/dbaccess/source/ui/dlg/sqlmessage.cxx
@@ -710,11 +710,10 @@ void OSQLMessageBox::dispose()
     ButtonDialog::dispose();
 }
 
-IMPL_LINK( OSQLMessageBox, ButtonClickHdl, Button *, /*pButton*/ )
+IMPL_LINK_NOARG_TYPED( OSQLMessageBox, ButtonClickHdl, Button *, void )
 {
     ScopedVclPtrInstance< OExceptionChainDialog > aDlg( this, m_pImpl->aDisplayInfo );
     aDlg->Execute();
-    return 0;
 }
 
 // OSQLWarningBox
diff --git a/dbaccess/source/ui/dlg/tablespage.cxx b/dbaccess/source/ui/dlg/tablespage.cxx
index b20f6775d86b..6980f8042804 100644
--- a/dbaccess/source/ui/dlg/tablespage.cxx
+++ b/dbaccess/source/ui/dlg/tablespage.cxx
@@ -400,7 +400,7 @@ namespace dbaui
     }
     IMPL_LINK( OTableSubscriptionPage, OnTreeEntryChecked, Control*, _pControl )
     {
-        return OnControlModified(_pControl);
+        return OnControlModified(static_cast<Button*>(_pControl));
     }
     IMPL_LINK( OTableSubscriptionPage, OnTreeEntryCompare, const SvSortData*, _pSortData )
     {
diff --git a/dbaccess/source/ui/dlg/textconnectionsettings.cxx b/dbaccess/source/ui/dlg/textconnectionsettings.cxx
index 9fa798b1b096..e52ca7aeec7f 100644
--- a/dbaccess/source/ui/dlg/textconnectionsettings.cxx
+++ b/dbaccess/source/ui/dlg/textconnectionsettings.cxx
@@ -67,17 +67,14 @@ namespace dbaui
         return ModalDialog::Execute();
     }
 
-    IMPL_LINK( TextConnectionSettingsDialog, OnOK, PushButton*, /*_pButton*/ )
+    IMPL_LINK_NOARG_TYPED( TextConnectionSettingsDialog, OnOK, Button*, void )
     {
         if ( m_pTextConnectionHelper->prepareLeave() )
         {
             bool bUnused = false;
             m_pTextConnectionHelper->FillItemSet( m_rItems, bUnused );
             EndDialog( RET_OK );
-            return 1L;
         }
-
-        return 0L;
     }
 
 } // namespace dbaui
diff --git a/dbaccess/source/ui/inc/CollectionView.hxx b/dbaccess/source/ui/inc/CollectionView.hxx
index 3b2ac64ec2f6..e90bd5d8ef29 100644
--- a/dbaccess/source/ui/inc/CollectionView.hxx
+++ b/dbaccess/source/ui/inc/CollectionView.hxx
@@ -44,9 +44,9 @@ namespace dbaui
         css::uno::Reference< css::uno::XComponentContext >        m_xContext;
         bool                   m_bCreateForm;
 
-        DECL_LINK(Up_Click,void*);
-        DECL_LINK(NewFolder_Click,void*);
-        DECL_LINK(Save_Click,void*);
+        DECL_LINK_TYPED(Up_Click, Button*, void);
+        DECL_LINK_TYPED(NewFolder_Click, Button*, void);
+        DECL_LINK_TYPED(Save_Click, Button*, void);
         DECL_LINK(Dbl_Click_FileView,void*);
 
         /// sets the fixedtext to the right content
diff --git a/dbaccess/source/ui/inc/FieldDescControl.hxx b/dbaccess/source/ui/inc/FieldDescControl.hxx
index 4d5cef55694a..e0c00701a589 100644
--- a/dbaccess/source/ui/inc/FieldDescControl.hxx
+++ b/dbaccess/source/ui/inc/FieldDescControl.hxx
@@ -116,7 +116,7 @@ namespace dbaui
 
         DECL_LINK( OnScroll, ScrollBar*);
 
-        DECL_LINK( FormatClickHdl, Button * );
+        DECL_LINK_TYPED( FormatClickHdl, Button *, void );
         DECL_LINK( ChangeHdl, ListBox * );
 
         // used by ActivatePropertyField
diff --git a/dbaccess/source/ui/inc/RelationDlg.hxx b/dbaccess/source/ui/inc/RelationDlg.hxx
index 877b56f8a117..91ce6c80bb3e 100644
--- a/dbaccess/source/ui/inc/RelationDlg.hxx
+++ b/dbaccess/source/ui/inc/RelationDlg.hxx
@@ -90,7 +90,7 @@ namespace dbaui
         void Init(const TTableConnectionData::value_type& _pConnectionData);
 
     private:
-        DECL_LINK( OKClickHdl, Button* );
+        DECL_LINK_TYPED( OKClickHdl, Button*, void );
     };
 }
 #endif // INCLUDED_DBACCESS_SOURCE_UI_INC_RELATIONDLG_HXX
diff --git a/dbaccess/source/ui/inc/WCPage.hxx b/dbaccess/source/ui/inc/WCPage.hxx
index 008a9376ce01..80256e7e0d7e 100644
--- a/dbaccess/source/ui/inc/WCPage.hxx
+++ b/dbaccess/source/ui/inc/WCPage.hxx
@@ -51,9 +51,9 @@ namespace dbaui
         bool               m_bPKeyAllowed;
         bool               m_bUseHeaderAllowed;
 
-        DECL_LINK( AppendDataClickHdl, Button* );
-        DECL_LINK( RadioChangeHdl, Button* );
-        DECL_LINK( KeyClickHdl, Button* );
+        DECL_LINK_TYPED( AppendDataClickHdl, Button*, void );
+        DECL_LINK_TYPED( RadioChangeHdl, Button*, void );
+        DECL_LINK_TYPED( KeyClickHdl, Button*, void );
 
         bool checkAppendData();
         void SetAppendDataRadio();
diff --git a/dbaccess/source/ui/inc/WColumnSelect.hxx b/dbaccess/source/ui/inc/WColumnSelect.hxx
index 0c179f2367fb..a653d9e31950 100644
--- a/dbaccess/source/ui/inc/WColumnSelect.hxx
+++ b/dbaccess/source/ui/inc/WColumnSelect.hxx
@@ -42,7 +42,7 @@ namespace dbaui
         VclPtr<PushButton>   m_pColumns_LH;
         VclPtr<ListBox>      m_pNewColumnNames; // right side
 
-        DECL_LINK( ButtonClickHdl, Button * );
+        DECL_LINK_TYPED( ButtonClickHdl, Button *, void );
         DECL_LINK( ListDoubleClickHdl, ListBox * );
 
         static void clearListBox(ListBox& _rListBox);
diff --git a/dbaccess/source/ui/inc/WCopyTable.hxx b/dbaccess/source/ui/inc/WCopyTable.hxx
index 22a961341cef..711d9c145124 100644
--- a/dbaccess/source/ui/inc/WCopyTable.hxx
+++ b/dbaccess/source/ui/inc/WCopyTable.hxx
@@ -279,9 +279,9 @@ namespace dbaui
         bool                     m_bUseHeaderLine;
 
     private:
-        DECL_LINK( ImplPrevHdl  , void* );
-        DECL_LINK( ImplNextHdl  , void* );
-        DECL_LINK( ImplOKHdl    , void* );
+        DECL_LINK_TYPED( ImplPrevHdl, Button*, void );
+        DECL_LINK_TYPED( ImplNextHdl, Button*, void);
+        DECL_LINK_TYPED( ImplOKHdl, Button*, void );
         DECL_LINK( ImplActivateHdl, void* );
         bool CheckColumns(sal_Int32& _rnBreakPos);
         void loadData( const ICopyTableSourceObject& _rSourceObject,
diff --git a/dbaccess/source/ui/inc/WNameMatch.hxx b/dbaccess/source/ui/inc/WNameMatch.hxx
index 61f71b56ce47..f4119bed01cd 100644
--- a/dbaccess/source/ui/inc/WNameMatch.hxx
+++ b/dbaccess/source/ui/inc/WNameMatch.hxx
@@ -65,9 +65,9 @@ namespace dbaui
         Image               m_aImgUp;
         Image               m_aImgDown;
 
-        DECL_LINK( ButtonClickHdl, Button * );
-        DECL_LINK( RightButtonClickHdl, Button * );
-        DECL_LINK( AllNoneClickHdl, Button * );
+        DECL_LINK_TYPED( ButtonClickHdl, Button *, void );
+        DECL_LINK_TYPED( RightButtonClickHdl, Button *, void );
+        DECL_LINK_TYPED( AllNoneClickHdl, Button *, void );
         DECL_LINK( TableListClickHdl, void* );
         DECL_LINK( TableListRightSelectHdl, void* );
 
diff --git a/dbaccess/source/ui/inc/WTypeSelect.hxx b/dbaccess/source/ui/inc/WTypeSelect.hxx
index cc84c5bd3705..e8778521e50a 100644
--- a/dbaccess/source/ui/inc/WTypeSelect.hxx
+++ b/dbaccess/source/ui/inc/WTypeSelect.hxx
@@ -92,7 +92,7 @@ namespace dbaui
         friend class OWizTypeSelectList;
 
         DECL_LINK( ColumnSelectHdl, MultiListBox* );
-        DECL_LINK( ButtonClickHdl, Button * );
+        DECL_LINK_TYPED( ButtonClickHdl, Button *, void );
     protected:
         VclPtr<OWizTypeSelectList>      m_pColumnNames;
         VclPtr<FixedText>               m_pColumns;
diff --git a/dbaccess/source/ui/inc/adtabdlg.hxx b/dbaccess/source/ui/inc/adtabdlg.hxx
index 4de1c3398134..855853bd1d95 100644
--- a/dbaccess/source/ui/inc/adtabdlg.hxx
+++ b/dbaccess/source/ui/inc/adtabdlg.hxx
@@ -70,11 +70,11 @@ namespace dbaui
 
         IAddTableDialogContext& m_rContext;
 
-        DECL_LINK( AddClickHdl, Button* );
-        DECL_LINK( CloseClickHdl, Button* );
+        DECL_LINK_TYPED( AddClickHdl, Button*, void );
+        DECL_LINK_TYPED( CloseClickHdl, Button*, void);
         DECL_LINK( TableListDoubleClickHdl, void* );
         DECL_LINK( TableListSelectHdl, void* );
-        DECL_LINK( OnTypeSelected, void* );
+        DECL_LINK_TYPED( OnTypeSelected, Button*, void );
 
     public:
         OAddTableDlg(
diff --git a/dbaccess/source/ui/inc/directsql.hxx b/dbaccess/source/ui/inc/directsql.hxx
index 0d46a61465e5..df80ad6b8b31 100644
--- a/dbaccess/source/ui/inc/directsql.hxx
+++ b/dbaccess/source/ui/inc/directsql.hxx
@@ -85,8 +85,9 @@ namespace dbaui
         virtual void _disposing( const css::lang::EventObject& _rSource ) SAL_OVERRIDE;
 
     protected:
-        DECL_LINK( OnExecute, void* );
+        DECL_LINK_TYPED( OnExecute, Button*, void );
         DECL_LINK( OnClose, void* );
+        DECL_LINK_TYPED( OnCloseClick, Button*, void );
         DECL_LINK( OnListEntrySelected, void* );
         DECL_LINK( OnStatementModified, void* );
 
diff --git a/dbaccess/source/ui/inc/dlgsave.hxx b/dbaccess/source/ui/inc/dlgsave.hxx
index c53341dce924..9f883a3f7b68 100644
--- a/dbaccess/source/ui/inc/dlgsave.hxx
+++ b/dbaccess/source/ui/inc/dlgsave.hxx
@@ -72,7 +72,7 @@ namespace dbaui
         OUString getCatalog() const;
         OUString getSchema() const;
     private:
-        DECL_LINK(ButtonClickHdl, Button *);
+        DECL_LINK_TYPED(ButtonClickHdl, Button *, void);
         DECL_LINK(EditModifyHdl,  Edit * );
 
         void implInitOnlyTitle(const OUString& _rLabel);
diff --git a/dbaccess/source/ui/inc/dlgsize.hxx b/dbaccess/source/ui/inc/dlgsize.hxx
index 1d51ed11a534..90f7092e428b 100644
--- a/dbaccess/source/ui/inc/dlgsize.hxx
+++ b/dbaccess/source/ui/inc/dlgsize.hxx
@@ -37,7 +37,7 @@ namespace dbaui
         void            SetValue( sal_Int32 nVal );
 
     protected:
-        DECL_LINK( CbClickHdl, Button * );
+        DECL_LINK_TYPED( CbClickHdl, Button *, void );
 
         VclPtr<MetricField>    m_pMF_VALUE;
         VclPtr<CheckBox>       m_pCB_STANDARD;
diff --git a/dbaccess/source/ui/inc/indexdialog.hxx b/dbaccess/source/ui/inc/indexdialog.hxx
index 7e9733353644..50f46556e974 100644
--- a/dbaccess/source/ui/inc/indexdialog.hxx
+++ b/dbaccess/source/ui/inc/indexdialog.hxx
@@ -133,8 +133,9 @@ namespace dbaui
         DECL_LINK( OnIndexSelected, DbaIndexList* );
         DECL_LINK_TYPED( OnIndexAction, ToolBox*, void );
         DECL_LINK( OnEntryEdited, SvTreeListEntry* );
+        DECL_LINK_TYPED( OnModifiedClick, Button*, void );
         DECL_LINK( OnModified, void* );
-        DECL_LINK( OnCloseDialog, void* );
+        DECL_LINK_TYPED( OnCloseDialog, Button*, void );
 
         DECL_LINK( OnEditIndexAgain, SvTreeListEntry* );
 
diff --git a/dbaccess/source/ui/inc/paramdialog.hxx b/dbaccess/source/ui/inc/paramdialog.hxx
index 6c52896a149e..44d3316dd61d 100644
--- a/dbaccess/source/ui/inc/paramdialog.hxx
+++ b/dbaccess/source/ui/inc/paramdialog.hxx
@@ -98,7 +98,7 @@ namespace dbaui
         DECL_LINK_TYPED(OnVisitedTimeout, Timer*, void);
         DECL_LINK(OnValueModified, Control*);
         DECL_LINK(OnEntrySelected, ListBox*);
-        DECL_LINK(OnButtonClicked, PushButton*);
+        DECL_LINK_TYPED(OnButtonClicked, Button*, void);
         DECL_LINK(OnValueLoseFocus, Control*);
     };
 
diff --git a/dbaccess/source/ui/inc/sqlmessage.hxx b/dbaccess/source/ui/inc/sqlmessage.hxx
index 0ae541b4794e..d8987a3b9026 100644
--- a/dbaccess/source/ui/inc/sqlmessage.hxx
+++ b/dbaccess/source/ui/inc/sqlmessage.hxx
@@ -95,7 +95,7 @@ public:
 private:
     void Construct( WinBits nStyle, MessageType eImage );
 
-    DECL_LINK(ButtonClickHdl, Button* );
+    DECL_LINK_TYPED(ButtonClickHdl, Button*, void );
 
 private:
     void    impl_positionControls();
diff --git a/dbaccess/source/ui/inc/textconnectionsettings.hxx b/dbaccess/source/ui/inc/textconnectionsettings.hxx
index 89bcfc354e9c..05ca314322be 100644
--- a/dbaccess/source/ui/inc/textconnectionsettings.hxx
+++ b/dbaccess/source/ui/inc/textconnectionsettings.hxx
@@ -54,7 +54,7 @@ namespace dbaui
         SfxItemSet&                                 m_rItems;
 
     private:
-        DECL_LINK( OnOK, PushButton* );
+        DECL_LINK_TYPED( OnOK, Button*, void );
     };
 
 } // namespace dbaui
diff --git a/dbaccess/source/ui/misc/WCPage.cxx b/dbaccess/source/ui/misc/WCPage.cxx
index 19d2af726eec..9b170b21f625 100644
--- a/dbaccess/source/ui/misc/WCPage.cxx
+++ b/dbaccess/source/ui/misc/WCPage.cxx
@@ -124,11 +124,9 @@ void OCopyTable::dispose()
     OWizardPage::dispose();
 }
 
-IMPL_LINK( OCopyTable, AppendDataClickHdl, Button*, /*pButton*/ )
+IMPL_LINK_NOARG_TYPED( OCopyTable, AppendDataClickHdl, Button*, void )
 {
-
     SetAppendDataRadio();
-    return 0;
 }
 
 void OCopyTable::SetAppendDataRadio()
@@ -140,7 +138,7 @@ void OCopyTable::SetAppendDataRadio()
     m_pParent->setOperation(CopyTableOperation::AppendData);
 }
 
-IMPL_LINK( OCopyTable, RadioChangeHdl, Button*, pButton )
+IMPL_LINK_TYPED( OCopyTable, RadioChangeHdl, Button*, pButton, void )
 {
     m_pParent->EnableButton(OCopyTableWizard::WIZARD_NEXT,pButton != m_pRB_View);
     bool bKey = m_bPKeyAllowed && pButton != m_pRB_View;
@@ -156,15 +154,12 @@ IMPL_LINK( OCopyTable, RadioChangeHdl, Button*, pButton )
         m_pParent->setOperation( CopyTableOperation::CopyDefinitionOnly );
     else if( IsOptionView() )
         m_pParent->setOperation( CopyTableOperation::CreateAsView );
-
-    return 0;
 }
 
-IMPL_LINK( OCopyTable, KeyClickHdl, Button*, /*pButton*/ )
+IMPL_LINK_NOARG_TYPED( OCopyTable, KeyClickHdl, Button*, void )
 {
     m_pEdKeyName->Enable(m_pCB_PrimaryColumn->IsChecked());
     m_pFT_KeyName->Enable(m_pCB_PrimaryColumn->IsChecked());
-    return 0;
 }
 
 bool OCopyTable::LeavePage()
diff --git a/dbaccess/source/ui/misc/WColumnSelect.cxx b/dbaccess/source/ui/misc/WColumnSelect.cxx
index d7ae174e4b65..b0b618882845 100644
--- a/dbaccess/source/ui/misc/WColumnSelect.cxx
+++ b/dbaccess/source/ui/misc/WColumnSelect.cxx
@@ -183,7 +183,7 @@ bool OWizColumnSelect::LeavePage()
         return true;
 }
 
-IMPL_LINK( OWizColumnSelect, ButtonClickHdl, Button *, pButton )
+IMPL_LINK_TYPED( OWizColumnSelect, ButtonClickHdl, Button *, pButton, void )
 {
     ListBox *pLeft = NULL;
     ListBox *pRight = NULL;
@@ -213,7 +213,7 @@ IMPL_LINK( OWizColumnSelect, ButtonClickHdl, Button *, pButton )
     }
 
     if (!pLeft || !pRight)
-        return 0;
+        return;
 
     Reference< XDatabaseMetaData > xMetaData( m_pParent->m_xDestConnection->getMetaData() );
     OUString sExtraChars = xMetaData->getExtraNameCharacters();
@@ -244,8 +244,6 @@ IMPL_LINK( OWizColumnSelect, ButtonClickHdl, Button *, pButton )
 
     if(m_pOrgColumnNames->GetEntryCount())
         m_pOrgColumnNames->SelectEntryPos(0);
-
-    return 0;
 }
 
 IMPL_LINK( OWizColumnSelect, ListDoubleClickHdl, ListBox *, pListBox )
diff --git a/dbaccess/source/ui/misc/WCopyTable.cxx b/dbaccess/source/ui/misc/WCopyTable.cxx
index 9e07344f49eb..2aca86e1c8d6 100644
--- a/dbaccess/source/ui/misc/WCopyTable.cxx
+++ b/dbaccess/source/ui/misc/WCopyTable.cxx
@@ -717,7 +717,7 @@ void OCopyTableWizard::dispose()
     WizardDialog::dispose();
 }
 
-IMPL_LINK_NOARG(OCopyTableWizard, ImplPrevHdl)
+IMPL_LINK_NOARG_TYPED(OCopyTableWizard, ImplPrevHdl, Button*, void)
 {
     m_ePressed = WIZARD_PREV;
     if ( GetCurLevel() )
@@ -732,10 +732,9 @@ IMPL_LINK_NOARG(OCopyTableWizard, ImplPrevHdl)
         else
             ShowPrevPage();
     }
-    return 0;
 }
 
-IMPL_LINK_NOARG(OCopyTableWizard, ImplNextHdl)
+IMPL_LINK_NOARG_TYPED(OCopyTableWizard, ImplNextHdl, Button*, void)
 {
     m_ePressed = WIZARD_NEXT;
     if ( GetCurLevel() < MAX_PAGES )
@@ -750,7 +749,6 @@ IMPL_LINK_NOARG(OCopyTableWizard, ImplNextHdl)
         else
             ShowNextPage();
     }
-    return 0;
 }
 
 bool OCopyTableWizard::CheckColumns(sal_Int32& _rnBreakPos)
@@ -836,7 +834,7 @@ bool OCopyTableWizard::CheckColumns(sal_Int32& _rnBreakPos)
     return bRet;
 }
 
-IMPL_LINK_NOARG(OCopyTableWizard, ImplOKHdl)
+IMPL_LINK_NOARG_TYPED(OCopyTableWizard, ImplOKHdl, Button*, void)
 {
     m_ePressed = WIZARD_FINISH;
     bool bFinish = DeactivatePage();
@@ -868,7 +866,7 @@ IMPL_LINK_NOARG(OCopyTableWizard, ImplOKHdl)
                         m_mNameMapping.clear();
                         pPage->setDisplayRow(nBreakPos);
                         ShowPage(3);
-                        return 0;
+                        return;
                     }
                 }
                 if ( m_xDestConnection.is() )
@@ -906,7 +904,7 @@ IMPL_LINK_NOARG(OCopyTableWizard, ImplOKHdl)
                             else if ( xAbort->wasSelected() )
                             {
                                 ShowPage(3);
-                                return 0;
+                                return;
                             }
                         }
                     }
@@ -924,7 +922,6 @@ IMPL_LINK_NOARG(OCopyTableWizard, ImplOKHdl)
 
         EndDialog(RET_OK);
     }
-    return bFinish ? 1 : 0;
 }
 
 
diff --git a/dbaccess/source/ui/misc/WNameMatch.cxx b/dbaccess/source/ui/misc/WNameMatch.cxx
index fbf71a00a916..f007eda758ff 100644
--- a/dbaccess/source/ui/misc/WNameMatch.cxx
+++ b/dbaccess/source/ui/misc/WNameMatch.cxx
@@ -204,7 +204,7 @@ bool OWizNameMatching::LeavePage()
 
 OUString OWizNameMatching::GetTitle() const { return ModuleRes(STR_WIZ_NAME_MATCHING_TITEL); }
 
-IMPL_LINK( OWizNameMatching, ButtonClickHdl, Button *, pButton )
+IMPL_LINK_TYPED( OWizNameMatching, ButtonClickHdl, Button *, pButton, void )
 {
     SvTreeListEntry* pEntry = m_pCTRL_LEFT->FirstSelected();
     if ( pEntry )
@@ -229,11 +229,9 @@ IMPL_LINK( OWizNameMatching, ButtonClickHdl, Button *, pButton )
 
         TableListClickHdl(m_pCTRL_LEFT);
     }
-
-    return 0;
 }
 
-IMPL_LINK( OWizNameMatching, RightButtonClickHdl, Button *, pButton )
+IMPL_LINK_TYPED( OWizNameMatching, RightButtonClickHdl, Button *, pButton, void )
 {
     SvTreeListEntry* pEntry = m_pCTRL_RIGHT->FirstSelected();
     if ( pEntry )
@@ -254,7 +252,6 @@ IMPL_LINK( OWizNameMatching, RightButtonClickHdl, Button *, pButton )
             m_pCTRL_RIGHT->GetVScroll()->DoScrollAction(SCROLL_LINEDOWN);
         TableListRightSelectHdl(m_pCTRL_RIGHT);
     }
-    return 0;
 }
 
 IMPL_LINK_NOARG( OWizNameMatching, TableListClickHdl )
@@ -325,7 +322,7 @@ IMPL_LINK_NOARG( OWizNameMatching, TableListRightSelectHdl )
     return 0;
 }
 
-IMPL_LINK( OWizNameMatching, AllNoneClickHdl, Button *, pButton )
+IMPL_LINK_TYPED( OWizNameMatching, AllNoneClickHdl, Button *, pButton, void )
 {
     bool bAll = pButton == m_pAll;
     SvTreeListEntry* pEntry = m_pCTRL_LEFT->First();
@@ -334,8 +331,6 @@ IMPL_LINK( OWizNameMatching, AllNoneClickHdl, Button *, pButton )
         m_pCTRL_LEFT->SetCheckButtonState( pEntry, bAll ? SV_BUTTON_CHECKED : SV_BUTTON_UNCHECKED);
         pEntry = m_pCTRL_LEFT->Next(pEntry);
     }
-
-    return 0;
 }
 
 // class OColumnString
diff --git a/dbaccess/source/ui/misc/WTypeSelect.cxx b/dbaccess/source/ui/misc/WTypeSelect.cxx
index f631f99cf95f..f6d06c99711a 100644
--- a/dbaccess/source/ui/misc/WTypeSelect.cxx
+++ b/dbaccess/source/ui/misc/WTypeSelect.cxx
@@ -351,15 +351,13 @@ void OWizTypeSelect::EnableAuto(bool bEnable)
     m_pAutoType->Show(bEnable);
 }
 
-IMPL_LINK( OWizTypeSelect, ButtonClickHdl, Button *, /*pButton*/ )
+IMPL_LINK_NOARG_TYPED( OWizTypeSelect, ButtonClickHdl, Button *, void )
 {
     sal_Int32 nBreakPos;
     m_pParent->CheckColumns(nBreakPos);
     fillColumnList(m_pAutoEt->GetText().toInt32());
 
     ActivatePage();
-
-    return 0;
 }
 
 OWizTypeSelectList::~OWizTypeSelectList()
diff --git a/dbaccess/source/ui/querydesign/querydlg.cxx b/dbaccess/source/ui/querydesign/querydlg.cxx
index 798fcaef3d80..cb9dff43fee2 100644
--- a/dbaccess/source/ui/querydesign/querydlg.cxx
+++ b/dbaccess/source/ui/querydesign/querydlg.cxx
@@ -241,14 +241,12 @@ IMPL_LINK( DlgQryJoin, LBChangeHdl, ListBox*, /*pListBox*/ )
     return 1;
 }
 
-IMPL_LINK( DlgQryJoin, OKClickHdl, Button*, /*pButton*/ )
+IMPL_LINK_NOARG_TYPED( DlgQryJoin, OKClickHdl, Button*, void )
 {
-
     m_pConnData->Update();
     m_pOrigConnData->CopyFrom( *m_pConnData );
 
     EndDialog(RET_OK);
-    return 1;
 }
 
 IMPL_LINK( DlgQryJoin, NaturalToggleHdl, CheckBox*, /*pButton*/ )
diff --git a/dbaccess/source/ui/querydesign/querydlg.hxx b/dbaccess/source/ui/querydesign/querydlg.hxx
index 02009b20bf31..c90d13b812d6 100644
--- a/dbaccess/source/ui/querydesign/querydlg.hxx
+++ b/dbaccess/source/ui/querydesign/querydlg.hxx
@@ -54,7 +54,7 @@ namespace dbaui
         css::uno::Reference< css::sdbc::XConnection > m_xConnection;
 
 
-        DECL_LINK( OKClickHdl, Button* );
+        DECL_LINK_TYPED( OKClickHdl, Button*, void );
         DECL_LINK( LBChangeHdl, ListBox* );
         DECL_LINK( NaturalToggleHdl, CheckBox* );