diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-04-27 17:37:55 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-04-28 10:21:08 +0200 |
| commit | 99d4b08d05c6edba43675661c70736a2a062af21 (patch) | |
| tree | e6b458564c45dafd7b96957ddc2a65b632ea293c /dbaccess | |
| parent | 56a2bc14b5ca23e26b33b3c55a026b81bbeb244b (diff) | |
WizardDialog::DeactivatePage return type wants to be bool
Change-Id: Ib44006e339a4e1ee9b5c9201e48861fceef865fd
Diffstat (limited to 'dbaccess')
| -rw-r--r-- | dbaccess/source/ui/inc/WCopyTable.hxx | 2 | ||||
| -rw-r--r-- | dbaccess/source/ui/misc/WCopyTable.cxx | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/dbaccess/source/ui/inc/WCopyTable.hxx b/dbaccess/source/ui/inc/WCopyTable.hxx index 388ee1c27a1d..32fa0a79e9cc 100644 --- a/dbaccess/source/ui/inc/WCopyTable.hxx +++ b/dbaccess/source/ui/inc/WCopyTable.hxx @@ -324,7 +324,7 @@ namespace dbaui virtual ~OCopyTableWizard(); - virtual long DeactivatePage() SAL_OVERRIDE; + virtual bool DeactivatePage() SAL_OVERRIDE; OKButton& GetOKButton() { return static_cast<OKButton&>(*m_pbFinish); } Wizard_Button_Style GetPressedButton() const { return m_ePressed; } void EnableButton(Wizard_Button_Style eStyle, bool bEnable); diff --git a/dbaccess/source/ui/misc/WCopyTable.cxx b/dbaccess/source/ui/misc/WCopyTable.cxx index d5e57ffe34e9..90f1894c41bc 100644 --- a/dbaccess/source/ui/misc/WCopyTable.cxx +++ b/dbaccess/source/ui/misc/WCopyTable.cxx @@ -834,7 +834,7 @@ bool OCopyTableWizard::CheckColumns(sal_Int32& _rnBreakPos) IMPL_LINK_NOARG(OCopyTableWizard, ImplOKHdl) { m_ePressed = WIZARD_FINISH; - bool bFinish = DeactivatePage() != 0; + bool bFinish = DeactivatePage(); if(bFinish) { @@ -989,10 +989,10 @@ void OCopyTableWizard::EnableButton(Wizard_Button_Style eStyle, bool bEnable) } -long OCopyTableWizard::DeactivatePage() +bool OCopyTableWizard::DeactivatePage() { OWizardPage* pPage = static_cast<OWizardPage*>(GetPage(GetCurLevel())); - return pPage ? pPage->LeavePage() : sal_False; + return pPage && pPage->LeavePage(); } void OCopyTableWizard::AddWizardPage(OWizardPage* pPage) |