diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-04-30 23:29:57 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-05-04 17:54:51 +0200 |
| commit | 0223dd75317b372ab43d58f8e3f7e1ef1b5f826b (patch) | |
| tree | f7f7f61092e55d0e9c4b4bcc0104af9be97b760b | |
| parent | 1c806abb33bc63c9356b09077c3f87750bcc1343 (diff) | |
Use typed OMySQLIntroPageSetup::SetClickHdl Link
Change-Id: I99c6677bcb1a491ede67322b21f6ca051a2e924d
| -rw-r--r-- | dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx | 5 | ||||
| -rw-r--r-- | dbaccess/source/ui/dlg/dbwizsetup.cxx | 3 | ||||
| -rw-r--r-- | dbaccess/source/ui/inc/dbwizsetup.hxx | 2 |
3 files changed, 4 insertions, 6 deletions
diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx index 58395ff49f63..4cb177cceb82 100644 --- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx +++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx @@ -217,9 +217,7 @@ namespace dbaui static VclPtr<OMySQLIntroPageSetup> CreateMySQLIntroTabPage( vcl::Window* _pParent, const SfxItemSet& _rAttrSet ); ConnectionType getMySQLMode(); - Link<> maClickHdl; - void SetClickHdl( const Link<>& rLink ) { maClickHdl = rLink; } - const Link<>& GetClickHdl() const { return maClickHdl; } + void SetClickHdl( const Link<OMySQLIntroPageSetup *, void>& rLink ) { maClickHdl = rLink; } DECL_LINK(ImplClickHdl, OMySQLIntroPageSetup*); protected: @@ -232,6 +230,7 @@ namespace dbaui VclPtr<RadioButton> m_pODBCDatabase; VclPtr<RadioButton> m_pJDBCDatabase; VclPtr<RadioButton> m_pNATIVEDatabase; + Link<OMySQLIntroPageSetup *, void> maClickHdl; DECL_LINK(OnSetupModeSelected, RadioButton*); diff --git a/dbaccess/source/ui/dlg/dbwizsetup.cxx b/dbaccess/source/ui/dlg/dbwizsetup.cxx index 2c04c08da40c..e0c296cdb305 100644 --- a/dbaccess/source/ui/dlg/dbwizsetup.cxx +++ b/dbaccess/source/ui/dlg/dbwizsetup.cxx @@ -586,7 +586,7 @@ IMPL_LINK_TYPED(ODbTypeWizDialogSetup, ImplModifiedHdl, OGenericAdministrationPa enableButtons( WizardButtonFlags::NEXT, m_bIsConnectable && (getCurrentState() != PAGE_DBSETUPWIZARD_FINAL)); } -IMPL_LINK(ODbTypeWizDialogSetup, ImplClickHdl, OMySQLIntroPageSetup*, _pMySQLIntroPageSetup) +IMPL_LINK_TYPED(ODbTypeWizDialogSetup, ImplClickHdl, OMySQLIntroPageSetup*, _pMySQLIntroPageSetup, void) { OUString sURLPrefix; switch( _pMySQLIntroPageSetup->getMySQLMode() ) @@ -602,7 +602,6 @@ IMPL_LINK(ODbTypeWizDialogSetup, ImplClickHdl, OMySQLIntroPageSetup*, _pMySQLInt break; } activatePath( static_cast<PathId>(m_pCollection->getIndexOf(sURLPrefix) + 1), true); - return sal_True; } IMPL_LINK(ODbTypeWizDialogSetup, OnChangeCreationMode, OGeneralPageWizard*, /*_pGeneralPage*/) diff --git a/dbaccess/source/ui/inc/dbwizsetup.hxx b/dbaccess/source/ui/inc/dbwizsetup.hxx index 310a71188b53..5b863e26b307 100644 --- a/dbaccess/source/ui/inc/dbwizsetup.hxx +++ b/dbaccess/source/ui/inc/dbwizsetup.hxx @@ -179,7 +179,7 @@ private: DECL_LINK(OnChangeCreationMode, OGeneralPageWizard*); DECL_LINK(OnRecentDocumentSelected, OGeneralPageWizard*); DECL_LINK(OnSingleDocumentChosen, OGeneralPageWizard*); - DECL_LINK(ImplClickHdl, OMySQLIntroPageSetup*); + DECL_LINK_TYPED(ImplClickHdl, OMySQLIntroPageSetup*, void); DECL_LINK_TYPED(ImplModifiedHdl, OGenericAdministrationPage const *, void); }; |