summaryrefslogtreecommitdiff
path: root/extensions
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 /extensions
parentb5e11641a7cec634c603213869a3475b1e01084e (diff)
svtools: sal_Bool->bool
Change-Id: I42a341b5805e0b2a7d619ba552700db35815afd5
Diffstat (limited to 'extensions')
-rw-r--r--extensions/source/abpilot/abpfinalpage.cxx10
-rw-r--r--extensions/source/abpilot/abpfinalpage.hxx2
-rw-r--r--extensions/source/abpilot/abspage.cxx2
-rw-r--r--extensions/source/abpilot/abspilot.cxx22
-rw-r--r--extensions/source/abpilot/abspilot.hxx4
-rw-r--r--extensions/source/abpilot/tableselectionpage.cxx6
-rw-r--r--extensions/source/abpilot/tableselectionpage.hxx2
-rw-r--r--extensions/source/abpilot/typeselectionpage.cxx12
-rw-r--r--extensions/source/abpilot/typeselectionpage.hxx2
-rw-r--r--extensions/source/dbpilots/commonpagesdbp.cxx14
-rw-r--r--extensions/source/dbpilots/commonpagesdbp.hxx4
-rw-r--r--extensions/source/dbpilots/controlwizard.cxx4
-rw-r--r--extensions/source/dbpilots/gridwizard.cxx20
-rw-r--r--extensions/source/dbpilots/gridwizard.hxx6
-rw-r--r--extensions/source/dbpilots/groupboxwiz.cxx26
-rw-r--r--extensions/source/dbpilots/groupboxwiz.hxx10
-rw-r--r--extensions/source/dbpilots/listcombowizard.cxx36
-rw-r--r--extensions/source/dbpilots/listcombowizard.hxx10
18 files changed, 96 insertions, 96 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();
diff --git a/extensions/source/dbpilots/commonpagesdbp.cxx b/extensions/source/dbpilots/commonpagesdbp.cxx
index 1bb6bd0e8571..ba38dac81f99 100644
--- a/extensions/source/dbpilots/commonpagesdbp.cxx
+++ b/extensions/source/dbpilots/commonpagesdbp.cxx
@@ -153,10 +153,10 @@ namespace dbp
}
- sal_Bool OTableSelectionPage::commitPage( ::svt::WizardTypes::CommitPageReason _eReason )
+ bool OTableSelectionPage::commitPage( ::svt::WizardTypes::CommitPageReason _eReason )
{
if (!OControlWizardPage::commitPage(_eReason))
- return sal_False;
+ return false;
const OControlWizardContext& rContext = getContext();
try
@@ -179,14 +179,14 @@ namespace dbp
setFormConnection( xOldConn, sal_False );
if (!updateContext())
- return sal_False;
+ return false;
}
catch(const Exception&)
{
OSL_FAIL("OTableSelectionPage::commitPage: caught an exception!");
}
- return sal_True;
+ return true;
}
@@ -481,14 +481,14 @@ namespace dbp
}
- sal_Bool ODBFieldPage::commitPage( ::svt::WizardTypes::CommitPageReason _eReason )
+ bool ODBFieldPage::commitPage( ::svt::WizardTypes::CommitPageReason _eReason )
{
if (!OMaybeListSelectionPage::commitPage(_eReason))
- return sal_False;
+ return false;
implCommit(getDBFieldSetting());
- return sal_True;
+ return true;
}
diff --git a/extensions/source/dbpilots/commonpagesdbp.hxx b/extensions/source/dbpilots/commonpagesdbp.hxx
index ff61894cba3a..78f119a029de 100644
--- a/extensions/source/dbpilots/commonpagesdbp.hxx
+++ b/extensions/source/dbpilots/commonpagesdbp.hxx
@@ -56,7 +56,7 @@ namespace dbp
// OWizardPage overridables
virtual void initializePage();
- virtual sal_Bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason );
+ virtual bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason );
protected:
DECL_LINK( OnListboxSelection, ListBox* );
@@ -123,7 +123,7 @@ namespace dbp
// OWizardPage overridables
virtual void initializePage();
- virtual sal_Bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason );
+ virtual bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason );
// own overridables
virtual OUString& getDBFieldSetting() = 0;
diff --git a/extensions/source/dbpilots/controlwizard.cxx b/extensions/source/dbpilots/controlwizard.cxx
index 900b0e55a669..a1f70e35ae85 100644
--- a/extensions/source/dbpilots/controlwizard.cxx
+++ b/extensions/source/dbpilots/controlwizard.cxx
@@ -281,9 +281,9 @@ namespace dbp
initContext();
SetPageSizePixel(LogicToPixel(::Size(WINDOW_SIZE_X, WINDOW_SIZE_Y), MAP_APPFONT));
- ShowButtonFixedLine(sal_True);
+ ShowButtonFixedLine(true);
defaultButton(WZB_NEXT);
- enableButtons(WZB_FINISH, sal_False);
+ enableButtons(WZB_FINISH, false);
}
diff --git a/extensions/source/dbpilots/gridwizard.cxx b/extensions/source/dbpilots/gridwizard.cxx
index 6ddfa06f5b20..0f3d457697ef 100644
--- a/extensions/source/dbpilots/gridwizard.cxx
+++ b/extensions/source/dbpilots/gridwizard.cxx
@@ -261,33 +261,33 @@ namespace dbp
enableButtons(WZB_PREVIOUS, m_bHadDataSelection ? (GW_STATE_DATASOURCE_SELECTION < _nState) : GW_STATE_FIELDSELECTION < _nState);
enableButtons(WZB_NEXT, GW_STATE_FIELDSELECTION != _nState);
if (_nState < GW_STATE_FIELDSELECTION)
- enableButtons(WZB_FINISH, sal_False);
+ enableButtons(WZB_FINISH, false);
if (GW_STATE_FIELDSELECTION == _nState)
defaultButton(WZB_FINISH);
}
- sal_Bool OGridWizard::leaveState(WizardState _nState)
+ bool OGridWizard::leaveState(WizardState _nState)
{
if (!OControlWizard::leaveState(_nState))
- return sal_False;
+ return false;
if (GW_STATE_FIELDSELECTION == _nState)
defaultButton(WZB_NEXT);
- return sal_True;
+ return true;
}
- sal_Bool OGridWizard::onFinish()
+ bool OGridWizard::onFinish()
{
if ( !OControlWizard::onFinish() )
- return sal_False;
+ return false;
implApplySettings();
- return sal_True;
+ return true;
}
@@ -357,10 +357,10 @@ namespace dbp
}
- sal_Bool OGridFieldsSelection::commitPage( ::svt::WizardTypes::CommitPageReason _eReason )
+ bool OGridFieldsSelection::commitPage( ::svt::WizardTypes::CommitPageReason _eReason )
{
if (!OGridPage::commitPage(_eReason))
- return sal_False;
+ return false;
OGridSettings& rSettings = getSettings();
sal_uInt16 nSelected = m_aSelFields.GetEntryCount();
@@ -371,7 +371,7 @@ namespace dbp
for (sal_uInt16 i=0; i<nSelected; ++i, ++pSelected)
*pSelected = m_aSelFields.GetEntry(i);
- return sal_True;
+ return true;
}
diff --git a/extensions/source/dbpilots/gridwizard.hxx b/extensions/source/dbpilots/gridwizard.hxx
index 9d8044b4d5f4..aacd04c789c2 100644
--- a/extensions/source/dbpilots/gridwizard.hxx
+++ b/extensions/source/dbpilots/gridwizard.hxx
@@ -59,8 +59,8 @@ namespace dbp
virtual ::svt::OWizardPage* createPage( WizardState _nState );
virtual WizardState determineNextState( WizardState _nCurrentState ) const;
virtual void enterState( WizardState _nState );
- virtual sal_Bool leaveState( WizardState _nState );
- virtual sal_Bool onFinish();
+ virtual bool leaveState( WizardState _nState );
+ virtual bool onFinish();
virtual sal_Bool approveControl(sal_Int16 _nClassId);
@@ -105,7 +105,7 @@ namespace dbp
// OWizardPage overridables
virtual void initializePage();
- virtual sal_Bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason );
+ virtual bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason );
virtual bool canAdvance() const;
protected:
diff --git a/extensions/source/dbpilots/groupboxwiz.cxx b/extensions/source/dbpilots/groupboxwiz.cxx
index acca9657a6a3..08d90dafd593 100644
--- a/extensions/source/dbpilots/groupboxwiz.cxx
+++ b/extensions/source/dbpilots/groupboxwiz.cxx
@@ -170,7 +170,7 @@ namespace dbp
}
- sal_Bool OGroupBoxWizard::onFinish()
+ bool OGroupBoxWizard::onFinish()
{
// commit the basic control setttings
commitControlSettings(&m_aSettings);
@@ -248,10 +248,10 @@ namespace dbp
}
- sal_Bool ORadioSelectionPage::commitPage( ::svt::WizardTypes::CommitPageReason _eReason )
+ bool ORadioSelectionPage::commitPage( ::svt::WizardTypes::CommitPageReason _eReason )
{
if (!OGBWPage::commitPage(_eReason))
- return sal_False;
+ return false;
// copy the names of the radio buttons to be inserted
// and initialize the values
@@ -266,7 +266,7 @@ namespace dbp
rSettings.aValues.push_back(OUString::number((i + 1)));
}
- return sal_True;
+ return true;
}
@@ -378,15 +378,15 @@ namespace dbp
}
- sal_Bool ODefaultFieldSelectionPage::commitPage( ::svt::WizardTypes::CommitPageReason _eReason )
+ bool ODefaultFieldSelectionPage::commitPage( ::svt::WizardTypes::CommitPageReason _eReason )
{
if (!OMaybeListSelectionPage::commitPage(_eReason))
- return sal_False;
+ return false;
OOptionGroupSettings& rSettings = getSettings();
implCommit(rSettings.sDefaultField);
- return sal_True;
+ return true;
}
@@ -468,10 +468,10 @@ namespace dbp
}
- sal_Bool OOptionValuesPage::commitPage( ::svt::WizardTypes::CommitPageReason _eReason )
+ bool OOptionValuesPage::commitPage( ::svt::WizardTypes::CommitPageReason _eReason )
{
if (!OGBWPage::commitPage(_eReason))
- return sal_False;
+ return false;
OOptionGroupSettings& rSettings = getSettings();
@@ -480,7 +480,7 @@ namespace dbp
// copy the uncommitted values
rSettings.aValues = m_aUncommittedValues;
- return sal_True;
+ return true;
}
@@ -536,14 +536,14 @@ namespace dbp
}
- sal_Bool OFinalizeGBWPage::commitPage( ::svt::WizardTypes::CommitPageReason _eReason )
+ bool OFinalizeGBWPage::commitPage( ::svt::WizardTypes::CommitPageReason _eReason )
{
if (!OGBWPage::commitPage(_eReason))
- return sal_False;
+ return false;
getSettings().sControlLabel = m_aName.GetText();
- return sal_True;
+ return true;
}
diff --git a/extensions/source/dbpilots/groupboxwiz.hxx b/extensions/source/dbpilots/groupboxwiz.hxx
index c38e712a0056..1f2355804d47 100644
--- a/extensions/source/dbpilots/groupboxwiz.hxx
+++ b/extensions/source/dbpilots/groupboxwiz.hxx
@@ -65,7 +65,7 @@ namespace dbp
virtual ::svt::OWizardPage* createPage( WizardState _nState );
virtual WizardState determineNextState( WizardState _nCurrentState ) const;
virtual void enterState( WizardState _nState );
- virtual sal_Bool onFinish();
+ virtual bool onFinish();
virtual sal_Bool approveControl(sal_Int16 _nClassId);
@@ -108,7 +108,7 @@ namespace dbp
// OWizardPage overridables
virtual void initializePage();
- virtual sal_Bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason );
+ virtual bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason );
virtual bool canAdvance() const;
DECL_LINK( OnMoveEntry, PushButton* );
@@ -136,7 +136,7 @@ namespace dbp
protected:
// OWizardPage overridables
virtual void initializePage();
- virtual sal_Bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason );
+ virtual bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason );
OOptionGroupSettings& getSettings() { return static_cast<OGroupBoxWizard*>(getDialog())->getSettings(); }
};
@@ -167,7 +167,7 @@ namespace dbp
// OWizardPage overridables
virtual void initializePage();
- virtual sal_Bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason );
+ virtual bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason );
void implTraveledOptions();
@@ -209,7 +209,7 @@ namespace dbp
// OWizardPage overridables
virtual void initializePage();
- virtual sal_Bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason );
+ virtual bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason );
virtual bool canAdvance() const;
};
diff --git a/extensions/source/dbpilots/listcombowizard.cxx b/extensions/source/dbpilots/listcombowizard.cxx
index 5cf9b66f1fce..dd98d9452897 100644
--- a/extensions/source/dbpilots/listcombowizard.cxx
+++ b/extensions/source/dbpilots/listcombowizard.cxx
@@ -131,22 +131,22 @@ namespace dbp
enableButtons(WZB_PREVIOUS, m_bHadDataSelection ? (LCW_STATE_DATASOURCE_SELECTION < _nState) : LCW_STATE_TABLESELECTION < _nState);
enableButtons(WZB_NEXT, getFinalState() != _nState);
if (_nState < getFinalState())
- enableButtons(WZB_FINISH, sal_False);
+ enableButtons(WZB_FINISH, false);
if (getFinalState() == _nState)
defaultButton(WZB_FINISH);
}
- sal_Bool OListComboWizard::leaveState(WizardState _nState)
+ bool OListComboWizard::leaveState(WizardState _nState)
{
if (!OControlWizard::leaveState(_nState))
- return sal_False;
+ return false;
if (getFinalState() == _nState)
defaultButton(WZB_NEXT);
- return sal_True;
+ return true;
}
@@ -210,13 +210,13 @@ namespace dbp
}
- sal_Bool OListComboWizard::onFinish()
+ bool OListComboWizard::onFinish()
{
if ( !OControlWizard::onFinish() )
- return sal_False;
+ return false;
implApplySettings();
- return sal_True;
+ return true;
}
@@ -343,18 +343,18 @@ namespace dbp
}
- sal_Bool OContentTableSelection::commitPage( ::svt::WizardTypes::CommitPageReason _eReason )
+ bool OContentTableSelection::commitPage( ::svt::WizardTypes::CommitPageReason _eReason )
{
if (!OLCPage::commitPage(_eReason))
- return sal_False;
+ return false;
OListComboSettings& rSettings = getSettings();
rSettings.sListContentTable = m_aSelectTable.GetSelectEntry();
if (rSettings.sListContentTable.isEmpty() && (::svt::WizardTypes::eTravelBackward != _eReason))
// need to select a table
- return sal_False;
+ return false;
- return sal_True;
+ return true;
}
@@ -421,14 +421,14 @@ namespace dbp
}
- sal_Bool OContentFieldSelection::commitPage( ::svt::WizardTypes::CommitPageReason _eReason )
+ bool OContentFieldSelection::commitPage( ::svt::WizardTypes::CommitPageReason _eReason )
{
if (!OLCPage::commitPage(_eReason))
- return sal_False;
+ return false;
getSettings().sListContentField = m_aSelectTableField.GetSelectEntry();
- return sal_True;
+ return true;
}
@@ -499,15 +499,15 @@ namespace dbp
}
- sal_Bool OLinkFieldsPage::commitPage( ::svt::WizardTypes::CommitPageReason _eReason )
+ bool OLinkFieldsPage::commitPage( ::svt::WizardTypes::CommitPageReason _eReason )
{
if (!OLCPage::commitPage(_eReason))
- return sal_False;
+ return false;
getSettings().sLinkedFormField = m_aValueListField.GetText();
getSettings().sLinkedListField = m_aTableField.GetText();
- return sal_True;
+ return true;
}
@@ -530,7 +530,7 @@ namespace dbp
void OComboDBFieldPage::ActivatePage()
{
ODBFieldPage::ActivatePage();
- getDialog()->enableButtons(WZB_FINISH, sal_True);
+ getDialog()->enableButtons(WZB_FINISH, true);
}
diff --git a/extensions/source/dbpilots/listcombowizard.hxx b/extensions/source/dbpilots/listcombowizard.hxx
index 0b594b6c79f2..adb02f5cac2e 100644
--- a/extensions/source/dbpilots/listcombowizard.hxx
+++ b/extensions/source/dbpilots/listcombowizard.hxx
@@ -71,8 +71,8 @@ namespace dbp
virtual ::svt::OWizardPage* createPage( WizardState _nState );
virtual WizardState determineNextState( WizardState _nCurrentState ) const;
virtual void enterState( WizardState _nState );
- virtual sal_Bool leaveState( WizardState _nState );
- virtual sal_Bool onFinish();
+ virtual bool leaveState( WizardState _nState );
+ virtual bool onFinish();
virtual sal_Bool approveControl(sal_Int16 _nClassId);
@@ -120,7 +120,7 @@ namespace dbp
// OWizardPage overridables
virtual void initializePage();
- virtual sal_Bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason );
+ virtual bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason );
virtual bool canAdvance() const;
protected:
@@ -154,7 +154,7 @@ namespace dbp
// OWizardPage overridables
virtual void initializePage();
- virtual sal_Bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason );
+ virtual bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason );
virtual bool canAdvance() const;
};
@@ -181,7 +181,7 @@ namespace dbp
// OWizardPage overridables
virtual void initializePage();
- virtual sal_Bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason );
+ virtual bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason );
virtual bool canAdvance() const;
private: