diff options
author | Noel Grandin <noel@peralex.com> | 2014-03-25 14:20:18 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2014-03-25 14:32:57 +0200 |
commit | 80ef0dfedcbba5a0c2cb8de409cc24200191fab8 (patch) | |
tree | 4799ef80c36dabd4adb50da98d5a9baeff237b8a /extensions/source/abpilot | |
parent | b5e11641a7cec634c603213869a3475b1e01084e (diff) |
svtools: sal_Bool->bool
Change-Id: I42a341b5805e0b2a7d619ba552700db35815afd5
Diffstat (limited to 'extensions/source/abpilot')
-rw-r--r-- | extensions/source/abpilot/abpfinalpage.cxx | 10 | ||||
-rw-r--r-- | extensions/source/abpilot/abpfinalpage.hxx | 2 | ||||
-rw-r--r-- | extensions/source/abpilot/abspage.cxx | 2 | ||||
-rw-r--r-- | extensions/source/abpilot/abspilot.cxx | 22 | ||||
-rw-r--r-- | extensions/source/abpilot/abspilot.hxx | 4 | ||||
-rw-r--r-- | extensions/source/abpilot/tableselectionpage.cxx | 6 | ||||
-rw-r--r-- | extensions/source/abpilot/tableselectionpage.hxx | 2 | ||||
-rw-r--r-- | extensions/source/abpilot/typeselectionpage.cxx | 12 | ||||
-rw-r--r-- | extensions/source/abpilot/typeselectionpage.hxx | 2 |
9 files changed, 31 insertions, 31 deletions
diff --git a/extensions/source/abpilot/abpfinalpage.cxx b/extensions/source/abpilot/abpfinalpage.cxx index 4e9d69c36604..871f4be90a81 100644 --- a/extensions/source/abpilot/abpfinalpage.cxx +++ b/extensions/source/abpilot/abpfinalpage.cxx @@ -125,15 +125,15 @@ namespace abp } - sal_Bool FinalPage::commitPage( ::svt::WizardTypes::CommitPageReason _eReason ) + bool FinalPage::commitPage( ::svt::WizardTypes::CommitPageReason _eReason ) { if (!AddressBookSourcePage::commitPage(_eReason)) - return sal_False; + return false; if ( ( ::svt::WizardTypes::eTravelBackward != _eReason ) && ( !m_aLocationController.prepareCommit() ) ) - return sal_False; + return false; AddressSettings& rSettings = getSettings(); rSettings.sDataSourceName = m_aLocationController.getURL(); @@ -141,7 +141,7 @@ namespace abp if ( rSettings.bRegisterDataSource ) rSettings.sRegisteredDataSourceName = m_aName.GetText(); - return sal_True; + return true; } @@ -168,7 +168,7 @@ namespace abp // default the "next" button, again getDialog()->defaultButton( WZB_NEXT ); // disable the finish button - getDialog()->enableButtons( WZB_FINISH, sal_False ); + getDialog()->enableButtons( WZB_FINISH, false ); } diff --git a/extensions/source/abpilot/abpfinalpage.hxx b/extensions/source/abpilot/abpfinalpage.hxx index a65af43b5c72..84ccc9f72184 100644 --- a/extensions/source/abpilot/abpfinalpage.hxx +++ b/extensions/source/abpilot/abpfinalpage.hxx @@ -58,7 +58,7 @@ namespace abp protected: // OWizardPage overridables virtual void initializePage(); - virtual sal_Bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason ); + virtual bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason ); // TabDialog overridables virtual void ActivatePage(); diff --git a/extensions/source/abpilot/abspage.cxx b/extensions/source/abpilot/abspage.cxx index a6245db2a178..f1277a83c33e 100644 --- a/extensions/source/abpilot/abspage.cxx +++ b/extensions/source/abpilot/abspage.cxx @@ -40,7 +40,7 @@ namespace abp void AddressBookSourcePage::DeactivatePage() { AddressBookSourcePage_Base::DeactivatePage(); - getDialog()->enableButtons(WZB_NEXT, sal_True); + getDialog()->enableButtons(WZB_NEXT, true); } diff --git a/extensions/source/abpilot/abspilot.cxx b/extensions/source/abpilot/abspilot.cxx index 765890abc8ac..cfad994c9d7a 100644 --- a/extensions/source/abpilot/abspilot.cxx +++ b/extensions/source/abpilot/abspilot.cxx @@ -67,7 +67,7 @@ namespace abp { SetPageSizePixel(LogicToPixel(Size(WINDOW_SIZE_X, WINDOW_SIZE_Y), MAP_APPFONT)); - ShowButtonFixedLine(sal_True); + ShowButtonFixedLine(true); declarePath( PATH_COMPLETE, STATE_SELECT_ABTYPE, @@ -122,7 +122,7 @@ namespace abp m_aSettings.bIgnoreNoTable = false; defaultButton(WZB_NEXT); - enableButtons(WZB_FINISH, sal_False); + enableButtons(WZB_FINISH, false); ActivatePage(); typeSelectionChanged( m_aSettings.eType ); @@ -209,16 +209,16 @@ namespace abp } - sal_Bool OAddessBookSourcePilot::onFinish() + bool OAddessBookSourcePilot::onFinish() { if ( !OAddessBookSourcePilot_Base::onFinish() ) - return sal_False; + return false; implCommitAll(); addressconfig::markPilotSuccess( getORB() ); - return sal_True; + return true; } @@ -244,15 +244,15 @@ namespace abp } - sal_Bool OAddessBookSourcePilot::prepareLeaveCurrentState( CommitPageReason _eReason ) + bool OAddessBookSourcePilot::prepareLeaveCurrentState( CommitPageReason _eReason ) { if ( !OAddessBookSourcePilot_Base::prepareLeaveCurrentState( _eReason ) ) - return sal_False; + return false; if ( _eReason == eTravelBackward ) - return sal_True; + return true; - sal_Bool bAllow = sal_True; + bool bAllow = true; switch ( getCurrentState() ) { @@ -266,7 +266,7 @@ namespace abp if ( !connectToDataSource( sal_False ) ) { // connecting did not succeed -> do not allow proceeding - bAllow = sal_False; + bAllow = false; break; } @@ -279,7 +279,7 @@ namespace abp if ( RET_YES != QueryBox( this, ModuleRes( ( getSettings().eType == AST_EVOLUTION_GROUPWISE ? RID_QRY_NO_EVO_GW : RID_QRY_NOTABLES ) ) ).Execute() ) { // cannot ask the user, or the user chose to use this data source, though there are no tables - bAllow = sal_False; + bAllow = false; break; } diff --git a/extensions/source/abpilot/abspilot.hxx b/extensions/source/abpilot/abspilot.hxx index 082c46113895..beecbf0a8d43 100644 --- a/extensions/source/abpilot/abspilot.hxx +++ b/extensions/source/abpilot/abspilot.hxx @@ -71,8 +71,8 @@ namespace abp // OWizardMachine overridables virtual ::svt::OWizardPage* createPage( WizardState _nState ); virtual void enterState( WizardState _nState ); - virtual sal_Bool prepareLeaveCurrentState( CommitPageReason _eReason ); - virtual sal_Bool onFinish(); + virtual bool prepareLeaveCurrentState( CommitPageReason _eReason ); + virtual bool onFinish(); // RoadmapWizard virtual OUString getStateDisplayName( WizardState _nState ) const; diff --git a/extensions/source/abpilot/tableselectionpage.cxx b/extensions/source/abpilot/tableselectionpage.cxx index 655b90182a8b..4b66b830dd7e 100644 --- a/extensions/source/abpilot/tableselectionpage.cxx +++ b/extensions/source/abpilot/tableselectionpage.cxx @@ -99,15 +99,15 @@ namespace abp } - sal_Bool TableSelectionPage::commitPage( ::svt::WizardTypes::CommitPageReason _eReason ) + bool TableSelectionPage::commitPage( ::svt::WizardTypes::CommitPageReason _eReason ) { if (!AddressBookSourcePage::commitPage(_eReason)) - return sal_False; + return false; AddressSettings& rSettings = getSettings(); rSettings.sSelectedTable = m_aTableList.GetSelectEntry(); - return sal_True; + return true; } diff --git a/extensions/source/abpilot/tableselectionpage.hxx b/extensions/source/abpilot/tableselectionpage.hxx index 99be33cca9aa..43ed8896b7e7 100644 --- a/extensions/source/abpilot/tableselectionpage.hxx +++ b/extensions/source/abpilot/tableselectionpage.hxx @@ -43,7 +43,7 @@ namespace abp protected: // OWizardPage overridables virtual void initializePage(); - virtual sal_Bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason ); + virtual bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason ); // TabDialog overridables virtual void ActivatePage(); diff --git a/extensions/source/abpilot/typeselectionpage.cxx b/extensions/source/abpilot/typeselectionpage.cxx index b5d0c86aa000..0903175ee403 100644 --- a/extensions/source/abpilot/typeselectionpage.cxx +++ b/extensions/source/abpilot/typeselectionpage.cxx @@ -188,14 +188,14 @@ namespace abp } } - getDialog()->enableButtons(WZB_PREVIOUS, sal_False); + getDialog()->enableButtons(WZB_PREVIOUS, false); } void TypeSelectionPage::DeactivatePage() { AddressBookSourcePage::DeactivatePage(); - getDialog()->enableButtons(WZB_PREVIOUS, sal_True); + getDialog()->enableButtons(WZB_PREVIOUS, true); } @@ -233,22 +233,22 @@ namespace abp } - sal_Bool TypeSelectionPage::commitPage( ::svt::WizardTypes::CommitPageReason _eReason ) + bool TypeSelectionPage::commitPage( ::svt::WizardTypes::CommitPageReason _eReason ) { if (!AddressBookSourcePage::commitPage(_eReason)) - return sal_False; + return false; if (AST_INVALID == getSelectedType( )) { ErrorBox aError(this, ModuleRes(RID_ERR_NEEDTYPESELECTION)); aError.Execute(); - return sal_False; + return false; } AddressSettings& rSettings = getSettings(); rSettings.eType = getSelectedType(); - return sal_True; + return true; } diff --git a/extensions/source/abpilot/typeselectionpage.hxx b/extensions/source/abpilot/typeselectionpage.hxx index 2290d03058f0..bc0ef97358ca 100644 --- a/extensions/source/abpilot/typeselectionpage.hxx +++ b/extensions/source/abpilot/typeselectionpage.hxx @@ -75,7 +75,7 @@ namespace abp protected: // OWizardPage overridables virtual void initializePage(); - virtual sal_Bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason ); + virtual bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason ); // TabDialog overridables virtual void ActivatePage(); |