convert Link<> to typed

Change-Id: I34e15999ecc73c5a330f637338ca9d8fce31b5d2

4 files changed, 18 insertions, 20 deletions

diff --git a/dbaccess/source/ui/dlg/dbwizsetup.cxx b/dbaccess/source/ui/dlg/dbwizsetup.cxx
index 7ff846d7f9f0..cc4efd81d651 100644
--- a/dbaccess/source/ui/dlg/dbwizsetup.cxx
+++ b/dbaccess/source/ui/dlg/dbwizsetup.cxx
@@ -605,22 +605,20 @@ IMPL_LINK_TYPED(ODbTypeWizDialogSetup, ImplClickHdl, OMySQLIntroPageSetup*, _pMy
     activatePath( static_cast<PathId>(m_pCollection->getIndexOf(sURLPrefix) + 1), true);
 }
 
-IMPL_LINK_NOARG_TYPED(ODbTypeWizDialogSetup, OnChangeCreationMode, OGeneralPageWizard*, void)
+IMPL_LINK_NOARG_TYPED(ODbTypeWizDialogSetup, OnChangeCreationMode, OGeneralPageWizard&, void)
 {
     activateDatabasePath();
 }
 
-IMPL_LINK(ODbTypeWizDialogSetup, OnRecentDocumentSelected, OGeneralPageWizard*, /*_pGeneralPage*/)
+IMPL_LINK_NOARG_TYPED(ODbTypeWizDialogSetup, OnRecentDocumentSelected, OGeneralPageWizard&, void)
 {
     enableButtons( WizardButtonFlags::FINISH, !m_pGeneralPage->GetSelectedDocument().sURL.isEmpty() );
-    return 0L;
 }
 
-IMPL_LINK(ODbTypeWizDialogSetup, OnSingleDocumentChosen, OGeneralPageWizard*, /*_pGeneralPage*/)
+IMPL_LINK_NOARG_TYPED(ODbTypeWizDialogSetup, OnSingleDocumentChosen, OGeneralPageWizard&, void)
 {
     if ( prepareLeaveCurrentState( eFinish ) )
         onFinish();
-    return 0L;
 }
 
 void ODbTypeWizDialogSetup::enterState(WizardState _nState)
diff --git a/dbaccess/source/ui/dlg/generalpage.cxx b/dbaccess/source/ui/dlg/generalpage.cxx
index a9e74ded4094..5af2be90980d 100644
--- a/dbaccess/source/ui/dlg/generalpage.cxx
+++ b/dbaccess/source/ui/dlg/generalpage.cxx
@@ -702,7 +702,7 @@ namespace dbaui
     IMPL_LINK_NOARG_TYPED( OGeneralPageWizard, OnCreateDatabaseModeSelected, Button*, void )
     {
         if ( m_aCreationModeHandler.IsSet() )
-            m_aCreationModeHandler.Call( this );
+            m_aCreationModeHandler.Call( *this );
 
         OnEmbeddedDBTypeSelected( m_pEmbeddedDBType );
     }
@@ -710,13 +710,13 @@ namespace dbaui
     IMPL_LINK_NOARG_TYPED( OGeneralPageWizard, OnSetupModeSelected, Button*, void )
     {
         if ( m_aCreationModeHandler.IsSet() )
-            m_aCreationModeHandler.Call( this );
+            m_aCreationModeHandler.Call( *this );
         OnDatasourceTypeSelected(m_pDatasourceType);
     }
 
     IMPL_LINK( OGeneralPageWizard, OnDocumentSelected, ListBox*, /*_pBox*/ )
     {
-        m_aDocumentSelectionHandler.Call( this );
+        m_aDocumentSelectionHandler.Call( *this );
         return 0L;
     }
 
@@ -744,7 +744,7 @@ namespace dbaui
             }
             m_aBrowsedDocument.sURL = sPath;
             m_aBrowsedDocument.sFilter.clear();
-            m_aChooseDocumentHandler.Call( this );
+            m_aChooseDocumentHandler.Call( *this );
         }
     }
 
