diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-04-30 22:59:43 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-05-04 17:54:50 +0200 |
commit | 1c806abb33bc63c9356b09077c3f87750bcc1343 (patch) | |
tree | f46c686d708e11b92c38e2924e1ab508d529f02e /dbaccess/source/ui/dlg | |
parent | 87fabc0f83f0e67a2f5ba9b0588f1d4523e0a9ed (diff) |
Use typed OGenericAdministrationPage::SetModifiedHandler Link
Change-Id: Ia605aeb2a9936f3c60db179420805a3e986fd64b
Diffstat (limited to 'dbaccess/source/ui/dlg')
-rw-r--r-- | dbaccess/source/ui/dlg/adminpages.hxx | 6 | ||||
-rw-r--r-- | dbaccess/source/ui/dlg/dbwizsetup.cxx | 3 |
2 files changed, 4 insertions, 5 deletions
diff --git a/dbaccess/source/ui/dlg/adminpages.hxx b/dbaccess/source/ui/dlg/adminpages.hxx index 74cc29c3d39c..a7d2843b228a 100644 --- a/dbaccess/source/ui/dlg/adminpages.hxx +++ b/dbaccess/source/ui/dlg/adminpages.hxx @@ -93,7 +93,7 @@ namespace dbaui ,public ::svt::IWizardPageController { private: - Link<> m_aModifiedHandler; /// to be called if something on the page has been modified + Link<OGenericAdministrationPage const *, void> m_aModifiedHandler; /// to be called if something on the page has been modified bool m_abEnableRoadmap; protected: IDatabaseSettingsDialog* m_pAdminDialog; @@ -104,7 +104,7 @@ namespace dbaui public: OGenericAdministrationPage(vcl::Window* _pParent, const OString& _rId, const OUString& _rUIXMLDescription, const SfxItemSet& _rAttrSet); /// set a handler which gets called every time something on the page has been modified - void SetModifiedHandler(const Link<>& _rHandler) { m_aModifiedHandler = _rHandler; } + void SetModifiedHandler(const Link<OGenericAdministrationPage const *, void>& _rHandler) { m_aModifiedHandler = _rHandler; } /** Sets the ParentDialog @param _pAdminDialog @@ -160,7 +160,7 @@ namespace dbaui virtual void ActivatePage() SAL_OVERRIDE; protected: - void callModifiedHdl() const { if (m_aModifiedHandler.IsSet()) m_aModifiedHandler.Call((void*)this); } + void callModifiedHdl() const { if (m_aModifiedHandler.IsSet()) m_aModifiedHandler.Call(this); } /// called from within DeactivatePage. The page is allowed to be deactivated if this method returns sal_True virtual bool prepareLeave() { return true; } diff --git a/dbaccess/source/ui/dlg/dbwizsetup.cxx b/dbaccess/source/ui/dlg/dbwizsetup.cxx index f7fe59ff2594..2c04c08da40c 100644 --- a/dbaccess/source/ui/dlg/dbwizsetup.cxx +++ b/dbaccess/source/ui/dlg/dbwizsetup.cxx @@ -574,7 +574,7 @@ VclPtr<TabPage> ODbTypeWizDialogSetup::createPage(WizardState _nState) return pPage; } -IMPL_LINK(ODbTypeWizDialogSetup, ImplModifiedHdl, OGenericAdministrationPage*, _pConnectionPageSetup) +IMPL_LINK_TYPED(ODbTypeWizDialogSetup, ImplModifiedHdl, OGenericAdministrationPage const *, _pConnectionPageSetup, void) { m_bIsConnectable = _pConnectionPageSetup->GetRoadmapStateValue( ); enableState(PAGE_DBSETUPWIZARD_FINAL, m_bIsConnectable); @@ -584,7 +584,6 @@ IMPL_LINK(ODbTypeWizDialogSetup, ImplModifiedHdl, OGenericAdministrationPage*, _ else enableButtons( WizardButtonFlags::FINISH, m_bIsConnectable); enableButtons( WizardButtonFlags::NEXT, m_bIsConnectable && (getCurrentState() != PAGE_DBSETUPWIZARD_FINAL)); - return sal_True; } IMPL_LINK(ODbTypeWizDialogSetup, ImplClickHdl, OMySQLIntroPageSetup*, _pMySQLIntroPageSetup) |