convert Link<> to typed

Change-Id: I6f8ffaf59a1b22b66d3b92246384cd3203808bcf

6 files changed, 8 insertions, 10 deletions

diff --git a/dbaccess/source/ui/dlg/dbwiz.cxx b/dbaccess/source/ui/dlg/dbwiz.cxx
index 60490c4784ca..2dd1f1033a68 100644
--- a/dbaccess/source/ui/dlg/dbwiz.cxx
+++ b/dbaccess/source/ui/dlg/dbwiz.cxx
@@ -111,13 +111,12 @@ void ODbTypeWizDialog::dispose()
     svt::OWizardMachine::dispose();
 }
 
-IMPL_LINK(ODbTypeWizDialog, OnTypeSelected, OGeneralPage*, _pTabPage)
+IMPL_LINK_TYPED(ODbTypeWizDialog, OnTypeSelected, OGeneralPage&, _rTabPage, void)
 {
-    m_eType = _pTabPage->GetSelectedType();
+    m_eType = _rTabPage.GetSelectedType();
     const bool bURLRequired = m_pCollection->isConnectionUrlRequired(m_eType);
     enableButtons(WizardButtonFlags::NEXT,bURLRequired);
     enableButtons(WizardButtonFlags::FINISH,!bURLRequired);
-    return 1L;
 }
 
 WizardTypes::WizardState ODbTypeWizDialog::determineNextState( WizardState _nCurrentState ) const
diff --git a/dbaccess/source/ui/dlg/dbwizsetup.cxx b/dbaccess/source/ui/dlg/dbwizsetup.cxx
index ea230da8b916..7ff846d7f9f0 100644
--- a/dbaccess/source/ui/dlg/dbwizsetup.cxx
+++ b/dbaccess/source/ui/dlg/dbwizsetup.cxx
@@ -278,10 +278,9 @@ void ODbTypeWizDialogSetup::dispose()
     svt::RoadmapWizard::dispose();
 }
 
-IMPL_LINK(ODbTypeWizDialogSetup, OnTypeSelected, OGeneralPage*, /*_pTabPage*/)
+IMPL_LINK_NOARG_TYPED(ODbTypeWizDialogSetup, OnTypeSelected, OGeneralPage&, void)
 {
     activateDatabasePath();
-    return 1L;
 }
 
 void lcl_removeUnused(const ::comphelper::NamedValueCollection& _aOld,const ::comphelper::NamedValueCollection& _aNew,::comphelper::NamedValueCollection& _rDSInfo)
diff --git a/dbaccess/source/ui/dlg/generalpage.cxx b/dbaccess/source/ui/dlg/generalpage.cxx
index 3ed48c8933eb..a9e74ded4094 100644
--- a/dbaccess/source/ui/dlg/generalpage.cxx
+++ b/dbaccess/source/ui/dlg/generalpage.cxx
@@ -218,7 +218,7 @@ namespace dbaui
         switchMessage(_sURLPrefix);
 
         if ( m_aTypeSelectHandler.IsSet() )
-            m_aTypeSelectHandler.Call(this);
+            m_aTypeSelectHandler.Call(*this);
     }
 
     void OGeneralPage::implInitControls( const SfxItemSet& _rSet, bool _bSaveValue )
diff --git a/dbaccess/source/ui/dlg/generalpage.hxx b/dbaccess/source/ui/dlg/generalpage.hxx
index 320b619ecd3b..6dd57d69cf2b 100644
--- a/dbaccess/source/ui/dlg/generalpage.hxx
+++ b/dbaccess/source/ui/dlg/generalpage.hxx
@@ -49,7 +49,7 @@ namespace dbaui
         };
         SPECIAL_MESSAGE     m_eLastMessage;
 
-        Link<>              m_aTypeSelectHandler;   /// to be called if a new type is selected
+        Link<OGeneralPage&,void>   m_aTypeSelectHandler;   /// to be called if a new type is selected
         bool                m_bDisplayingInvalid : 1;   /// the currently displayed data source is deleted
         bool                m_bInitTypeList : 1;
         bool                approveDatasourceType( const OUString& _sURLPrefix, OUString& _inout_rDisplayName );
@@ -69,7 +69,7 @@ namespace dbaui
         virtual void dispose() SAL_OVERRIDE;
 
         /// set a handler which gets called every time the user selects a new type
-        void            SetTypeSelectHandler( const Link<>& _rHandler ) { m_aTypeSelectHandler = _rHandler; }
+        void            SetTypeSelectHandler( const Link<OGeneralPage&,void>& _rHandler ) { m_aTypeSelectHandler = _rHandler; }
 
         /// get the currently selected datasource type
         OUString     GetSelectedType() const { return m_eCurrentSelection; }
diff --git a/dbaccess/source/ui/inc/dbwiz.hxx b/dbaccess/source/ui/inc/dbwiz.hxx
index 2bee52ce678f..b9139c914256 100644
--- a/dbaccess/source/ui/inc/dbwiz.hxx
+++ b/dbaccess/source/ui/inc/dbwiz.hxx
@@ -119,7 +119,7 @@ protected:
     ApplyResult implApplyChanges();
 
 private:
-    DECL_LINK(OnTypeSelected, OGeneralPage*);
+    DECL_LINK_TYPED(OnTypeSelected, OGeneralPage&, void);
 };
 
 }   // namespace dbaui
diff --git a/dbaccess/source/ui/inc/dbwizsetup.hxx b/dbaccess/source/ui/inc/dbwizsetup.hxx
index 73b36605013a..971aac8a6999 100644
--- a/dbaccess/source/ui/inc/dbwizsetup.hxx
+++ b/dbaccess/source/ui/inc/dbwizsetup.hxx
@@ -175,7 +175,7 @@ private:
     void updateTypeDependentStates();
     bool callSaveAsDialog();
     bool IsConnectionUrlRequired();
-    DECL_LINK(OnTypeSelected, OGeneralPage*);
+    DECL_LINK_TYPED(OnTypeSelected, OGeneralPage&, void);
     DECL_LINK_TYPED(OnChangeCreationMode, OGeneralPageWizard*, void);
     DECL_LINK(OnRecentDocumentSelected, OGeneralPageWizard*);
     DECL_LINK(OnSingleDocumentChosen, OGeneralPageWizard*);