From 99d4b08d05c6edba43675661c70736a2a062af21 Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Mon, 27 Apr 2015 17:37:55 +0200
Subject: WizardDialog::DeactivatePage return type wants to be bool
Change-Id: Ib44006e339a4e1ee9b5c9201e48861fceef865fd
---
dbaccess/source/ui/inc/WCopyTable.hxx | 2 +-
dbaccess/source/ui/misc/WCopyTable.cxx | 6 +++---
include/svtools/wizardmachine.hxx | 2 +-
include/svtools/wizdlg.hxx | 2 +-
svtools/source/dialogs/wizardmachine.cxx | 6 +++---
svtools/source/dialogs/wizdlg.cxx | 4 ++--
6 files changed, 11 insertions(+), 11 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)
diff --git a/include/svtools/wizardmachine.hxx b/include/svtools/wizardmachine.hxx
index 56bd679a0d89..b5cd150dee07 100644
--- a/include/svtools/wizardmachine.hxx
+++ b/include/svtools/wizardmachine.hxx
@@ -200,7 +200,7 @@ namespace svt
protected:
// WizardDialog overridables
virtual void ActivatePage() SAL_OVERRIDE;
- virtual long DeactivatePage() SAL_OVERRIDE;
+ virtual bool DeactivatePage() SAL_OVERRIDE;
// our own overridables
diff --git a/include/svtools/wizdlg.hxx b/include/svtools/wizdlg.hxx
index 93d19addf6ed..a8c7e4e332f7 100644
--- a/include/svtools/wizdlg.hxx
+++ b/include/svtools/wizdlg.hxx
@@ -248,7 +248,7 @@ public:
virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE;
virtual void ActivatePage();
- virtual long DeactivatePage();
+ virtual bool DeactivatePage();
virtual void queue_resize(StateChangedType eReason = StateChangedType::LAYOUT) SAL_OVERRIDE;
diff --git a/svtools/source/dialogs/wizardmachine.cxx b/svtools/source/dialogs/wizardmachine.cxx
index 4339551d35dc..6cc223397b54 100644
--- a/svtools/source/dialogs/wizardmachine.cxx
+++ b/svtools/source/dialogs/wizardmachine.cxx
@@ -270,12 +270,12 @@ namespace svt
}
- long OWizardMachine::DeactivatePage()
+ bool OWizardMachine::DeactivatePage()
{
WizardState nCurrentState = getCurrentState();
if (!leaveState(nCurrentState) || !WizardDialog::DeactivatePage())
- return sal_False;
- return sal_True;
+ return false;
+ return true;
}
diff --git a/svtools/source/dialogs/wizdlg.cxx b/svtools/source/dialogs/wizdlg.cxx
index e52031383900..5c42e0c6f93e 100644
--- a/svtools/source/dialogs/wizdlg.cxx
+++ b/svtools/source/dialogs/wizdlg.cxx
@@ -480,12 +480,12 @@ void WizardDialog::ActivatePage()
-long WizardDialog::DeactivatePage()
+bool WizardDialog::DeactivatePage()
{
if ( maDeactivateHdl.IsSet() )
return maDeactivateHdl.Call( this );
else
- return sal_True;
+ return true;
}
--
cgit