diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2014-09-15 22:28:10 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-09-15 22:28:10 +0200 |
commit | 1d642f60cad6da76ff676acd0319468d70cdd97d (patch) | |
tree | 87fc7822f63e52ffc7cefa82c4f139ff8632e99f /connectivity | |
parent | 99ace739828f9d79a2f9b04ef066b90d77f77bc4 (diff) |
sal_Bool -> bool
Change-Id: Ia8cf5e65aa52e329732c8e8faf36352b0d5ba52c
Diffstat (limited to 'connectivity')
21 files changed, 124 insertions, 126 deletions
diff --git a/connectivity/source/drivers/macab/MacabAddressBook.cxx b/connectivity/source/drivers/macab/MacabAddressBook.cxx index aa74c1f003ca..47b35b122bda 100644 --- a/connectivity/source/drivers/macab/MacabAddressBook.cxx +++ b/connectivity/source/drivers/macab/MacabAddressBook.cxx @@ -38,7 +38,7 @@ MacabAddressBook::MacabAddressBook( ) { m_aAddressBook = ABGetSharedAddressBook(); m_xMacabRecords = NULL; - m_bRetrievedGroups = sal_False; + m_bRetrievedGroups = false; } @@ -59,7 +59,7 @@ MacabAddressBook::~MacabAddressBook() delete (*iter); } - m_bRetrievedGroups = sal_False; + m_bRetrievedGroups = false; } @@ -120,7 +120,7 @@ MacabRecords *MacabAddressBook::getMacabRecordsMatch(const OUString& _tableName) ::std::vector<MacabGroup *> MacabAddressBook::getMacabGroups() { /* If the MacabGroups haven't been created yet, create them. */ - if(m_bRetrievedGroups == sal_False) + if(!m_bRetrievedGroups) { /* If the MacabRecords haven't been created yet, create them. */ if(m_xMacabRecords == NULL) @@ -148,7 +148,7 @@ MacabRecords *MacabAddressBook::getMacabRecordsMatch(const OUString& _tableName) /* Manage duplicates. */ manageDuplicateGroups(m_xMacabGroups); - m_bRetrievedGroups = sal_True; + m_bRetrievedGroups = true; } return m_xMacabGroups; @@ -158,7 +158,7 @@ MacabRecords *MacabAddressBook::getMacabRecordsMatch(const OUString& _tableName) MacabGroup *MacabAddressBook::getMacabGroup(OUString const & _groupName) { // initialize groups if not already initialized - if(m_bRetrievedGroups == sal_False) + if(!m_bRetrievedGroups) getMacabGroups(); sal_Int32 nGroups = m_xMacabGroups.size(); @@ -182,7 +182,7 @@ MacabGroup *MacabAddressBook::getMacabGroup(OUString const & _groupName) MacabGroup *MacabAddressBook::getMacabGroupMatch(OUString const & _groupName) { // initialize groups if not already initialized - if(m_bRetrievedGroups == sal_False) + if(!m_bRetrievedGroups) getMacabGroups(); sal_Int32 nGroups = m_xMacabGroups.size(); diff --git a/connectivity/source/drivers/macab/MacabAddressBook.hxx b/connectivity/source/drivers/macab/MacabAddressBook.hxx index d474edfd8f07..dd5c090c0ba9 100644 --- a/connectivity/source/drivers/macab/MacabAddressBook.hxx +++ b/connectivity/source/drivers/macab/MacabAddressBook.hxx @@ -40,7 +40,7 @@ namespace connectivity ABAddressBookRef m_aAddressBook; MacabRecords *m_xMacabRecords; ::std::vector<MacabGroup *> m_xMacabGroups; - sal_Bool m_bRetrievedGroups; + bool m_bRetrievedGroups; private: void manageDuplicateGroups(::std::vector<MacabGroup *> _xGroups) const; public: diff --git a/connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx b/connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx index ead208d0871f..e0586ace407b 100644 --- a/connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx +++ b/connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx @@ -41,7 +41,7 @@ using namespace com::sun::star::sdbc; MacabDatabaseMetaData::MacabDatabaseMetaData(MacabConnection* _pCon) : m_xConnection(_pCon), - m_bUseCatalog(sal_True) + m_bUseCatalog(true) { OSL_ENSURE(_pCon,"MacabDatabaseMetaData::MacabDatabaseMetaData: No connection set!"); @@ -223,7 +223,7 @@ sal_Bool SAL_CALL MacabDatabaseMetaData::supportsDifferentTableCorrelationNames( sal_Bool SAL_CALL MacabDatabaseMetaData::isCatalogAtStart( ) throw(SQLException, RuntimeException) { - sal_Bool bValue = sal_False; + bool bValue = false; if (m_bUseCatalog) { } @@ -964,19 +964,19 @@ Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getTables( // for the moment, we answer only the "TABLE" table type // when no types are given at all, we return all the tables static const OUString aTable("TABLE"); - sal_Bool bTableFound = sal_False; + bool bTableFound = false; const OUString* p = types.getConstArray(), * pEnd = p + types.getLength(); if (p == pEnd) { - bTableFound = sal_True; + bTableFound = true; } else while (p < pEnd) { if (match(*p, aTable, '\0')) { - bTableFound = sal_True; + bTableFound = true; break; } p++; diff --git a/connectivity/source/drivers/macab/MacabDatabaseMetaData.hxx b/connectivity/source/drivers/macab/MacabDatabaseMetaData.hxx index 0211b14521c8..eddecd809ba7 100644 --- a/connectivity/source/drivers/macab/MacabDatabaseMetaData.hxx +++ b/connectivity/source/drivers/macab/MacabDatabaseMetaData.hxx @@ -37,7 +37,7 @@ namespace connectivity class MacabDatabaseMetaData : public MacabDatabaseMetaData_BASE { ::com::sun::star::uno::Reference< MacabConnection > m_xConnection; - sal_Bool m_bUseCatalog; + bool m_bUseCatalog; public: diff --git a/connectivity/source/drivers/macab/MacabGroup.cxx b/connectivity/source/drivers/macab/MacabGroup.cxx index 8911550b14d5..cfd98255cbd3 100644 --- a/connectivity/source/drivers/macab/MacabGroup.cxx +++ b/connectivity/source/drivers/macab/MacabGroup.cxx @@ -38,7 +38,7 @@ MacabGroup::MacabGroup(const ABAddressBookRef _addressBook, const MacabRecords * CFArrayRef xGroupMembers = ABGroupCopyArrayOfAllMembers(_xGroup); ABPersonRef xPerson; CFStringRef sGroupMemberUID; - sal_Bool bFound; + bool bFound; macabfield *xRecordField; // Set the group's name (stored in MacabRecords as m_sName) @@ -66,7 +66,7 @@ MacabGroup::MacabGroup(const ABAddressBookRef _addressBook, const MacabRecords * sGroupMemberUID = (CFStringRef) ABRecordCopyValue(xPerson, kABUIDProperty); if(sGroupMemberUID != NULL) { - bFound = sal_False; + bFound = false; for(j = 0; j < nAllRecordsSize; j++) { xRecordField = _allRecords->getField(j,CFStringToOUString(kABUIDProperty)); @@ -76,7 +76,7 @@ MacabGroup::MacabGroup(const ABAddressBookRef _addressBook, const MacabRecords * { /* Found the matching UID! Insert into the group... */ insertRecord(_allRecords->getRecord(j)); - bFound = sal_True; + bFound = true; break; } } diff --git a/connectivity/source/drivers/macab/MacabHeader.cxx b/connectivity/source/drivers/macab/MacabHeader.cxx index a12ce3d0a0cd..d63c5f94d1e0 100644 --- a/connectivity/source/drivers/macab/MacabHeader.cxx +++ b/connectivity/source/drivers/macab/MacabHeader.cxx @@ -309,13 +309,13 @@ void MacabHeader::iterator::operator++ () } -sal_Bool MacabHeader::iterator::operator!= (const sal_Int32 i) const +bool MacabHeader::iterator::operator!= (const sal_Int32 i) const { return(id != i); } -sal_Bool MacabHeader::iterator::operator== (const sal_Int32 i) const +bool MacabHeader::iterator::operator== (const sal_Int32 i) const { return(id == i); } diff --git a/connectivity/source/drivers/macab/MacabHeader.hxx b/connectivity/source/drivers/macab/MacabHeader.hxx index 8a915fb20b01..d6ed3820a19b 100644 --- a/connectivity/source/drivers/macab/MacabHeader.hxx +++ b/connectivity/source/drivers/macab/MacabHeader.hxx @@ -52,8 +52,8 @@ namespace connectivity iterator(); ~iterator(); void operator++ (); - sal_Bool operator!= (const sal_Int32 i) const; - sal_Bool operator== (const sal_Int32 i) const; + bool operator!= (const sal_Int32 i) const; + bool operator== (const sal_Int32 i) const; macabfield *operator* () const; }; }; diff --git a/connectivity/source/drivers/macab/MacabPreparedStatement.cxx b/connectivity/source/drivers/macab/MacabPreparedStatement.cxx index 9ef8cc049b9a..71508eac57fc 100644 --- a/connectivity/source/drivers/macab/MacabPreparedStatement.cxx +++ b/connectivity/source/drivers/macab/MacabPreparedStatement.cxx @@ -88,7 +88,7 @@ MacabPreparedStatement::MacabPreparedStatement( const OUString& sql) : MacabPreparedStatement_BASE(_pConnection), m_sSqlStatement(sql), - m_bPrepared(sal_False), + m_bPrepared(false), m_nParameterIndex(0), m_aParameterRow() { diff --git a/connectivity/source/drivers/macab/MacabPreparedStatement.hxx b/connectivity/source/drivers/macab/MacabPreparedStatement.hxx index 89a90992c3bc..ba4546afdb93 100644 --- a/connectivity/source/drivers/macab/MacabPreparedStatement.hxx +++ b/connectivity/source/drivers/macab/MacabPreparedStatement.hxx @@ -43,7 +43,7 @@ namespace connectivity OUString m_sSqlStatement; ::rtl::Reference< MacabResultSetMetaData > m_xMetaData; - sal_Bool m_bPrepared; + bool m_bPrepared; mutable sal_Int32 m_nParameterIndex; OValueRow m_aParameterRow; diff --git a/connectivity/source/drivers/macab/MacabRecord.cxx b/connectivity/source/drivers/macab/MacabRecord.cxx index 654c4e562c8d..e67a66ef716c 100644 --- a/connectivity/source/drivers/macab/MacabRecord.cxx +++ b/connectivity/source/drivers/macab/MacabRecord.cxx @@ -81,16 +81,16 @@ void MacabRecord::insertAtColumn (CFTypeRef _value, ABPropertyType _type, const } -sal_Bool MacabRecord::contains (const macabfield *_field) const +bool MacabRecord::contains (const macabfield *_field) const { if(_field == NULL) - return sal_False; + return false; else return contains(_field->value); } -sal_Bool MacabRecord::contains (const CFTypeRef _value) const +bool MacabRecord::contains (const CFTypeRef _value) const { sal_Int32 i; for(i = 0; i < size; i++) @@ -99,12 +99,12 @@ sal_Bool MacabRecord::contains (const CFTypeRef _value) const { if(CFEqual(fields[i]->value, _value)) { - return sal_True; + return true; } } } - return sal_False; + return false; } @@ -314,8 +314,8 @@ OUString MacabRecord::fieldToString(const macabfield *_aField) CFNumberType numberType = CFNumberGetType( (CFNumberRef) _aField->value ); sal_Int64 nVal; // Should we check for the wrong type here, e.g., a float? - sal_Bool m_bSuccess = !CFNumberGetValue((CFNumberRef) _aField->value, numberType, &nVal); - if(m_bSuccess != sal_False) + bool m_bSuccess = !CFNumberGetValue((CFNumberRef) _aField->value, numberType, &nVal); + if(m_bSuccess) fieldString = OUString::number(nVal); } break; @@ -324,8 +324,8 @@ OUString MacabRecord::fieldToString(const macabfield *_aField) CFNumberType numberType = CFNumberGetType( (CFNumberRef) _aField->value ); double nVal; // Should we check for the wrong type here, e.g., an int? - sal_Bool m_bSuccess = !CFNumberGetValue((CFNumberRef) _aField->value, numberType, &nVal); - if(m_bSuccess != sal_False) + bool m_bSuccess = !CFNumberGetValue((CFNumberRef) _aField->value, numberType, &nVal); + if(m_bSuccess) fieldString = OUString::number(nVal); } break; diff --git a/connectivity/source/drivers/macab/MacabRecord.hxx b/connectivity/source/drivers/macab/MacabRecord.hxx index 3c8777a81438..3e8cf7a1dbc3 100644 --- a/connectivity/source/drivers/macab/MacabRecord.hxx +++ b/connectivity/source/drivers/macab/MacabRecord.hxx @@ -52,8 +52,8 @@ namespace connectivity MacabRecord(const sal_Int32 _size); virtual ~MacabRecord(); void insertAtColumn (CFTypeRef _value, ABPropertyType _type, const sal_Int32 _column); - sal_Bool contains(const macabfield *_field) const; - sal_Bool contains(const CFTypeRef _value) const; + bool contains(const macabfield *_field) const; + bool contains(const CFTypeRef _value) const; sal_Int32 getSize() const; macabfield *copy(const sal_Int32 i) const; macabfield *get(const sal_Int32 i) const; diff --git a/connectivity/source/drivers/macab/MacabRecords.cxx b/connectivity/source/drivers/macab/MacabRecords.cxx index b78e2a38b57f..3e3b17809e44 100644 --- a/connectivity/source/drivers/macab/MacabRecords.cxx +++ b/connectivity/source/drivers/macab/MacabRecords.cxx @@ -347,8 +347,8 @@ MacabHeader *MacabRecords::createHeaderForRecordType(const CFArrayRef _records, /* While searching through the properties for required properties, these * sal_Bools will keep track of what we have found. */ - sal_Bool bFoundProperty; - sal_Bool bFoundRequiredProperties[numRequiredProperties]; + bool bFoundProperty; + bool bFoundRequiredProperties[numRequiredProperties]; /* We have three MacabHeaders: headerDataForProperty is where we @@ -372,24 +372,24 @@ MacabHeader *MacabRecords::createHeaderForRecordType(const CFArrayRef _records, nonRequiredProperties = new CFStringRef[numNonRequiredProperties]; k = 0; for(i = 0; i < numRequiredProperties; i++) - bFoundRequiredProperties[i] = sal_False; + bFoundRequiredProperties[i] = false; /* Determine the non-required properties... */ for(i = 0; i < numProperties; i++) { property = (CFStringRef) CFArrayGetValueAtIndex(allProperties, i); - bFoundProperty = sal_False; + bFoundProperty = false; for(j = 0; j < numRequiredProperties; j++) { if(CFEqual(property, requiredProperties[j])) { - bFoundProperty = sal_True; - bFoundRequiredProperties[j] = sal_True; + bFoundProperty = true; + bFoundRequiredProperties[j] = true; break; } } - if(bFoundProperty == sal_False) + if(!bFoundProperty) { /* If we have found too many non-required properties */ if(k == numNonRequiredProperties) @@ -410,7 +410,7 @@ MacabHeader *MacabRecords::createHeaderForRecordType(const CFArrayRef _records, /* Fill the header with required properties first... */ for(i = 0; i < numRequiredProperties; i++) { - if(bFoundRequiredProperties[i] == sal_True) + if(bFoundRequiredProperties[i]) { /* The order of these matters (we want all address properties * before any phone properties, or else things will look weird), @@ -426,7 +426,7 @@ MacabHeader *MacabRecords::createHeaderForRecordType(const CFArrayRef _records, for(j = 0; j < numRecords; j++) { record = (ABRecordRef) CFArrayGetValueAtIndex(_records, j); - headerDataForProperty = createHeaderForProperty(record,requiredProperties[i],_recordType,sal_True); + headerDataForProperty = createHeaderForProperty(record,requiredProperties[i],_recordType,true); if(headerDataForProperty != NULL) { (*lcl_header) += headerDataForProperty; @@ -450,7 +450,7 @@ MacabHeader *MacabRecords::createHeaderForRecordType(const CFArrayRef _records, for(j = 0; j < numNonRequiredProperties; j++) { property = nonRequiredProperties[j]; - headerDataForProperty = createHeaderForProperty(record,property,_recordType,sal_False); + headerDataForProperty = createHeaderForProperty(record,property,_recordType,false); if(headerDataForProperty != NULL) { (*nonRequiredHeader) += headerDataForProperty; @@ -475,7 +475,7 @@ MacabHeader *MacabRecords::createHeaderForRecordType(const CFArrayRef _records, * the property's value and type and then calls another method of * the same name to do the dirty work. */ -MacabHeader *MacabRecords::createHeaderForProperty(const ABRecordRef _record, const CFStringRef _propertyName, const CFStringRef _recordType, const sal_Bool _isPropertyRequired) const +MacabHeader *MacabRecords::createHeaderForProperty(const ABRecordRef _record, const CFStringRef _propertyName, const CFStringRef _recordType, const bool _isPropertyRequired) const { // local variables CFStringRef localizedPropertyName; @@ -485,7 +485,7 @@ MacabHeader *MacabRecords::createHeaderForProperty(const ABRecordRef _record, co /* Get the property's value */ propertyValue = ABRecordCopyValue(_record,_propertyName); - if(propertyValue == NULL && _isPropertyRequired == sal_False) + if(propertyValue == NULL && !_isPropertyRequired) return NULL; propertyType = ABTypeOfProperty(addressBook, _recordType, _propertyName); @@ -941,21 +941,21 @@ void MacabRecords::insertPropertyIntoMacabRecord(const ABPropertyType _propertyT * there is nothing we can do: we have failed to place this * property into the record. */ - sal_Bool bPlaced = sal_False; + bool bPlaced = false; OUString columnName = _propertyName; sal_Int32 i = 1; // A big safeguard to prevent two fields from having the same name. - while(bPlaced != sal_True) + while(!bPlaced) { sal_Int32 columnNumber = _header->getColumnNumber(columnName); - bPlaced = sal_True; + bPlaced = true; if(columnNumber != -1) { // collision! A property already exists here! if(_abrecord->get(columnNumber) != NULL) { - bPlaced = sal_False; + bPlaced = false; i++; columnName = _propertyName + " (" + OUString::number(i) + ")"; } @@ -1157,13 +1157,13 @@ void MacabRecords::iterator::operator++ () } -sal_Bool MacabRecords::iterator::operator!= (const sal_Int32 i) const +bool MacabRecords::iterator::operator!= (const sal_Int32 i) const { return(id != i); } -sal_Bool MacabRecords::iterator::operator== (const sal_Int32 i) const +bool MacabRecords::iterator::operator== (const sal_Int32 i) const { return(id == i); } diff --git a/connectivity/source/drivers/macab/MacabRecords.hxx b/connectivity/source/drivers/macab/MacabRecords.hxx index 1288bace59c3..6a43b6b15306 100644 --- a/connectivity/source/drivers/macab/MacabRecords.hxx +++ b/connectivity/source/drivers/macab/MacabRecords.hxx @@ -71,7 +71,7 @@ namespace connectivity */ void bootstrap_CF_types(); void bootstrap_requiredProperties(); - MacabHeader *createHeaderForProperty(const ABRecordRef _record, const CFStringRef _propertyName, const CFStringRef _recordType, const sal_Bool _isPropertyRequired) const; + MacabHeader *createHeaderForProperty(const ABRecordRef _record, const CFStringRef _propertyName, const CFStringRef _recordType, const bool _isPropertyRequired) const; MacabHeader *createHeaderForProperty(const ABPropertyType _propertyType, const CFTypeRef _propertyValue, const CFStringRef _propertyName) const; void manageDuplicateHeaders(macabfield **_headerNames, const sal_Int32 _length) const; ABPropertyType getABTypeFromCFType(const CFTypeID cf_type ) const; @@ -116,8 +116,8 @@ namespace connectivity iterator(); ~iterator(); void operator++ (); - sal_Bool operator!= (const sal_Int32 i) const; - sal_Bool operator== (const sal_Int32 i) const; + bool operator!= (const sal_Int32 i) const; + bool operator== (const sal_Int32 i) const; MacabRecord *operator* () const; }; diff --git a/connectivity/source/drivers/macab/MacabResultSet.cxx b/connectivity/source/drivers/macab/MacabResultSet.cxx index cc1bd465fa67..17ea20ca5dde 100644 --- a/connectivity/source/drivers/macab/MacabResultSet.cxx +++ b/connectivity/source/drivers/macab/MacabResultSet.cxx @@ -52,7 +52,7 @@ MacabResultSet::MacabResultSet(MacabCommonStatement* pStmt) m_xMetaData(NULL), m_aMacabRecords(), m_nRowPos(-1), - m_bWasNull(sal_True) + m_bWasNull(true) { m_sTableName = MacabAddressBook::getDefaultTableName(); } diff --git a/connectivity/source/drivers/macab/MacabResultSet.hxx b/connectivity/source/drivers/macab/MacabResultSet.hxx index ea20ca40a7c1..428e8a7e8441 100644 --- a/connectivity/source/drivers/macab/MacabResultSet.hxx +++ b/connectivity/source/drivers/macab/MacabResultSet.hxx @@ -62,7 +62,7 @@ namespace connectivity ::rtl::Reference< MacabResultSetMetaData > m_xMetaData; // the description of the columns in this result set MacabRecords * m_aMacabRecords; // address book entries matching the query sal_Int32 m_nRowPos; // the current row within the result set - sal_Bool m_bWasNull; // last entry retrieved from this result set was NULL + bool m_bWasNull; // last entry retrieved from this result set was NULL OUString m_sTableName; // OPropertyArrayUsageHelper diff --git a/connectivity/source/drivers/macab/MacabServices.cxx b/connectivity/source/drivers/macab/MacabServices.cxx index 5428db736cb5..251099659bc1 100644 --- a/connectivity/source/drivers/macab/MacabServices.cxx +++ b/connectivity/source/drivers/macab/MacabServices.cxx @@ -53,7 +53,7 @@ struct ProviderRequest } inline - sal_Bool CREATE_PROVIDER( + bool CREATE_PROVIDER( const OUString& Implname, const Sequence< OUString > & Services, ::cppu::ComponentInstantiation Factory, diff --git a/connectivity/source/drivers/macab/MacabStatement.cxx b/connectivity/source/drivers/macab/MacabStatement.cxx index 0fb2105a69c9..daa5d07654a0 100644 --- a/connectivity/source/drivers/macab/MacabStatement.cxx +++ b/connectivity/source/drivers/macab/MacabStatement.cxx @@ -270,10 +270,8 @@ MacabOrder *MacabCommonStatement::analyseOrderByClause(const OSQLParseNode *pPar { OUString sColumnName = pColumnRef->getChild(0)->getTokenValue(); - sal_Bool bAscending = - SQL_ISTOKEN(pAscendingDescending, DESC)? - sal_False: - sal_True; + bool bAscending = + !SQL_ISTOKEN(pAscendingDescending, DESC); return new MacabSimpleOrder(m_pHeader, sColumnName, bAscending); } @@ -544,7 +542,7 @@ sal_Bool MacabCommonStatement::convertFastPropertyValue( sal_Int32, const Any&) throw (::com::sun::star::lang::IllegalArgumentException) { - sal_Bool bConverted = sal_False; + bool bConverted = false; // here we have to try to convert return bConverted; } diff --git a/connectivity/source/drivers/macab/macabcondition.cxx b/connectivity/source/drivers/macab/macabcondition.cxx index 64e9abb56f74..81586ddd19ef 100644 --- a/connectivity/source/drivers/macab/macabcondition.cxx +++ b/connectivity/source/drivers/macab/macabcondition.cxx @@ -30,23 +30,23 @@ MacabCondition::~MacabCondition() { } -MacabConditionConstant::MacabConditionConstant(const sal_Bool bValue) +MacabConditionConstant::MacabConditionConstant(const bool bValue) : MacabCondition(), m_bValue(bValue) { } -sal_Bool MacabConditionConstant::isAlwaysTrue() const +bool MacabConditionConstant::isAlwaysTrue() const { return m_bValue; } -sal_Bool MacabConditionConstant::isAlwaysFalse() const +bool MacabConditionConstant::isAlwaysFalse() const { return !m_bValue; } -sal_Bool MacabConditionConstant::eval(const MacabRecord *) const +bool MacabConditionConstant::eval(const MacabRecord *) const { return m_bValue; } @@ -57,16 +57,16 @@ MacabConditionColumn::MacabConditionColumn(const MacabHeader *header, const OUSt { } -sal_Bool MacabConditionColumn::isAlwaysTrue() const +bool MacabConditionColumn::isAlwaysTrue() const { // Sometimes true, sometimes false - return sal_False; + return false; } -sal_Bool MacabConditionColumn::isAlwaysFalse() const +bool MacabConditionColumn::isAlwaysFalse() const { // Sometimes true, sometimes false - return sal_False; + return false; } MacabConditionNull::MacabConditionNull(const MacabHeader *header, const OUString &sColumnName) throw(SQLException) @@ -74,16 +74,16 @@ MacabConditionNull::MacabConditionNull(const MacabHeader *header, const OUString { } -sal_Bool MacabConditionNull::eval(const MacabRecord *aRecord) const +bool MacabConditionNull::eval(const MacabRecord *aRecord) const { macabfield *aValue = aRecord->get(m_nFieldNumber); if(aValue == NULL) - return sal_True; + return true; else if(aValue->value == NULL) - return sal_True; + return true; else - return sal_False; + return false; } MacabConditionNotNull::MacabConditionNotNull(const MacabHeader *header, const OUString &sColumnName) throw(SQLException) @@ -91,16 +91,16 @@ MacabConditionNotNull::MacabConditionNotNull(const MacabHeader *header, const OU { } -sal_Bool MacabConditionNotNull::eval(const MacabRecord *aRecord) const +bool MacabConditionNotNull::eval(const MacabRecord *aRecord) const { macabfield *aValue = aRecord->get(m_nFieldNumber); if(aValue == NULL) - return sal_False; + return false; else if(aValue->value == NULL) - return sal_False; + return false; else - return sal_True; + return true; } MacabConditionCompare::MacabConditionCompare(const MacabHeader *header, const OUString &sColumnName, const OUString &sMatchString) throw(SQLException) @@ -114,17 +114,17 @@ MacabConditionEqual::MacabConditionEqual(const MacabHeader *header, const OUStri { } -sal_Bool MacabConditionEqual::eval(const MacabRecord *aRecord) const +bool MacabConditionEqual::eval(const MacabRecord *aRecord) const { macabfield *aValue = aRecord->get(m_nFieldNumber); if(aValue == NULL) - return sal_False; + return false; macabfield *aValue2 = MacabRecord::createMacabField(m_sMatchString,aValue->type); if(aValue2 == NULL) - return sal_False; + return false; sal_Int32 nReturn = MacabRecord::compareFields(aValue, aValue2); @@ -137,17 +137,17 @@ MacabConditionDifferent::MacabConditionDifferent(const MacabHeader *header, cons { } -sal_Bool MacabConditionDifferent::eval(const MacabRecord *aRecord) const +bool MacabConditionDifferent::eval(const MacabRecord *aRecord) const { macabfield *aValue = aRecord->get(m_nFieldNumber); if(aValue == NULL) - return sal_False; + return false; macabfield *aValue2 = MacabRecord::createMacabField(m_sMatchString,aValue->type); if(aValue2 == NULL) - return sal_False; + return false; sal_Int32 nReturn = MacabRecord::compareFields(aValue, aValue2); @@ -160,12 +160,12 @@ MacabConditionSimilar::MacabConditionSimilar(const MacabHeader *header, const OU { } -sal_Bool MacabConditionSimilar::eval(const MacabRecord *aRecord) const +bool MacabConditionSimilar::eval(const MacabRecord *aRecord) const { macabfield *aValue = aRecord->get(m_nFieldNumber); if(aValue == NULL) - return sal_False; + return false; OUString sName = MacabRecord::fieldToString(aValue); @@ -190,26 +190,26 @@ MacabConditionOr::MacabConditionOr(MacabCondition *pLeft, MacabCondition *pRight { } -sal_Bool MacabConditionOr::isAlwaysTrue() const +bool MacabConditionOr::isAlwaysTrue() const { return m_pLeft->isAlwaysTrue() || m_pRight->isAlwaysTrue(); } -sal_Bool MacabConditionOr::isAlwaysFalse() const +bool MacabConditionOr::isAlwaysFalse() const { return m_pLeft->isAlwaysFalse() && m_pRight->isAlwaysFalse(); } -sal_Bool MacabConditionOr::eval(const MacabRecord *aRecord) const +bool MacabConditionOr::eval(const MacabRecord *aRecord) const { // We avoid evaluating terms as much as we can - if (m_pLeft->isAlwaysTrue() || m_pRight->isAlwaysTrue()) return sal_True; - if (m_pLeft->isAlwaysFalse() && m_pRight->isAlwaysFalse()) return sal_False; + if (m_pLeft->isAlwaysTrue() || m_pRight->isAlwaysTrue()) return true; + if (m_pLeft->isAlwaysFalse() && m_pRight->isAlwaysFalse()) return false; - if (m_pLeft->eval(aRecord)) return sal_True; - if (m_pRight->eval(aRecord)) return sal_True; + if (m_pLeft->eval(aRecord)) return true; + if (m_pRight->eval(aRecord)) return true; - return sal_False; + return false; } MacabConditionAnd::MacabConditionAnd(MacabCondition *pLeft, MacabCondition *pRight) @@ -217,26 +217,26 @@ MacabConditionAnd::MacabConditionAnd(MacabCondition *pLeft, MacabCondition *pRig { } -sal_Bool MacabConditionAnd::isAlwaysTrue() const +bool MacabConditionAnd::isAlwaysTrue() const { return m_pLeft->isAlwaysTrue() && m_pRight->isAlwaysTrue(); } -sal_Bool MacabConditionAnd::isAlwaysFalse() const +bool MacabConditionAnd::isAlwaysFalse() const { return m_pLeft->isAlwaysFalse() || m_pRight->isAlwaysFalse(); } -sal_Bool MacabConditionAnd::eval(const MacabRecord *aRecord) const +bool MacabConditionAnd::eval(const MacabRecord *aRecord) const { // We avoid evaluating terms as much as we can - if (m_pLeft->isAlwaysFalse() || m_pRight->isAlwaysFalse()) return sal_False; - if (m_pLeft->isAlwaysTrue() && m_pRight->isAlwaysTrue()) return sal_True; + if (m_pLeft->isAlwaysFalse() || m_pRight->isAlwaysFalse()) return false; + if (m_pLeft->isAlwaysTrue() && m_pRight->isAlwaysTrue()) return true; - if (!m_pLeft->eval(aRecord)) return sal_False; - if (!m_pRight->eval(aRecord)) return sal_False; + if (!m_pLeft->eval(aRecord)) return false; + if (!m_pRight->eval(aRecord)) return false; - return sal_True; + return true; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/macab/macabcondition.hxx b/connectivity/source/drivers/macab/macabcondition.hxx index eb88487b1001..6ee7d5eac687 100644 --- a/connectivity/source/drivers/macab/macabcondition.hxx +++ b/connectivity/source/drivers/macab/macabcondition.hxx @@ -35,21 +35,21 @@ class MacabCondition { public: virtual ~MacabCondition(); - virtual sal_Bool isAlwaysTrue() const = 0; - virtual sal_Bool isAlwaysFalse() const = 0; - virtual sal_Bool eval(const MacabRecord *aRecord) const = 0; + virtual bool isAlwaysTrue() const = 0; + virtual bool isAlwaysFalse() const = 0; + virtual bool eval(const MacabRecord *aRecord) const = 0; }; class MacabConditionConstant : public MacabCondition { protected: - sal_Bool m_bValue; + bool m_bValue; public: - MacabConditionConstant(const sal_Bool bValue); - virtual sal_Bool isAlwaysTrue() const SAL_OVERRIDE; - virtual sal_Bool isAlwaysFalse() const SAL_OVERRIDE; - virtual sal_Bool eval(const MacabRecord *aRecord) const SAL_OVERRIDE; + MacabConditionConstant(const bool bValue); + virtual bool isAlwaysTrue() const SAL_OVERRIDE; + virtual bool isAlwaysFalse() const SAL_OVERRIDE; + virtual bool eval(const MacabRecord *aRecord) const SAL_OVERRIDE; }; class MacabConditionColumn : public MacabCondition @@ -61,8 +61,8 @@ class MacabConditionColumn : public MacabCondition MacabConditionColumn( const MacabHeader *header, const OUString &sColumnName) throw(::com::sun::star::sdbc::SQLException); - virtual sal_Bool isAlwaysTrue() const SAL_OVERRIDE; - virtual sal_Bool isAlwaysFalse() const SAL_OVERRIDE; + virtual bool isAlwaysTrue() const SAL_OVERRIDE; + virtual bool isAlwaysFalse() const SAL_OVERRIDE; }; class MacabConditionNull : public MacabConditionColumn @@ -71,7 +71,7 @@ class MacabConditionNull : public MacabConditionColumn MacabConditionNull( const MacabHeader *header, const OUString &sColumnName) throw(::com::sun::star::sdbc::SQLException); - virtual sal_Bool eval(const MacabRecord *aRecord) const SAL_OVERRIDE; + virtual bool eval(const MacabRecord *aRecord) const SAL_OVERRIDE; }; class MacabConditionNotNull : public MacabConditionColumn @@ -80,7 +80,7 @@ class MacabConditionNotNull : public MacabConditionColumn MacabConditionNotNull( const MacabHeader *header, const OUString &sColumnName) throw(::com::sun::star::sdbc::SQLException); - virtual sal_Bool eval(const MacabRecord *aRecord) const SAL_OVERRIDE; + virtual bool eval(const MacabRecord *aRecord) const SAL_OVERRIDE; }; class MacabConditionCompare : public MacabConditionColumn @@ -102,7 +102,7 @@ class MacabConditionEqual : public MacabConditionCompare const MacabHeader *header, const OUString &sColumnName, const OUString &sMatchString) throw(::com::sun::star::sdbc::SQLException); - virtual sal_Bool eval(const MacabRecord *aRecord) const SAL_OVERRIDE; + virtual bool eval(const MacabRecord *aRecord) const SAL_OVERRIDE; }; class MacabConditionDifferent : public MacabConditionCompare @@ -112,7 +112,7 @@ class MacabConditionDifferent : public MacabConditionCompare const MacabHeader *header, const OUString &sColumnName, const OUString &sMatchString) throw(::com::sun::star::sdbc::SQLException); - virtual sal_Bool eval(const MacabRecord *aRecord) const SAL_OVERRIDE; + virtual bool eval(const MacabRecord *aRecord) const SAL_OVERRIDE; }; class MacabConditionSimilar : public MacabConditionCompare @@ -122,7 +122,7 @@ class MacabConditionSimilar : public MacabConditionCompare const MacabHeader *header, const OUString &sColumnName, const OUString &sMatchString) throw(::com::sun::star::sdbc::SQLException); - virtual sal_Bool eval(const MacabRecord *aRecord) const SAL_OVERRIDE; + virtual bool eval(const MacabRecord *aRecord) const SAL_OVERRIDE; }; class MacabConditionBoolean : public MacabCondition @@ -139,18 +139,18 @@ class MacabConditionOr : public MacabConditionBoolean { public: MacabConditionOr(MacabCondition *pLeft, MacabCondition *pRight); - virtual sal_Bool isAlwaysTrue() const SAL_OVERRIDE; - virtual sal_Bool isAlwaysFalse() const SAL_OVERRIDE; - virtual sal_Bool eval(const MacabRecord *aRecord) const SAL_OVERRIDE; + virtual bool isAlwaysTrue() const SAL_OVERRIDE; + virtual bool isAlwaysFalse() const SAL_OVERRIDE; + virtual bool eval(const MacabRecord *aRecord) const SAL_OVERRIDE; }; class MacabConditionAnd : public MacabConditionBoolean { public: MacabConditionAnd(MacabCondition *pLeft, MacabCondition *pRight); - virtual sal_Bool isAlwaysTrue() const SAL_OVERRIDE; - virtual sal_Bool isAlwaysFalse() const SAL_OVERRIDE; - virtual sal_Bool eval(const MacabRecord *aRecord) const SAL_OVERRIDE; + virtual bool isAlwaysTrue() const SAL_OVERRIDE; + virtual bool isAlwaysFalse() const SAL_OVERRIDE; + virtual bool eval(const MacabRecord *aRecord) const SAL_OVERRIDE; }; } diff --git a/connectivity/source/drivers/macab/macaborder.cxx b/connectivity/source/drivers/macab/macaborder.cxx index 18e8def51e4c..399e17922b20 100644 --- a/connectivity/source/drivers/macab/macaborder.cxx +++ b/connectivity/source/drivers/macab/macaborder.cxx @@ -28,7 +28,7 @@ MacabOrder::~MacabOrder() { } -MacabSimpleOrder::MacabSimpleOrder(MacabHeader *header, OUString &sColumnName, sal_Bool bAscending) +MacabSimpleOrder::MacabSimpleOrder(MacabHeader *header, OUString &sColumnName, bool bAscending) : MacabOrder(), m_nFieldNumber(header->getColumnNumber(sColumnName)), m_bAscending(bAscending) diff --git a/connectivity/source/drivers/macab/macaborder.hxx b/connectivity/source/drivers/macab/macaborder.hxx index f00a45514514..10ce1fba8ac6 100644 --- a/connectivity/source/drivers/macab/macaborder.hxx +++ b/connectivity/source/drivers/macab/macaborder.hxx @@ -41,10 +41,10 @@ namespace connectivity class MacabSimpleOrder : public MacabOrder { sal_Int32 m_nFieldNumber; - sal_Bool m_bAscending; + bool m_bAscending; public: - MacabSimpleOrder(MacabHeader *header, OUString &sColumnName, sal_Bool bAscending); + MacabSimpleOrder(MacabHeader *header, OUString &sColumnName, bool bAscending); virtual sal_Int32 compare(const MacabRecord *record1, const MacabRecord *record2) const SAL_OVERRIDE; }; |