From 7ae4102f171c5f0d452fa78c5c17722bc9649fc5 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Wed, 30 Apr 2014 11:46:15 +0200 Subject: extensions: sal_Bool->bool Change-Id: I1730f99c08690138e9aa7aba54304fd7bc51491d --- extensions/source/dbpilots/commonpagesdbp.cxx | 4 ++-- extensions/source/dbpilots/controlwizard.cxx | 26 ++++++++++++------------ extensions/source/dbpilots/controlwizard.hxx | 22 ++++++++++---------- extensions/source/dbpilots/dbpservices.cxx | 4 ++-- extensions/source/dbpilots/gridwizard.cxx | 16 +++++++-------- extensions/source/dbpilots/gridwizard.hxx | 6 +++--- extensions/source/dbpilots/groupboxwiz.cxx | 20 +++++++++--------- extensions/source/dbpilots/groupboxwiz.hxx | 6 +++--- extensions/source/dbpilots/listcombowizard.cxx | 28 +++++++++++++------------- extensions/source/dbpilots/listcombowizard.hxx | 14 ++++++------- extensions/source/dbpilots/wizardcontext.hxx | 2 +- 11 files changed, 74 insertions(+), 74 deletions(-) (limited to 'extensions/source/dbpilots') diff --git a/extensions/source/dbpilots/commonpagesdbp.cxx b/extensions/source/dbpilots/commonpagesdbp.cxx index ba38dac81f99..ee6dd8119221 100644 --- a/extensions/source/dbpilots/commonpagesdbp.cxx +++ b/extensions/source/dbpilots/commonpagesdbp.cxx @@ -176,7 +176,7 @@ namespace dbp rContext.xForm->setPropertyValue("CommandType", makeAny( nCommandType ) ); if ( !rContext.bEmbedded ) - setFormConnection( xOldConn, sal_False ); + setFormConnection( xOldConn, false ); if (!updateContext()) return false; @@ -419,7 +419,7 @@ namespace dbp void OMaybeListSelectionPage::implInitialize(const OUString& _rSelection) { DBG_ASSERT(m_pYes, "OMaybeListSelectionPage::implInitialize: no controls announced!"); - sal_Bool bIsSelection = ! _rSelection.isEmpty(); + bool bIsSelection = ! _rSelection.isEmpty(); m_pYes->Check(bIsSelection); m_pNo->Check(!bIsSelection); m_pList->Enable(bIsSelection); diff --git a/extensions/source/dbpilots/controlwizard.cxx b/extensions/source/dbpilots/controlwizard.cxx index 997a070a2570..530ef32a65e8 100644 --- a/extensions/source/dbpilots/controlwizard.cxx +++ b/extensions/source/dbpilots/controlwizard.cxx @@ -119,7 +119,7 @@ namespace dbp } - sal_Bool OControlWizardPage::updateContext() + bool OControlWizardPage::updateContext() { return getDialog()->updateContext(OAccessRegulator()); } @@ -131,7 +131,7 @@ namespace dbp } - void OControlWizardPage::setFormConnection( const Reference< XConnection >& _rxConn, sal_Bool _bAutoDispose ) + void OControlWizardPage::setFormConnection( const Reference< XConnection >& _rxConn, bool _bAutoDispose ) { getDialog()->setFormConnection( OAccessRegulator(), _rxConn, _bAutoDispose ); } @@ -143,7 +143,7 @@ namespace dbp } - void OControlWizardPage::fillListBox(ListBox& _rList, const Sequence< OUString >& _rItems, sal_Bool _bClear) + void OControlWizardPage::fillListBox(ListBox& _rList, const Sequence< OUString >& _rItems, bool _bClear) { if (_bClear) _rList.Clear(); @@ -159,7 +159,7 @@ namespace dbp } - void OControlWizardPage::fillListBox(ComboBox& _rList, const Sequence< OUString >& _rItems, sal_Bool _bClear) + void OControlWizardPage::fillListBox(ComboBox& _rList, const Sequence< OUString >& _rItems, bool _bClear) { if (_bClear) _rList.Clear(); @@ -205,7 +205,7 @@ namespace dbp } - void OControlWizardPage::adjustControlForNoDSDisplay(Control* _pControl, sal_Bool _bConstLowerDistance) + void OControlWizardPage::adjustControlForNoDSDisplay(Control* _pControl, bool _bConstLowerDistance) { ::Size aDistanceToMove = LogicToPixel( ::Size( 0, 37 ), MAP_APPFONT ); @@ -467,7 +467,7 @@ namespace dbp } - void OControlWizard::setFormConnection( const OAccessRegulator& _rAccess, const Reference< XConnection >& _rxConn, sal_Bool _bAutoDispose ) + void OControlWizard::setFormConnection( const OAccessRegulator& _rAccess, const Reference< XConnection >& _rxConn, bool _bAutoDispose ) { try { @@ -497,7 +497,7 @@ namespace dbp } - sal_Bool OControlWizard::updateContext(const OAccessRegulator&) + bool OControlWizard::updateContext(const OAccessRegulator&) { return initContext(); } @@ -518,11 +518,11 @@ namespace dbp return xHandler; } - sal_Bool OControlWizard::initContext() + bool OControlWizard::initContext() { DBG_ASSERT(m_aContext.xObjectModel.is(), "OGroupBoxWizard::initContext: have no control model to work with!"); if (!m_aContext.xObjectModel.is()) - return sal_False; + return false; // reset the context m_aContext.xForm.clear(); @@ -534,7 +534,7 @@ namespace dbp m_aContext.xObjectContainer.clear(); m_aContext.aTypes.clear(); - m_aContext.bEmbedded = sal_False; + m_aContext.bEmbedded = false; Any aSQLException; Reference< XPreparedStatement > xStatement; @@ -659,7 +659,7 @@ namespace dbp // create an interaction handler to display this exception Reference< XInteractionHandler > xHandler = getInteractionHandler(this); if ( !xHandler.is() ) - return sal_False; + return false; Reference< XInteractionRequest > xRequest = new OInteractionRequest(makeAny(aContext)); try @@ -667,7 +667,7 @@ namespace dbp xHandler->handle(xRequest); } catch(const Exception&) { } - return sal_False; + return false; } return 0 != m_aContext.aFieldNames.getLength(); @@ -726,7 +726,7 @@ namespace dbp } - sal_Bool OControlWizard::needDatasourceSelection() + bool OControlWizard::needDatasourceSelection() { // lemme see ... return (0 == getContext().aFieldNames.getLength()); diff --git a/extensions/source/dbpilots/controlwizard.hxx b/extensions/source/dbpilots/controlwizard.hxx index d2388d3b75b8..8a048a21e69e 100644 --- a/extensions/source/dbpilots/controlwizard.hxx +++ b/extensions/source/dbpilots/controlwizard.hxx @@ -69,8 +69,8 @@ namespace dbp OControlWizard* getDialog(); const OControlWizard* getDialog() const; const OControlWizardContext& getContext(); - sal_Bool updateContext(); - void setFormConnection(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConn, sal_Bool _bAutoDispose = sal_True ); + bool updateContext(); + void setFormConnection(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConn, bool _bAutoDispose = true ); ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > getFormConnection() const; @@ -82,15 +82,15 @@ namespace dbp void fillListBox( ListBox& _rList, const ::com::sun::star::uno::Sequence< OUString >& _rItems, - sal_Bool _bClear = sal_True); + bool _bClear = true); void fillListBox( ComboBox& _rList, const ::com::sun::star::uno::Sequence< OUString >& _rItems, - sal_Bool _bClear = sal_True); + bool _bClear = true); protected: void enableFormDatasourceDisplay(); - void adjustControlForNoDSDisplay(Control* _pControl, sal_Bool bConstLowerDistance = sal_False); + void adjustControlForNoDSDisplay(Control* _pControl, bool bConstLowerDistance = false); protected: // OWizardPage overridables @@ -119,15 +119,15 @@ namespace dbp virtual ~OControlWizard(); // make the some base class methods public - sal_Bool travelNext() { return OControlWizard_Base::travelNext(); } + bool travelNext() { return OControlWizard_Base::travelNext(); } public: ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > getComponentContext() const { return m_xContext; } const OControlWizardContext& getContext() const { return m_aContext; } - sal_Bool updateContext(const OAccessRegulator&); - void setFormConnection(const OAccessRegulator&, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConn, sal_Bool _bAutoDispose = sal_True ); + bool updateContext(const OAccessRegulator&); + void setFormConnection(const OAccessRegulator&, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConn, bool _bAutoDispose = true ); ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > getFormConnection(const OAccessRegulator&) const; @@ -143,18 +143,18 @@ namespace dbp // commit the control-relevant settings void commitControlSettings(OControlWizardSettings* _pSettings); - sal_Bool needDatasourceSelection(); + bool needDatasourceSelection(); ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > getFormConnection() const; - virtual sal_Bool approveControl(sal_Int16 _nClassId) = 0; + virtual bool approveControl(sal_Int16 _nClassId) = 0; // ModalDialog overridables virtual short Execute() SAL_OVERRIDE; private: - sal_Bool initContext(); + bool initContext(); void implGetDSContext(); void implDetermineForm(); diff --git a/extensions/source/dbpilots/dbpservices.cxx b/extensions/source/dbpilots/dbpservices.cxx index ede2523fecf9..da9d8dcba1c0 100644 --- a/extensions/source/dbpilots/dbpservices.cxx +++ b/extensions/source/dbpilots/dbpservices.cxx @@ -27,14 +27,14 @@ using namespace ::com::sun::star::registry; extern "C" void SAL_CALL dbp_initializeModule() { - static sal_Bool s_bInit = sal_False; + static bool s_bInit = false; if (!s_bInit) { createRegistryInfo_OGroupBoxWizard(); createRegistryInfo_OListComboWizard(); createRegistryInfo_OGridWizard(); ::dbp::OModule::setResourceFilePrefix("dbp"); - s_bInit = sal_True; + s_bInit = true; } } diff --git a/extensions/source/dbpilots/gridwizard.cxx b/extensions/source/dbpilots/gridwizard.cxx index 0f3d457697ef..a9ed641dd518 100644 --- a/extensions/source/dbpilots/gridwizard.cxx +++ b/extensions/source/dbpilots/gridwizard.cxx @@ -55,7 +55,7 @@ namespace dbp OGridWizard::OGridWizard( Window* _pParent, const Reference< XPropertySet >& _rxObjectModel, const Reference< XComponentContext >& _rxContext ) :OControlWizard(_pParent, ModuleRes(RID_DLG_GRIDWIZARD), _rxObjectModel, _rxContext) - ,m_bHadDataSelection(sal_True) + ,m_bHadDataSelection(true) { initControlSettings(&m_aSettings); @@ -68,21 +68,21 @@ namespace dbp if (!needDatasourceSelection()) { // ... skip it! skip(1); - m_bHadDataSelection = sal_False; + m_bHadDataSelection = false; } } - sal_Bool OGridWizard::approveControl(sal_Int16 _nClassId) + bool OGridWizard::approveControl(sal_Int16 _nClassId) { if (FormComponentType::GRIDCONTROL != _nClassId) - return sal_False; + return false; Reference< XGridColumnFactory > xColumnFactory(getContext().xObjectModel, UNO_QUERY); if (!xColumnFactory.is()) - return sal_False; + return false; - return sal_True; + return true; } @@ -406,7 +406,7 @@ namespace dbp IMPL_LINK(OGridFieldsSelection, OnMoveOneEntry, PushButton*, _pButton) { - sal_Bool bMoveRight = (&m_aSelectOne == _pButton); + bool bMoveRight = (&m_aSelectOne == _pButton); ListBox& rMoveTo = bMoveRight ? m_aSelFields : m_aExistFields; // the index of the selected entry @@ -461,7 +461,7 @@ namespace dbp IMPL_LINK(OGridFieldsSelection, OnMoveAllEntries, PushButton*, _pButton) { - sal_Bool bMoveRight = (&m_aSelectAll == _pButton); + bool bMoveRight = (&m_aSelectAll == _pButton); m_aExistFields.Clear(); m_aSelFields.Clear(); fillListBox(bMoveRight ? m_aSelFields : m_aExistFields, getContext().aFieldNames); diff --git a/extensions/source/dbpilots/gridwizard.hxx b/extensions/source/dbpilots/gridwizard.hxx index 128d1e68b6e9..cd89e7a298e5 100644 --- a/extensions/source/dbpilots/gridwizard.hxx +++ b/extensions/source/dbpilots/gridwizard.hxx @@ -43,7 +43,7 @@ namespace dbp { protected: OGridSettings m_aSettings; - sal_Bool m_bHadDataSelection : 1; + bool m_bHadDataSelection : 1; public: OGridWizard( @@ -62,7 +62,7 @@ namespace dbp virtual bool leaveState( WizardState _nState ) SAL_OVERRIDE; virtual bool onFinish() SAL_OVERRIDE; - virtual sal_Bool approveControl(sal_Int16 _nClassId) SAL_OVERRIDE; + virtual bool approveControl(sal_Int16 _nClassId) SAL_OVERRIDE; protected: void implApplySettings(); @@ -117,7 +117,7 @@ namespace dbp void implCheckButtons(); void implApplySettings(); - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > implGetColumns(sal_Bool _bShowError = sal_True); + ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > implGetColumns(bool _bShowError = true); }; diff --git a/extensions/source/dbpilots/groupboxwiz.cxx b/extensions/source/dbpilots/groupboxwiz.cxx index 08d90dafd593..ed7c53d3a917 100644 --- a/extensions/source/dbpilots/groupboxwiz.cxx +++ b/extensions/source/dbpilots/groupboxwiz.cxx @@ -50,8 +50,8 @@ namespace dbp OGroupBoxWizard::OGroupBoxWizard( Window* _pParent, const Reference< XPropertySet >& _rxObjectModel, const Reference< XComponentContext >& _rxContext ) :OControlWizard(_pParent, ModuleRes(RID_DLG_GROUPBOXWIZARD), _rxObjectModel, _rxContext) - ,m_bVisitedDefault(sal_False) - ,m_bVisitedDB(sal_False) + ,m_bVisitedDefault(false) + ,m_bVisitedDB(false) { initControlSettings(&m_aSettings); @@ -62,7 +62,7 @@ namespace dbp } - sal_Bool OGroupBoxWizard::approveControl(sal_Int16 _nClassId) + bool OGroupBoxWizard::approveControl(sal_Int16 _nClassId) { return FormComponentType::GROUPBOX == _nClassId; } @@ -127,7 +127,7 @@ namespace dbp DBG_ASSERT(m_aSettings.aLabels.size(), "OGroupBoxWizard::enterState: should never have reached this state!"); m_aSettings.sDefaultField = m_aSettings.aLabels[0]; } - m_bVisitedDefault = sal_True; + m_bVisitedDefault = true; break; case GBW_STATE_DBFIELD: @@ -137,7 +137,7 @@ namespace dbp if (getContext().aFieldNames.getLength()) m_aSettings.sDBField = getContext().aFieldNames[0]; } - m_bVisitedDB = sal_True; + m_bVisitedDB = true; break; } @@ -209,7 +209,7 @@ namespace dbp adjustControlForNoDSDisplay(&m_aMoveRight); adjustControlForNoDSDisplay(&m_aMoveLeft); adjustControlForNoDSDisplay(&m_aExistingRadiosLabel); - adjustControlForNoDSDisplay(&m_aExistingRadios, sal_True); + adjustControlForNoDSDisplay(&m_aExistingRadios, true); } m_aMoveLeft.SetClickHdl(LINK(this, ORadioSelectionPage, OnMoveEntry)); @@ -272,7 +272,7 @@ namespace dbp IMPL_LINK( ORadioSelectionPage, OnMoveEntry, PushButton*, _pButton ) { - sal_Bool bMoveLeft = (&m_aMoveLeft == _pButton); + bool bMoveLeft = (&m_aMoveLeft == _pButton); if (bMoveLeft) { while (m_aExistingRadios.GetSelectEntryCount()) @@ -317,9 +317,9 @@ namespace dbp void ORadioSelectionPage::implCheckMoveButtons() { - sal_Bool bHaveSome = (0 != m_aExistingRadios.GetEntryCount()); - sal_Bool bSelectedSome = (0 != m_aExistingRadios.GetSelectEntryCount()); - sal_Bool bUnfinishedInput = (!m_aRadioName.GetText().isEmpty()); + bool bHaveSome = (0 != m_aExistingRadios.GetEntryCount()); + bool bSelectedSome = (0 != m_aExistingRadios.GetSelectEntryCount()); + bool bUnfinishedInput = (!m_aRadioName.GetText().isEmpty()); m_aMoveLeft.Enable(bSelectedSome); m_aMoveRight.Enable(bUnfinishedInput); diff --git a/extensions/source/dbpilots/groupboxwiz.hxx b/extensions/source/dbpilots/groupboxwiz.hxx index ee250cb47506..ccdad61e48b0 100644 --- a/extensions/source/dbpilots/groupboxwiz.hxx +++ b/extensions/source/dbpilots/groupboxwiz.hxx @@ -48,8 +48,8 @@ namespace dbp protected: OOptionGroupSettings m_aSettings; - sal_Bool m_bVisitedDefault : 1; - sal_Bool m_bVisitedDB : 1; + bool m_bVisitedDefault : 1; + bool m_bVisitedDB : 1; public: OGroupBoxWizard( @@ -67,7 +67,7 @@ namespace dbp virtual void enterState( WizardState _nState ) SAL_OVERRIDE; virtual bool onFinish() SAL_OVERRIDE; - virtual sal_Bool approveControl(sal_Int16 _nClassId) SAL_OVERRIDE; + virtual bool approveControl(sal_Int16 _nClassId) SAL_OVERRIDE; protected: void createRadios(); diff --git a/extensions/source/dbpilots/listcombowizard.cxx b/extensions/source/dbpilots/listcombowizard.cxx index dd98d9452897..0c7337248772 100644 --- a/extensions/source/dbpilots/listcombowizard.cxx +++ b/extensions/source/dbpilots/listcombowizard.cxx @@ -52,8 +52,8 @@ namespace dbp OListComboWizard::OListComboWizard( Window* _pParent, const Reference< XPropertySet >& _rxObjectModel, const Reference< XComponentContext >& _rxContext ) :OControlWizard(_pParent, ModuleRes(RID_DLG_LISTCOMBOWIZARD), _rxObjectModel, _rxContext) - ,m_bListBox(sal_False) - ,m_bHadDataSelection(sal_True) + ,m_bListBox(false) + ,m_bHadDataSelection(true) { initControlSettings(&m_aSettings); @@ -66,25 +66,25 @@ namespace dbp if (!needDatasourceSelection()) { // ... skip it! skip(1); - m_bHadDataSelection = sal_False; + m_bHadDataSelection = false; } } - sal_Bool OListComboWizard::approveControl(sal_Int16 _nClassId) + bool OListComboWizard::approveControl(sal_Int16 _nClassId) { switch (_nClassId) { case FormComponentType::LISTBOX: - m_bListBox = sal_True; + m_bListBox = true; setTitleBase(ModuleRes(RID_STR_LISTWIZARD_TITLE).toString()); - return sal_True; + return true; case FormComponentType::COMBOBOX: - m_bListBox = sal_False; + m_bListBox = false; setTitleBase(ModuleRes(RID_STR_COMBOWIZARD_TITLE).toString()); - return sal_True; + return true; } - return sal_False; + return false; } @@ -223,7 +223,7 @@ namespace dbp //= OLCPage - Reference< XNameAccess > OLCPage::getTables(sal_Bool _bNeedIt) + Reference< XNameAccess > OLCPage::getTables(bool _bNeedIt) { Reference< XConnection > xConn = getFormConnection(); DBG_ASSERT(!_bNeedIt || xConn.is(), "OLCPage::getTables: should have an active connection when reaching this page!"); @@ -240,7 +240,7 @@ namespace dbp } - Sequence< OUString > OLCPage::getTableFields(sal_Bool _bNeedIt) + Sequence< OUString > OLCPage::getTableFields(bool _bNeedIt) { Reference< XNameAccess > xTables = getTables(_bNeedIt); Sequence< OUString > aColumnNames; @@ -328,7 +328,7 @@ namespace dbp m_aSelectTable.Clear(); try { - Reference< XNameAccess > xTables = getTables(sal_True); + Reference< XNameAccess > xTables = getTables(true); Sequence< OUString > aTableNames; if (xTables.is()) aTableNames = xTables->getElementNames(); @@ -389,7 +389,7 @@ namespace dbp OLCPage::initializePage(); // fill the list of fields - fillListBox(m_aSelectTableField, getTableFields(sal_True)); + fillListBox(m_aSelectTableField, getTableFields(true)); m_aSelectTableField.SelectEntry(getSettings().sListContentField); m_aDisplayedField.SetText(getSettings().sListContentField); @@ -467,7 +467,7 @@ namespace dbp // fill the value list fillListBox(m_aValueListField, getContext().aFieldNames); // fill the table field list - fillListBox(m_aTableField, getTableFields(sal_True)); + fillListBox(m_aTableField, getTableFields(true)); // the initial selections m_aValueListField.SetText(getSettings().sLinkedFormField); diff --git a/extensions/source/dbpilots/listcombowizard.hxx b/extensions/source/dbpilots/listcombowizard.hxx index e1d86cd6e26b..d0550303c82f 100644 --- a/extensions/source/dbpilots/listcombowizard.hxx +++ b/extensions/source/dbpilots/listcombowizard.hxx @@ -52,8 +52,8 @@ namespace dbp { protected: OListComboSettings m_aSettings; - sal_Bool m_bListBox : 1; - sal_Bool m_bHadDataSelection : 1; + bool m_bListBox : 1; + bool m_bHadDataSelection : 1; public: OListComboWizard( @@ -64,7 +64,7 @@ namespace dbp OListComboSettings& getSettings() { return m_aSettings; } - sal_Bool isListBox() const { return m_bListBox; } + bool isListBox() const { return m_bListBox; } protected: // OWizardMachine overridables @@ -74,7 +74,7 @@ namespace dbp virtual bool leaveState( WizardState _nState ) SAL_OVERRIDE; virtual bool onFinish() SAL_OVERRIDE; - virtual sal_Bool approveControl(sal_Int16 _nClassId) SAL_OVERRIDE; + virtual bool approveControl(sal_Int16 _nClassId) SAL_OVERRIDE; WizardState getFinalState() const { return isListBox() ? LCW_STATE_FIELDLINK : LCW_STATE_COMBODBFIELD; } @@ -92,13 +92,13 @@ namespace dbp protected: OListComboSettings& getSettings() { return static_cast(getDialog())->getSettings(); } - sal_Bool isListBox() { return static_cast(getDialog())->isListBox(); } + bool isListBox() { return static_cast(getDialog())->isListBox(); } protected: ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > - getTables(sal_Bool _bNeedIt); + getTables(bool _bNeedIt); ::com::sun::star::uno::Sequence< OUString > - getTableFields(sal_Bool _bNeedIt); + getTableFields(bool _bNeedIt); }; diff --git a/extensions/source/dbpilots/wizardcontext.hxx b/extensions/source/dbpilots/wizardcontext.hxx index 523e09f053c1..4869ccd143ad 100644 --- a/extensions/source/dbpilots/wizardcontext.hxx +++ b/extensions/source/dbpilots/wizardcontext.hxx @@ -77,7 +77,7 @@ namespace dbp ::com::sun::star::uno::Sequence< OUString > aFieldNames; - sal_Bool bEmbedded; + bool bEmbedded; }; -- cgit v1.2.3