diff options
-rw-r--r-- | connectivity/source/commontools/dbtools.cxx | 24 | ||||
-rw-r--r-- | extensions/source/dbpilots/controlwizard.cxx | 2 | ||||
-rw-r--r-- | extensions/source/propctrlr/formlinkdialog.cxx | 2 | ||||
-rw-r--r-- | forms/source/component/DatabaseForm.cxx | 2 | ||||
-rw-r--r-- | include/connectivity/dbtools.hxx | 6 |
5 files changed, 18 insertions, 18 deletions
diff --git a/connectivity/source/commontools/dbtools.cxx b/connectivity/source/commontools/dbtools.cxx index a08b85526fd4..dbecc4559724 100644 --- a/connectivity/source/commontools/dbtools.cxx +++ b/connectivity/source/commontools/dbtools.cxx @@ -458,7 +458,7 @@ SharedConnection lcl_connectRowSet(const Reference< XRowSet>& _rxRowSet, const R } Reference< XConnection> connectRowset(const Reference< XRowSet>& _rxRowSet, const Reference< XComponentContext >& _rxContext, - sal_Bool _bSetAsActiveConnection ) SAL_THROW ( ( SQLException, WrappedTargetException, RuntimeException ) ) + bool _bSetAsActiveConnection ) SAL_THROW ( ( SQLException, WrappedTargetException, RuntimeException ) ) { SharedConnection xConnection = lcl_connectRowSet( _rxRowSet, _rxContext, _bSetAsActiveConnection, true ); return xConnection.getTyped(); @@ -1235,7 +1235,7 @@ Reference< XSingleSelectQueryComposer > getComposedRowSetStatement( const Refere Reference< XSingleSelectQueryComposer > xComposer; try { - Reference< XConnection> xConn = connectRowset( Reference< XRowSet >( _rxRowSet, UNO_QUERY ), _rxContext, sal_True ); + Reference< XConnection> xConn = connectRowset( Reference< XRowSet >( _rxRowSet, UNO_QUERY ), _rxContext, true ); if ( xConn.is() ) // implies _rxRowSet.is() { // build the statement the row set is based on (can't use the ActiveCommand property of the set @@ -1447,10 +1447,10 @@ void showError(const SQLExceptionInfo& _rInfo, } } -sal_Bool implUpdateObject(const Reference< XRowUpdate >& _rxUpdatedObject, +bool implUpdateObject(const Reference< XRowUpdate >& _rxUpdatedObject, const sal_Int32 _nColumnIndex, const Any& _rValue) SAL_THROW ( ( SQLException, RuntimeException ) ) { - sal_Bool bSuccessfullyReRouted = sal_True; + bool bSuccessfullyReRouted = true; switch (_rValue.getValueTypeClass()) { case TypeClass_ANY: @@ -1511,7 +1511,7 @@ sal_Bool implUpdateObject(const Reference< XRowUpdate >& _rxUpdatedObject, if (_rValue.getValueType() == ::getCppuType((const Sequence< sal_Int8 > *)0)) _rxUpdatedObject->updateBytes(_nColumnIndex, *(Sequence<sal_Int8>*)_rValue.getValue()); else - bSuccessfullyReRouted = sal_False; + bSuccessfullyReRouted = false; break; case TypeClass_STRUCT: if (_rValue.getValueType() == ::getCppuType((const DateTime*)0)) @@ -1521,7 +1521,7 @@ sal_Bool implUpdateObject(const Reference< XRowUpdate >& _rxUpdatedObject, else if (_rValue.getValueType() == ::getCppuType((const Time*)0)) _rxUpdatedObject->updateTime(_nColumnIndex, *(Time*)_rValue.getValue()); else - bSuccessfullyReRouted = sal_False; + bSuccessfullyReRouted = false; break; case TypeClass_INTERFACE: @@ -1534,16 +1534,16 @@ sal_Bool implUpdateObject(const Reference< XRowUpdate >& _rxUpdatedObject, } // run through default: - bSuccessfullyReRouted = sal_False; + bSuccessfullyReRouted = false; } return bSuccessfullyReRouted; } -sal_Bool implSetObject( const Reference< XParameters >& _rxParameters, +bool implSetObject( const Reference< XParameters >& _rxParameters, const sal_Int32 _nColumnIndex, const Any& _rValue) SAL_THROW ( ( SQLException, RuntimeException ) ) { - sal_Bool bSuccessfullyReRouted = sal_True; + bool bSuccessfullyReRouted = true; switch (_rValue.getValueTypeClass()) { case TypeClass_UNSIGNED_HYPER: @@ -1618,7 +1618,7 @@ sal_Bool implSetObject( const Reference< XParameters >& _rxParameters, _rxParameters->setBytes(_nColumnIndex, *(Sequence<sal_Int8>*)_rValue.getValue()); } else - bSuccessfullyReRouted = sal_False; + bSuccessfullyReRouted = false; break; case TypeClass_STRUCT: if (_rValue.getValueType() == ::getCppuType((const DateTime*)0)) @@ -1628,7 +1628,7 @@ sal_Bool implSetObject( const Reference< XParameters >& _rxParameters, else if (_rValue.getValueType() == ::getCppuType((const Time*)0)) _rxParameters->setTime(_nColumnIndex, *(Time*)_rValue.getValue()); else - bSuccessfullyReRouted = sal_False; + bSuccessfullyReRouted = false; break; case TypeClass_INTERFACE: @@ -1641,7 +1641,7 @@ sal_Bool implSetObject( const Reference< XParameters >& _rxParameters, } // run through default: - bSuccessfullyReRouted = sal_False; + bSuccessfullyReRouted = false; } diff --git a/extensions/source/dbpilots/controlwizard.cxx b/extensions/source/dbpilots/controlwizard.cxx index a1f70e35ae85..997a070a2570 100644 --- a/extensions/source/dbpilots/controlwizard.cxx +++ b/extensions/source/dbpilots/controlwizard.cxx @@ -565,7 +565,7 @@ namespace dbp Reference< XConnection > xConnection; m_aContext.bEmbedded = ::dbtools::isEmbeddedInDatabase( m_aContext.xForm, xConnection ); if ( !m_aContext.bEmbedded ) - xConnection = ::dbtools::connectRowset( m_aContext.xRowSet, m_xContext, sal_True ); + xConnection = ::dbtools::connectRowset( m_aContext.xRowSet, m_xContext, true ); // get the fields if (xConnection.is()) diff --git a/extensions/source/propctrlr/formlinkdialog.cxx b/extensions/source/propctrlr/formlinkdialog.cxx index 470847a14afd..dc608dfa30d0 100644 --- a/extensions/source/propctrlr/formlinkdialog.cxx +++ b/extensions/source/propctrlr/formlinkdialog.cxx @@ -448,7 +448,7 @@ namespace pcr _rxConnection.set(_rxFormProps->getPropertyValue(PROPERTY_ACTIVE_CONNECTION),UNO_QUERY); if ( !_rxConnection.is() ) - _rxConnection = ::dbtools::connectRowset( Reference< XRowSet >( _rxFormProps, UNO_QUERY ), m_xContext, sal_True ); + _rxConnection = ::dbtools::connectRowset( Reference< XRowSet >( _rxFormProps, UNO_QUERY ), m_xContext, true ); } diff --git a/forms/source/component/DatabaseForm.cxx b/forms/source/component/DatabaseForm.cxx index 3e3a3ae97437..dc22fcb7cba7 100644 --- a/forms/source/component/DatabaseForm.cxx +++ b/forms/source/component/DatabaseForm.cxx @@ -2834,7 +2834,7 @@ sal_Bool ODatabaseForm::implEnsureConnection() Reference< XConnection > xConnection = connectRowset( Reference<XRowSet> (m_xAggregate, UNO_QUERY), m_xContext, - sal_True // set a calculated connection as ActiveConnection + true // set a calculated connection as ActiveConnection ); return xConnection.is(); } diff --git a/include/connectivity/dbtools.hxx b/include/connectivity/dbtools.hxx index 2e1a8fadd3f1..0f84849dee34 100644 --- a/include/connectivity/dbtools.hxx +++ b/include/connectivity/dbtools.hxx @@ -148,7 +148,7 @@ namespace dbtools ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> connectRowset( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet>& _rxRowSet, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxContext, - sal_Bool _bSetAsActiveConnection + bool _bSetAsActiveConnection ) SAL_THROW ( ( ::com::sun::star::sdbc::SQLException , ::com::sun::star::lang::WrappedTargetException , ::com::sun::star::uno::RuntimeException ) ); @@ -557,7 +557,7 @@ namespace dbtools <TRUE/> if the update request was successfully re-routed to one of the other updateXXX methods */ OOO_DLLPUBLIC_DBTOOLS - sal_Bool implUpdateObject( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowUpdate >& _rxUpdatedObject, + bool implUpdateObject( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowUpdate >& _rxUpdatedObject, const sal_Int32 _nColumnIndex, const ::com::sun::star::uno::Any& _rValue) SAL_THROW ( ( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) ); @@ -617,7 +617,7 @@ namespace dbtools <TRUE/> if the update request was successfully re-routed to one of the other updateXXX methods */ OOO_DLLPUBLIC_DBTOOLS - sal_Bool implSetObject( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XParameters>& _rxParameters, + bool implSetObject( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XParameters>& _rxParameters, const sal_Int32 _nColumnIndex, const ::com::sun::star::uno::Any& _rValue) SAL_THROW ( ( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ) ); |