diff --git a/dbaccess/source/ui/dlg/generalpage.hxx b/dbaccess/source/ui/dlg/generalpage.hxx
index 6dd57d69cf2b..f7f05720f4e0 100644
--- a/dbaccess/source/ui/dlg/generalpage.hxx
+++ b/dbaccess/source/ui/dlg/generalpage.hxx
@@ -148,12 +148,12 @@ namespace dbaui
         VclPtr<OpenDocumentButton>     m_pPB_OpenDatabase;
 
         // state
-        DocumentDescriptor      m_aBrowsedDocument;
-        CreationMode            m_eOriginalCreationMode;
+        DocumentDescriptor             m_aBrowsedDocument;
+        CreationMode                   m_eOriginalCreationMode;
 
-        Link<OGeneralPageWizard *, void> m_aCreationModeHandler; /// to be called if a new type is selected
-        Link<>                  m_aDocumentSelectionHandler;    /// to be called when a document in the RecentDoc list is selected
-        Link<>                  m_aChooseDocumentHandler;       /// to be called when a recent document has been definitely chosen
+        Link<OGeneralPageWizard&,void> m_aCreationModeHandler; /// to be called if a new type is selected
+        Link<OGeneralPageWizard&,void> m_aDocumentSelectionHandler;    /// to be called when a document in the RecentDoc list is selected
+        Link<OGeneralPageWizard&,void> m_aChooseDocumentHandler;       /// to be called when a recent document has been definitely chosen
 
         ::svt::ControlDependencyManager
                                 m_aControlDependencies;
@@ -162,11 +162,11 @@ namespace dbaui
         void                    insertEmbeddedDBTypeEntryData( const OUString& _sType, const OUString& sDisplayName );
 
     public:
-        void                    SetCreationModeHandler( const Link<OGeneralPageWizard *, void>& _rHandler ) { m_aCreationModeHandler = _rHandler; }
+        void                    SetCreationModeHandler( const Link<OGeneralPageWizard&,void>& _rHandler ) { m_aCreationModeHandler = _rHandler; }
         CreationMode            GetDatabaseCreationMode() const;
 
-        void                    SetDocumentSelectionHandler( const Link<>& _rHandler) { m_aDocumentSelectionHandler = _rHandler; }
-        void                    SetChooseDocumentHandler( const Link<>& _rHandler) { m_aChooseDocumentHandler = _rHandler; }
+        void                    SetDocumentSelectionHandler( const Link<OGeneralPageWizard&,void>& _rHandler) { m_aDocumentSelectionHandler = _rHandler; }
+        void                    SetChooseDocumentHandler( const Link<OGeneralPageWizard&,void>& _rHandler) { m_aChooseDocumentHandler = _rHandler; }
         DocumentDescriptor      GetSelectedDocument() const;
 
     protected:
diff --git a/dbaccess/source/ui/inc/dbwizsetup.hxx b/dbaccess/source/ui/inc/dbwizsetup.hxx
index 971aac8a6999..8d48e2d48013 100644
--- a/dbaccess/source/ui/inc/dbwizsetup.hxx
+++ b/dbaccess/source/ui/inc/dbwizsetup.hxx
@@ -176,9 +176,9 @@ private:
     bool callSaveAsDialog();
     bool IsConnectionUrlRequired();
     DECL_LINK_TYPED(OnTypeSelected, OGeneralPage&, void);
-    DECL_LINK_TYPED(OnChangeCreationMode, OGeneralPageWizard*, void);
-    DECL_LINK(OnRecentDocumentSelected, OGeneralPageWizard*);
-    DECL_LINK(OnSingleDocumentChosen, OGeneralPageWizard*);
+    DECL_LINK_TYPED(OnChangeCreationMode, OGeneralPageWizard&, void);
+    DECL_LINK_TYPED(OnRecentDocumentSelected, OGeneralPageWizard&, void);
+    DECL_LINK_TYPED(OnSingleDocumentChosen, OGeneralPageWizard&, void);
     DECL_LINK_TYPED(ImplClickHdl, OMySQLIntroPageSetup*, void);
     DECL_LINK_TYPED(ImplModifiedHdl, OGenericAdministrationPage const *, void);
 };