summaryrefslogtreecommitdiff
path: root/dbaccess/source/ext
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-03-25 14:20:18 +0200
committerNoel Grandin <noel@peralex.com>2014-03-25 14:32:57 +0200
commit80ef0dfedcbba5a0c2cb8de409cc24200191fab8 (patch)
tree4799ef80c36dabd4adb50da98d5a9baeff237b8a /dbaccess/source/ext
parentb5e11641a7cec634c603213869a3475b1e01084e (diff)
svtools: sal_Bool->bool
Change-Id: I42a341b5805e0b2a7d619ba552700db35815afd5
Diffstat (limited to 'dbaccess/source/ext')
-rw-r--r--dbaccess/source/ext/macromigration/macromigrationdialog.cxx14
-rw-r--r--dbaccess/source/ext/macromigration/macromigrationdialog.hxx6
-rw-r--r--dbaccess/source/ext/macromigration/macromigrationpages.cxx10
-rw-r--r--dbaccess/source/ext/macromigration/macromigrationpages.hxx2
4 files changed, 16 insertions, 16 deletions
diff --git a/dbaccess/source/ext/macromigration/macromigrationdialog.cxx b/dbaccess/source/ext/macromigration/macromigrationdialog.cxx
index 3e0fc452beea..29e3c4c99cbe 100644
--- a/dbaccess/source/ext/macromigration/macromigrationdialog.cxx
+++ b/dbaccess/source/ext/macromigration/macromigrationdialog.cxx
@@ -243,20 +243,20 @@ namespace dbmm
}
}
- sal_Bool MacroMigrationDialog::prepareLeaveCurrentState( CommitPageReason _eReason )
+ bool MacroMigrationDialog::prepareLeaveCurrentState( CommitPageReason _eReason )
{
if ( !MacroMigrationDialog_Base::prepareLeaveCurrentState( _eReason ) )
- return sal_False;
+ return false;
switch ( getCurrentState() )
{
case STATE_CLOSE_SUB_DOCS:
if ( !impl_closeSubDocs_nothrow() )
- return sal_False;
+ return false;
break;
case STATE_BACKUP_DBDOC:
if ( !impl_backupDocument_nothrow() )
- return sal_False;
+ return false;
break;
case STATE_MIGRATE:
break;
@@ -266,10 +266,10 @@ namespace dbmm
OSL_FAIL( "MacroMigrationDialog::prepareLeaveCurrentState: unhandled state!" );
}
- return sal_True;
+ return true;
}
- sal_Bool MacroMigrationDialog::leaveState( WizardState _nState )
+ bool MacroMigrationDialog::leaveState( WizardState _nState )
{
return MacroMigrationDialog_Base::leaveState( _nState );
}
@@ -279,7 +279,7 @@ namespace dbmm
return MacroMigrationDialog_Base::determineNextState( _nCurrentState );
}
- sal_Bool MacroMigrationDialog::onFinish()
+ bool MacroMigrationDialog::onFinish()
{
return MacroMigrationDialog_Base::onFinish();
}
diff --git a/dbaccess/source/ext/macromigration/macromigrationdialog.hxx b/dbaccess/source/ext/macromigration/macromigrationdialog.hxx
index 43e6e12012ae..e55a770fef2e 100644
--- a/dbaccess/source/ext/macromigration/macromigrationdialog.hxx
+++ b/dbaccess/source/ext/macromigration/macromigrationdialog.hxx
@@ -50,10 +50,10 @@ namespace dbmm
protected:
// OWizardMachine overridables
virtual void enterState( WizardState _nState );
- virtual sal_Bool prepareLeaveCurrentState( CommitPageReason _eReason );
- virtual sal_Bool leaveState( WizardState _nState );
+ virtual bool prepareLeaveCurrentState( CommitPageReason _eReason );
+ virtual bool leaveState( WizardState _nState );
virtual WizardState determineNextState( WizardState _nCurrentState ) const;
- virtual sal_Bool onFinish();
+ virtual bool onFinish();
// Dialog overridables
virtual bool Close();
diff --git a/dbaccess/source/ext/macromigration/macromigrationpages.cxx b/dbaccess/source/ext/macromigration/macromigrationpages.cxx
index d76ade61dbcc..762a5e99decd 100644
--- a/dbaccess/source/ext/macromigration/macromigrationpages.cxx
+++ b/dbaccess/source/ext/macromigration/macromigrationpages.cxx
@@ -152,18 +152,18 @@ namespace dbmm
return !m_aSaveAsLocation.GetText().isEmpty();
}
- sal_Bool SaveDBDocPage::commitPage( ::svt::WizardTypes::CommitPageReason _eReason )
+ bool SaveDBDocPage::commitPage( ::svt::WizardTypes::CommitPageReason _eReason )
{
if ( !MacroMigrationPage::commitPage( _eReason ) )
- return sal_False;
+ return false;
if ( ::svt::WizardTypes::eTravelBackward == _eReason )
- return sal_True;
+ return true;
if ( !m_aLocationController.prepareCommit() )
- return sal_False;
+ return false;
- return sal_True;
+ return true;
}
TabPage* SaveDBDocPage::Create( ::svt::RoadmapWizard& _rParentDialog )
diff --git a/dbaccess/source/ext/macromigration/macromigrationpages.hxx b/dbaccess/source/ext/macromigration/macromigrationpages.hxx
index 8e36d4909c56..8b6a87dd4426 100644
--- a/dbaccess/source/ext/macromigration/macromigrationpages.hxx
+++ b/dbaccess/source/ext/macromigration/macromigrationpages.hxx
@@ -95,7 +95,7 @@ namespace dbmm
protected:
// IWizardPageController overridables
virtual void initializePage();
- virtual sal_Bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason );
+ virtual bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason );
virtual bool canAdvance() const;
private: