diff options
20 files changed, 93 insertions, 93 deletions
diff --git a/connectivity/source/commontools/CommonTools.cxx b/connectivity/source/commontools/CommonTools.cxx index 6222ddbbacc0..7f369eee1163 100644 --- a/connectivity/source/commontools/CommonTools.cxx +++ b/connectivity/source/commontools/CommonTools.cxx @@ -54,7 +54,7 @@ namespace connectivity const sal_Unicode CHAR_PLACE = '_'; const sal_Unicode CHAR_WILD = '%'; - sal_Bool match(const sal_Unicode* pWild, const sal_Unicode* pStr, const sal_Unicode cEscape) + bool match(const sal_Unicode* pWild, const sal_Unicode* pStr, const sal_Unicode cEscape) { int pos=0; int flag=0; @@ -65,14 +65,14 @@ namespace connectivity { case CHAR_PLACE: if ( *pStr == 0 ) - return sal_False; + return false; break; default: if (*pWild && (*pWild == cEscape) && ((*(pWild+1)== CHAR_PLACE) || (*(pWild+1) == CHAR_WILD)) ) pWild++; if ( rtl_ascii_toUpperCase(*pWild) != rtl_ascii_toUpperCase(*pStr) ) if ( !pos ) - return sal_False; + return false; else pWild += pos; else @@ -82,7 +82,7 @@ namespace connectivity while ( *pWild == CHAR_WILD ) pWild++; if ( *pWild == 0 ) - return sal_True; + return true; flag = 1; pos = 0; if ( *pStr == 0 ) @@ -155,9 +155,9 @@ namespace connectivity return aRet; } - sal_Bool existsJavaClassByName( const ::rtl::Reference< jvmaccess::VirtualMachine >& _pJVM,const OUString& _sClassName ) + bool existsJavaClassByName( const ::rtl::Reference< jvmaccess::VirtualMachine >& _pJVM,const OUString& _sClassName ) { - sal_Bool bRet = sal_False; + bool bRet = false; if ( _pJVM.is() ) { jvmaccess::VirtualMachine::AttachGuard aGuard(_pJVM); diff --git a/connectivity/source/commontools/TColumnsHelper.cxx b/connectivity/source/commontools/TColumnsHelper.cxx index d9dcd3c56bfa..6802d161e50f 100644 --- a/connectivity/source/commontools/TColumnsHelper.cxx +++ b/connectivity/source/commontools/TColumnsHelper.cxx @@ -59,10 +59,10 @@ namespace connectivity } OColumnsHelper::OColumnsHelper( ::cppu::OWeakObject& _rParent - ,sal_Bool _bCase + ,bool _bCase ,::osl::Mutex& _rMutex ,const TStringVector &_rVector - ,sal_Bool _bUseHardRef + ,bool _bUseHardRef ) : OCollection(_rParent,_bCase,_rMutex,_rVector,sal_False,_bUseHardRef) ,m_pImpl(NULL) ,m_pTable(NULL) diff --git a/connectivity/source/commontools/TIndex.cxx b/connectivity/source/commontools/TIndex.cxx index d10516773574..9d20b748f056 100644 --- a/connectivity/source/commontools/TIndex.cxx +++ b/connectivity/source/commontools/TIndex.cxx @@ -43,9 +43,9 @@ OIndexHelper::OIndexHelper( OTableHelper* _pTable) : connectivity::sdbcx::OIndex OIndexHelper::OIndexHelper( OTableHelper* _pTable, const OUString& _Name, const OUString& _Catalog, - sal_Bool _isUnique, - sal_Bool _isPrimaryKeyIndex, - sal_Bool _isClustered + bool _isUnique, + bool _isPrimaryKeyIndex, + bool _isClustered ) : connectivity::sdbcx::OIndex(_Name, _Catalog, _isUnique, diff --git a/connectivity/source/commontools/TTableHelper.cxx b/connectivity/source/commontools/TTableHelper.cxx index 8d1bd15871c0..e026f6ce8696 100644 --- a/connectivity/source/commontools/TTableHelper.cxx +++ b/connectivity/source/commontools/TTableHelper.cxx @@ -141,7 +141,7 @@ namespace connectivity OTableHelper::OTableHelper( sdbcx::OCollection* _pTables, const Reference< XConnection >& _xConnection, - sal_Bool _bCase) + bool _bCase) :OTable_TYPEDEF(_pTables,_bCase) ,m_pImpl(new OTableHelperImpl(_xConnection)) { @@ -149,7 +149,7 @@ OTableHelper::OTableHelper( sdbcx::OCollection* _pTables, OTableHelper::OTableHelper( sdbcx::OCollection* _pTables, const Reference< XConnection >& _xConnection, - sal_Bool _bCase, + bool _bCase, const OUString& _Name, const OUString& _Type, const OUString& _Description , diff --git a/connectivity/source/commontools/dbtools.cxx b/connectivity/source/commontools/dbtools.cxx index ddc85c5a8e4e..0a4c8c1b9874 100644 --- a/connectivity/source/commontools/dbtools.cxx +++ b/connectivity/source/commontools/dbtools.cxx @@ -2017,7 +2017,7 @@ void release(oslInterlockedCount& _refCount, osl_atomic_increment( &_refCount ); } -void checkDisposed(sal_Bool _bThrow) throw ( DisposedException ) +void checkDisposed(bool _bThrow) throw ( DisposedException ) { if (_bThrow) throw DisposedException(); diff --git a/connectivity/source/commontools/predicateinput.cxx b/connectivity/source/commontools/predicateinput.cxx index 7575113be23e..8715ad5f32c1 100644 --- a/connectivity/source/commontools/predicateinput.cxx +++ b/connectivity/source/commontools/predicateinput.cxx @@ -365,14 +365,14 @@ namespace dbtools 0, 0, nType, - sal_False, - sal_False, + false, + false, xMeta.is() && xMeta->supportsMixedCaseQuotedIdentifiers(), OUString(), OUString(), OUString()); Reference<XPropertySet> xColumn = pColumn; - pColumn->setFunction(sal_True); + pColumn->setFunction(true); pColumn->setRealName(sField); OSQLParseNode* pParseNode = implPredicateTree( sError, _rPredicateValue, xColumn ); diff --git a/connectivity/source/drivers/file/FPreparedStatement.cxx b/connectivity/source/drivers/file/FPreparedStatement.cxx index 4ab845e62b6d..9fac363c7874 100644 --- a/connectivity/source/drivers/file/FPreparedStatement.cxx +++ b/connectivity/source/drivers/file/FPreparedStatement.cxx @@ -503,8 +503,8 @@ sal_uInt32 OPreparedStatement::AddParameter(OSQLParseNode * pParameter, const Re ,nPrecision ,nScale ,eType - ,sal_False - ,sal_False + ,false + ,false ,m_aSQLIterator.isCaseSensitive() ,OUString() ,OUString() diff --git a/connectivity/source/drivers/firebird/Columns.cxx b/connectivity/source/drivers/firebird/Columns.cxx index d53c4f3a73ef..6f41dcada0bc 100644 --- a/connectivity/source/drivers/firebird/Columns.cxx +++ b/connectivity/source/drivers/firebird/Columns.cxx @@ -26,11 +26,11 @@ Columns::Columns(Table& rTable, Mutex& rMutex, const TStringVector& rVector): OColumnsHelper(rTable, - sal_True, // TODO: is this case sensitivity? + true, // TODO: is this case sensitivity? rMutex, rVector) { OColumnsHelper::setParent(&rTable); } -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/firebird/Table.cxx b/connectivity/source/drivers/firebird/Table.cxx index 420a5176c787..086ecd465e26 100644 --- a/connectivity/source/drivers/firebird/Table.cxx +++ b/connectivity/source/drivers/firebird/Table.cxx @@ -39,7 +39,7 @@ Table::Table(Tables* pTables, const uno::Reference< XConnection >& rConnection): OTableHelper(pTables, rConnection, - sal_True), + true), m_rMutex(rMutex), m_nPrivileges(0) { @@ -54,7 +54,7 @@ Table::Table(Tables* pTables, const OUString& rDescription): OTableHelper(pTables, rConnection, - sal_True, + true, rName, rType, rDescription, @@ -259,4 +259,4 @@ OUString Table::getAlterTableColumn(const OUString& rColumn) return ("ALTER TABLE \"" + getName() + "\" ALTER COLUMN \"" + rColumn + "\" "); } -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/hsqldb/HTable.cxx b/connectivity/source/drivers/hsqldb/HTable.cxx index 5151f4efa867..7eea65f0cd8f 100644 --- a/connectivity/source/drivers/hsqldb/HTable.cxx +++ b/connectivity/source/drivers/hsqldb/HTable.cxx @@ -56,7 +56,7 @@ using namespace ::com::sun::star::lang; OHSQLTable::OHSQLTable( sdbcx::OCollection* _pTables, const Reference< XConnection >& _xConnection) - :OTableHelper(_pTables,_xConnection,sal_True) + :OTableHelper(_pTables,_xConnection,true) { // we create a new table here, so we should have all the rights or ;-) m_nPrivileges = Privilege::DROP | @@ -81,7 +81,7 @@ OHSQLTable::OHSQLTable( sdbcx::OCollection* _pTables, sal_Int32 _nPrivileges ) : OTableHelper( _pTables, _xConnection, - sal_True, + true, _Name, _Type, _Description, diff --git a/connectivity/source/drivers/mork/MTable.cxx b/connectivity/source/drivers/mork/MTable.cxx index c28d25346fc6..3fc79897e418 100644 --- a/connectivity/source/drivers/mork/MTable.cxx +++ b/connectivity/source/drivers/mork/MTable.cxx @@ -49,7 +49,7 @@ using namespace ::com::sun::star::lang; OTable::OTable( sdbcx::OCollection* _pTables, OConnection* _pConnection, const OUString& _Name, const OUString& _Type, const OUString& _Description ) - :OTable_Base(_pTables, _pConnection, sal_True, _Name, _Type, _Description ) + :OTable_Base(_pTables, _pConnection, true, _Name, _Type, _Description ) ,m_pConnection( _pConnection ) { construct(); diff --git a/connectivity/source/drivers/mysql/YTable.cxx b/connectivity/source/drivers/mysql/YTable.cxx index 5b6cb159f08d..786ee3a0d05e 100644 --- a/connectivity/source/drivers/mysql/YTable.cxx +++ b/connectivity/source/drivers/mysql/YTable.cxx @@ -75,7 +75,7 @@ namespace connectivity OMySQLTable::OMySQLTable( sdbcx::OCollection* _pTables, const Reference< XConnection >& _xConnection) - :OTableHelper(_pTables,_xConnection,sal_True) + :OTableHelper(_pTables,_xConnection,true) { // we create a new table here, so we should have all the rights or ;-) m_nPrivileges = Privilege::DROP | @@ -100,7 +100,7 @@ OMySQLTable::OMySQLTable( sdbcx::OCollection* _pTables, sal_Int32 _nPrivileges ) : OTableHelper( _pTables, _xConnection, - sal_True, + true, _Name, _Type, _Description, diff --git a/connectivity/source/parse/PColumn.cxx b/connectivity/source/parse/PColumn.cxx index 0bc7b939a000..fec6c53485ee 100644 --- a/connectivity/source/parse/PColumn.cxx +++ b/connectivity/source/parse/PColumn.cxx @@ -35,7 +35,7 @@ using namespace ::com::sun::star::beans; using namespace ::com::sun::star::container; -OParseColumn::OParseColumn(const Reference<XPropertySet>& _xColumn,sal_Bool _bCase) +OParseColumn::OParseColumn(const Reference<XPropertySet>& _xColumn, bool _bCase) : connectivity::sdbcx::OColumn( getString(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME))) , getString(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPENAME))) , getString(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DEFAULTVALUE))) @@ -52,10 +52,10 @@ OParseColumn::OParseColumn(const Reference<XPropertySet>& _xColumn,sal_Bool , getString(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_SCHEMANAME))) , getString(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TABLENAME))) ) - , m_bFunction(sal_False) - , m_bDbasePrecisionChanged(sal_False) - , m_bAggregateFunction(sal_False) - , m_bIsSearchable( sal_True ) + , m_bFunction(false) + , m_bDbasePrecisionChanged(false) + , m_bAggregateFunction(false) + , m_bIsSearchable( true ) { construct(); } @@ -69,9 +69,9 @@ OParseColumn::OParseColumn( const OUString& _Name, sal_Int32 _Precision, sal_Int32 _Scale, sal_Int32 _Type, - sal_Bool _IsAutoIncrement, - sal_Bool _IsCurrency, - sal_Bool _bCase, + bool _IsAutoIncrement, + bool _IsCurrency, + bool _bCase, const OUString& _CatalogName, const OUString& _SchemaName, const OUString& _TableName @@ -90,10 +90,10 @@ OParseColumn::OParseColumn( const OUString& _Name, _CatalogName, _SchemaName, _TableName) - , m_bFunction(sal_False) - , m_bDbasePrecisionChanged(sal_False) - , m_bAggregateFunction(sal_False) - , m_bIsSearchable( sal_True ) + , m_bFunction(false) + , m_bDbasePrecisionChanged(false) + , m_bAggregateFunction(false) + , m_bIsSearchable( true ) { construct(); } @@ -191,7 +191,7 @@ void OParseColumn::construct() OOrderColumn::OOrderColumn( const Reference<XPropertySet>& _xColumn, const OUString& i_rOriginatingTableName, - sal_Bool _bCase, sal_Bool _bAscending ) + bool _bCase, bool _bAscending ) : connectivity::sdbcx::OColumn( getString(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME))), getString(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPENAME))), @@ -215,7 +215,7 @@ OOrderColumn::OOrderColumn( const Reference<XPropertySet>& _xColumn, const OUStr } -OOrderColumn::OOrderColumn( const Reference<XPropertySet>& _xColumn, sal_Bool _bCase, sal_Bool _bAscending ) +OOrderColumn::OOrderColumn( const Reference<XPropertySet>& _xColumn, bool _bCase, bool _bAscending ) : connectivity::sdbcx::OColumn( getString(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME))), getString(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPENAME))), diff --git a/connectivity/source/parse/sqliterator.cxx b/connectivity/source/parse/sqliterator.cxx index 491fca43e886..656ff23e5c10 100644 --- a/connectivity/source/parse/sqliterator.cxx +++ b/connectivity/source/parse/sqliterator.cxx @@ -919,9 +919,9 @@ void OSQLParseTreeIterator::traverseCreateColumns(const OSQLParseNode* pSelectNo { //TODO:Create a new class for create statement to handle field length OParseColumn* pColumn = new OParseColumn(aColumnName,aTypeName,OUString(),OUString(), - ColumnValue::NULLABLE_UNKNOWN,0,0,nType,sal_False,sal_False,isCaseSensitive(), + ColumnValue::NULLABLE_UNKNOWN,0,0,nType,false,false,isCaseSensitive(), OUString(),OUString(),OUString()); - pColumn->setFunction(sal_False); + pColumn->setFunction(false); pColumn->setRealName(aColumnName); Reference< XPropertySet> xCol = pColumn; @@ -1463,14 +1463,14 @@ void OSQLParseTreeIterator::traverseParameter(const OSQLParseNode* _pParseNode 0, 0, nType, - sal_False, - sal_False, + false, + false, isCaseSensitive(), OUString(), OUString(), OUString()); - pColumn->setFunction(sal_True); - pColumn->setAggregateFunction(sal_True); + pColumn->setFunction(true); + pColumn->setAggregateFunction(true); pColumn->setRealName(sFunctionName); m_aParameters->get().push_back(pColumn); } @@ -1530,8 +1530,8 @@ void OSQLParseTreeIterator::traverseParameter(const OSQLParseNode* _pParseNode 0, 0, nType, - sal_False, - sal_False, + false, + false, isCaseSensitive(), OUString(), OUString(), @@ -1757,8 +1757,8 @@ void OSQLParseTreeIterator::setSelectColumnName(::rtl::Reference<OSQLColumns>& _ 0, 0, _nType, - sal_False, - sal_False, + false, + false, isCaseSensitive(), OUString(), OUString(), @@ -1776,9 +1776,9 @@ void OSQLParseTreeIterator::setSelectColumnName(::rtl::Reference<OSQLColumns>& _ OUString aNewColName(getUniqueColumnName(rColumnAlias)); OParseColumn* pColumn = new OParseColumn(aNewColName,OUString(),OUString(),OUString(), - ColumnValue::NULLABLE_UNKNOWN,0,0,_nType,sal_False,sal_False,isCaseSensitive(), + ColumnValue::NULLABLE_UNKNOWN,0,0,_nType,false,false,isCaseSensitive(), OUString(),OUString(),OUString()); - pColumn->setFunction(sal_True); + pColumn->setFunction(true); pColumn->setAggregateFunction(bAggFkt); pColumn->setRealName(rColumnName); @@ -1798,9 +1798,9 @@ void OSQLParseTreeIterator::setSelectColumnName(::rtl::Reference<OSQLColumns>& _ OUString aNewColName(getUniqueColumnName(rColumnAlias)); OParseColumn* pColumn = new OParseColumn(aNewColName,OUString(),OUString(),OUString(), - ColumnValue::NULLABLE_UNKNOWN,0,0,_nType,sal_False,sal_False,isCaseSensitive(), + ColumnValue::NULLABLE_UNKNOWN,0,0,_nType,false,false,isCaseSensitive(), OUString(),OUString(),OUString()); - pColumn->setFunction(sal_True); + pColumn->setFunction(true); pColumn->setAggregateFunction(bAggFkt); pColumn->setRealName(rColumnName); SAL_WARN("connectivity.parse", "Trying to construct a column with Function==true and a TableName; this makes no sense."); @@ -1838,9 +1838,9 @@ void OSQLParseTreeIterator::setSelectColumnName(::rtl::Reference<OSQLColumns>& _ OUString aNewColName(getUniqueColumnName(rColumnAlias)); OParseColumn* pColumn = new OParseColumn(aNewColName,OUString(),OUString(),OUString(), - ColumnValue::NULLABLE_UNKNOWN,0,0,DataType::VARCHAR,sal_False,sal_False,isCaseSensitive(), + ColumnValue::NULLABLE_UNKNOWN,0,0,DataType::VARCHAR,false,false,isCaseSensitive(), OUString(),OUString(),OUString()); - pColumn->setFunction(sal_True); + pColumn->setFunction(true); pColumn->setAggregateFunction(bAggFkt); Reference< XPropertySet> xCol = pColumn; diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx b/dbaccess/source/ui/querydesign/QueryDesignView.cxx index 90aeac527410..187c94a90a72 100644 --- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx +++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx @@ -3059,14 +3059,14 @@ OSQLParseNode* OQueryDesignView::getPredicateTreeFromEntry(OTableFieldDescRef pE 0, 0, nType, - sal_False, - sal_False, + false, + false, xMeta.is() && xMeta->supportsMixedCaseQuotedIdentifiers(), OUString(), OUString(), OUString()); _rxColumn = pColumn; - pColumn->setFunction(sal_True); + pColumn->setFunction(true); pColumn->setRealName(pEntry->GetField()); } else diff --git a/include/connectivity/CommonTools.hxx b/include/connectivity/CommonTools.hxx index f98e18e2c2bb..bbf919cced16 100644 --- a/include/connectivity/CommonTools.hxx +++ b/include/connectivity/CommonTools.hxx @@ -51,8 +51,8 @@ namespace jvmaccess { class VirtualMachine; } namespace connectivity { - OOO_DLLPUBLIC_DBTOOLS sal_Bool match(const sal_Unicode* pWild, const sal_Unicode* pStr, const sal_Unicode cEscape); - inline sal_Bool match(const OUString &rWild, const OUString &rStr, const sal_Unicode cEscape) + OOO_DLLPUBLIC_DBTOOLS bool match(const sal_Unicode* pWild, const sal_Unicode* pStr, const sal_Unicode cEscape); + inline bool match(const OUString &rWild, const OUString &rStr, const sal_Unicode cEscape) { return match(rWild.getStr(), rStr.getStr(), cEscape); } @@ -150,7 +150,7 @@ namespace connectivity const OUString& _rVal, const ::comphelper::UStringMixEqual& _rCase); - OOO_DLLPUBLIC_DBTOOLS void checkDisposed(sal_Bool _bThrow) throw ( ::com::sun::star::lang::DisposedException ); + OOO_DLLPUBLIC_DBTOOLS void checkDisposed(bool _bThrow) throw ( ::com::sun::star::lang::DisposedException ); #if HAVE_FEATURE_JAVA /** creates a java virtual machine @@ -167,7 +167,7 @@ namespace connectivity @param _sClassName The class name to look for. */ - OOO_DLLPUBLIC_DBTOOLS sal_Bool existsJavaClassByName( const ::rtl::Reference< jvmaccess::VirtualMachine >& _pJVM,const OUString& _sClassName ); + OOO_DLLPUBLIC_DBTOOLS bool existsJavaClassByName( const ::rtl::Reference< jvmaccess::VirtualMachine >& _pJVM,const OUString& _sClassName ); #endif } diff --git a/include/connectivity/PColumn.hxx b/include/connectivity/PColumn.hxx index 0bbe03fea928..69fdbb2188e9 100644 --- a/include/connectivity/PColumn.hxx +++ b/include/connectivity/PColumn.hxx @@ -44,12 +44,12 @@ namespace connectivity class OOO_DLLPUBLIC_DBTOOLS OParseColumn : public OParseColumn_BASE, public OParseColumn_PROP { - OUString m_aRealName; - OUString m_sLabel; - sal_Bool m_bFunction; - sal_Bool m_bDbasePrecisionChanged; - sal_Bool m_bAggregateFunction; - sal_Bool m_bIsSearchable; + OUString m_aRealName; + OUString m_sLabel; + bool m_bFunction; + bool m_bDbasePrecisionChanged; + bool m_bAggregateFunction; + bool m_bIsSearchable; protected: virtual ::cppu::IPropertyArrayHelper* createArrayHelper() const SAL_OVERRIDE; @@ -57,7 +57,7 @@ namespace connectivity virtual ~OParseColumn(); public: - OParseColumn(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xColumn,sal_Bool _bCase); + OParseColumn(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xColumn, bool _bCase); OParseColumn(const OUString& _Name, const OUString& _TypeName, const OUString& _DefaultValue, @@ -66,9 +66,9 @@ namespace connectivity sal_Int32 _Precision, sal_Int32 _Scale, sal_Int32 _Type, - sal_Bool _IsAutoIncrement, - sal_Bool _IsCurrency, - sal_Bool _bCase, + bool _IsAutoIncrement, + bool _IsCurrency, + bool _bCase, const OUString& _CatalogName, const OUString& _SchemaName, const OUString& _TableName); @@ -78,16 +78,16 @@ namespace connectivity void setRealName(const OUString& _rName) { m_aRealName = _rName; } void setLabel(const OUString& i_sLabel) { m_sLabel = i_sLabel; } void setTableName(const OUString& _rName) { m_TableName = _rName; } - void setFunction(sal_Bool _bFunction) { m_bFunction = _bFunction; } - void setAggregateFunction(sal_Bool _bFunction) { m_bAggregateFunction = _bFunction; } - void setIsSearchable( sal_Bool _bIsSearchable ) { m_bIsSearchable = _bIsSearchable; } - void setDbasePrecisionChanged(sal_Bool _bDbasePrecisionChanged) { m_bDbasePrecisionChanged = _bDbasePrecisionChanged; } + void setFunction(bool _bFunction) { m_bFunction = _bFunction; } + void setAggregateFunction(bool _bFunction) { m_bAggregateFunction = _bFunction; } + void setIsSearchable( bool _bIsSearchable ) { m_bIsSearchable = _bIsSearchable; } + void setDbasePrecisionChanged(bool _bDbasePrecisionChanged) { m_bDbasePrecisionChanged = _bDbasePrecisionChanged; } const OUString& getRealName() const { return m_aRealName; } const OUString& getLabel() const { return m_sLabel; } const OUString& getTableName() const { return m_TableName; } - sal_Bool getFunction() const { return m_bFunction; } - sal_Bool getDbasePrecisionChanged() const { return m_bDbasePrecisionChanged; } + bool getFunction() const { return m_bFunction; } + bool getDbasePrecisionChanged() const { return m_bDbasePrecisionChanged; } public: /** creates a collection of OParseColumn, as described by a result set meta data instance. @@ -134,14 +134,14 @@ namespace connectivity OOrderColumn( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xColumn, const OUString& i_rOriginatingTableName, - sal_Bool _bCase, - sal_Bool _bAscending + bool _bCase, + bool _bAscending ); OOrderColumn( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xColumn, - sal_Bool _bCase, - sal_Bool _bAscending + bool _bCase, + bool _bAscending ); virtual void construct() SAL_OVERRIDE; diff --git a/include/connectivity/TColumnsHelper.hxx b/include/connectivity/TColumnsHelper.hxx index 4e3fee488d8e..50b8b14d8dab 100644 --- a/include/connectivity/TColumnsHelper.hxx +++ b/include/connectivity/TColumnsHelper.hxx @@ -44,10 +44,10 @@ namespace connectivity virtual void dropObject(sal_Int32 _nPos, const OUString& _sElementName) SAL_OVERRIDE; public: OColumnsHelper( ::cppu::OWeakObject& _rParent - ,sal_Bool _bCase + ,bool _bCase ,::osl::Mutex& _rMutex ,const TStringVector &_rVector - ,sal_Bool _bUseHardRef = sal_True + ,bool _bUseHardRef = true ); virtual ~OColumnsHelper(); diff --git a/include/connectivity/TIndex.hxx b/include/connectivity/TIndex.hxx index 7612768931f1..7b22e61044a0 100644 --- a/include/connectivity/TIndex.hxx +++ b/include/connectivity/TIndex.hxx @@ -37,9 +37,9 @@ namespace connectivity OIndexHelper( OTableHelper* _pTable, const OUString& _Name, const OUString& _Catalog, - sal_Bool _isUnique, - sal_Bool _isPrimaryKeyIndex, - sal_Bool _isClustered + bool _isUnique, + bool _isPrimaryKeyIndex, + bool _isClustered ); inline OTableHelper* getTable() const { return m_pTable; } }; diff --git a/include/connectivity/TTableHelper.hxx b/include/connectivity/TTableHelper.hxx index 9f4081d1bc47..a125222a0cf2 100644 --- a/include/connectivity/TTableHelper.hxx +++ b/include/connectivity/TTableHelper.hxx @@ -127,10 +127,10 @@ namespace connectivity public: OTableHelper( sdbcx::OCollection* _pTables, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xConnection, - sal_Bool _bCase); + bool _bCase); OTableHelper( sdbcx::OCollection* _pTables, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xConnection, - sal_Bool _bCase, + bool _bCase, const OUString& _Name, const OUString& _Type, const OUString& _Description = OUString(), |