diff options
Diffstat (limited to 'connectivity/source/drivers/file')
| -rw-r--r-- | connectivity/source/drivers/file/FConnection.cxx | 16 | ||||
| -rw-r--r-- | connectivity/source/drivers/file/FDatabaseMetaData.cxx | 68 | ||||
| -rw-r--r-- | connectivity/source/drivers/file/FPreparedStatement.cxx | 4 | ||||
| -rw-r--r-- | connectivity/source/drivers/file/FResultSet.cxx | 156 | ||||
| -rw-r--r-- | connectivity/source/drivers/file/FStatement.cxx | 8 | ||||
| -rw-r--r-- | connectivity/source/drivers/file/FTable.cxx | 16 | ||||
| -rw-r--r-- | connectivity/source/drivers/file/fanalyzer.cxx | 10 | ||||
| -rw-r--r-- | connectivity/source/drivers/file/fcode.cxx | 36 | ||||
| -rw-r--r-- | connectivity/source/drivers/file/fcomp.cxx | 14 |
9 files changed, 164 insertions, 164 deletions
diff --git a/connectivity/source/drivers/file/FConnection.cxx b/connectivity/source/drivers/file/FConnection.cxx index 24ce44f3299f..e3befff7e5d9 100644 --- a/connectivity/source/drivers/file/FConnection.cxx +++ b/connectivity/source/drivers/file/FConnection.cxx @@ -58,12 +58,12 @@ typedef connectivity::OMetaConnection OConnection_BASE; OConnection::OConnection(OFileDriver* _pDriver) : OSubComponent<OConnection, OConnection_BASE>((::cppu::OWeakObject*)_pDriver, this) , m_pDriver(_pDriver) - , m_bClosed(sal_False) - , m_bAutoCommit(sal_False) - , m_bReadOnly(sal_False) - , m_bShowDeleted(sal_False) - , m_bCaseSensitiveExtension( sal_True ) - , m_bCheckSQL92(sal_False) + , m_bClosed(false) + , m_bAutoCommit(false) + , m_bReadOnly(false) + , m_bShowDeleted(false) + , m_bCaseSensitiveExtension( true ) + , m_bCheckSQL92(false) , m_bDefaultTextEncoding(false) { m_nTextEncoding = RTL_TEXTENCODING_DONTKNOW; @@ -81,7 +81,7 @@ void SAL_CALL OConnection::release() throw() } -sal_Bool OConnection::matchesExtension( const OUString& _rExt ) const +bool OConnection::matchesExtension( const OUString& _rExt ) const { if ( isCaseSensitveExtension() ) return ( getExtension() == _rExt ); @@ -374,7 +374,7 @@ void OConnection::disposing() ::osl::MutexGuard aGuard(m_aMutex); OConnection_BASE::disposing(); - m_bClosed = sal_True; + m_bClosed = true; m_xDir.clear(); m_xContent.clear(); m_xCatalog = WeakReference< XTablesSupplier>(); diff --git a/connectivity/source/drivers/file/FDatabaseMetaData.cxx b/connectivity/source/drivers/file/FDatabaseMetaData.cxx index 7605202c87dc..06b17ca4f3e8 100644 --- a/connectivity/source/drivers/file/FDatabaseMetaData.cxx +++ b/connectivity/source/drivers/file/FDatabaseMetaData.cxx @@ -115,7 +115,7 @@ namespace return -1; // the second context - sal_Bool bCanAccess = sal_False; + bool bCanAccess = false; ::ucbhelper::Content aContent2; try { @@ -175,11 +175,11 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTables( static const OUString aTable("TABLE"); - sal_Bool bTableFound = sal_True; + bool bTableFound = true; sal_Int32 nLength = types.getLength(); if(nLength) { - bTableFound = sal_False; + bTableFound = false; const OUString* pBegin = types.getConstArray(); const OUString* pEnd = pBegin + nLength; @@ -187,7 +187,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTables( { if(*pBegin == aTable) { - bTableFound = sal_True; + bTableFound = true; break; } } @@ -219,9 +219,9 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTables( INetURLObject aURL; xResultSet->beforeFirst(); - sal_Bool bKnowCaseSensivity = sal_False; - sal_Bool bCaseSensitiveDir = sal_True; - sal_Bool bCheckEnabled = m_pConnection->isCheckEnabled(); + bool bKnowCaseSensivity = false; + bool bCaseSensitiveDir = true; + bool bCheckEnabled = m_pConnection->isCheckEnabled(); while(xResultSet->next()) { @@ -233,22 +233,22 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTables( ODatabaseMetaDataResultSet::ORow aRow(3); aRow.reserve(6); - sal_Bool bNewRow = sal_False; + bool bNewRow = false; if ( !bKnowCaseSensivity ) { - bKnowCaseSensivity = sal_True; + bKnowCaseSensivity = true; sal_Int16 nCase = isCaseSensitiveParentFolder( m_pConnection->getURL(), aURL.getName() ); switch( nCase ) { case 1: - bCaseSensitiveDir = sal_True; + bCaseSensitiveDir = true; break; case -1: - bKnowCaseSensivity = sal_False; + bKnowCaseSensivity = false; /** run through */ case 0: - bCaseSensitiveDir = sal_False; + bCaseSensitiveDir = false; } if ( bKnowCaseSensivity ) { @@ -274,13 +274,13 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTables( if ( match(tableNamePattern,aName,'\0') && ( !bCheckEnabled || ( bCheckEnabled && ((nChar < '0' || nChar > '9')))) ) { aRow.push_back(new ORowSetValueDecorator(aName)); - bNewRow = sal_True; + bNewRow = true; } } } else // no extension, filter myself { - sal_Bool bErg = sal_False; + bool bErg = false; do { if (aURL.getExtension().isEmpty()) @@ -289,11 +289,11 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTables( if(match(tableNamePattern,aURL.getBase(),'\0') && ( !bCheckEnabled || ( bCheckEnabled && ((nChar < '0' || nChar > '9')))) ) { aRow.push_back(new ORowSetValueDecorator(OUString(aURL.getBase()))); - bNewRow = sal_True; + bNewRow = true; } break; } - else if ( ( bErg = xResultSet->next() ) != sal_False ) + else if ( ( bErg = xResultSet->next() ) ) { aName = xRow->getString(1); aURL.SetSmartURL(aName); @@ -474,10 +474,10 @@ sal_Bool SAL_CALL ODatabaseMetaData::storesLowerCaseIdentifiers( ) throw(SQLExc return sal_False; } -sal_Bool ODatabaseMetaData::impl_storesMixedCaseQuotedIdentifiers_throw( ) +bool ODatabaseMetaData::impl_storesMixedCaseQuotedIdentifiers_throw( ) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::impl_storesMixedCaseQuotedIdentifiers_throw" ); - return sal_False; + return false; } sal_Bool SAL_CALL ODatabaseMetaData::storesMixedCaseIdentifiers( ) throw(SQLException, RuntimeException, std::exception) @@ -498,16 +498,16 @@ sal_Bool SAL_CALL ODatabaseMetaData::storesUpperCaseIdentifiers( ) throw(SQLExc return sal_False; } -sal_Bool ODatabaseMetaData::impl_supportsAlterTableWithAddColumn_throw( ) +bool ODatabaseMetaData::impl_supportsAlterTableWithAddColumn_throw( ) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::impl_supportsAlterTableWithAddColumn_throw" ); - return sal_False; + return false; } -sal_Bool ODatabaseMetaData::impl_supportsAlterTableWithDropColumn_throw( ) +bool ODatabaseMetaData::impl_supportsAlterTableWithDropColumn_throw( ) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::impl_supportsAlterTableWithDropColumn_throw" ); - return sal_False; + return false; } sal_Int32 SAL_CALL ODatabaseMetaData::getMaxIndexLength( ) throw(SQLException, RuntimeException, std::exception) @@ -547,10 +547,10 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsDifferentTableCorrelationNames( ) return sal_True; } -sal_Bool ODatabaseMetaData::impl_isCatalogAtStart_throw( ) +bool ODatabaseMetaData::impl_isCatalogAtStart_throw( ) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::impl_isCatalogAtStart_throw" ); - return sal_True; + return true; } sal_Bool SAL_CALL ODatabaseMetaData::dataDefinitionIgnoredInTransactions( ) throw(SQLException, RuntimeException, std::exception) @@ -619,10 +619,10 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsTransactionIsolationLevel( sal_Int3 return sal_False; } -sal_Bool ODatabaseMetaData::impl_supportsSchemasInDataManipulation_throw( ) +bool ODatabaseMetaData::impl_supportsSchemasInDataManipulation_throw( ) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::impl_supportsSchemasInDataManipulation_throw" ); - return sal_False; + return false; } sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92FullSQL( ) throw(SQLException, RuntimeException, std::exception) @@ -649,16 +649,16 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInIndexDefinitions( ) throw return sal_False; } -sal_Bool ODatabaseMetaData::impl_supportsSchemasInTableDefinitions_throw( ) +bool ODatabaseMetaData::impl_supportsSchemasInTableDefinitions_throw( ) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::impl_supportsSchemasInTableDefinitions_throw" ); - return sal_False; + return false; } -sal_Bool ODatabaseMetaData::impl_supportsCatalogsInTableDefinitions_throw( ) +bool ODatabaseMetaData::impl_supportsCatalogsInTableDefinitions_throw( ) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::impl_supportsCatalogsInTableDefinitions_throw" ); - return sal_False; + return false; } sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInIndexDefinitions( ) throw(SQLException, RuntimeException, std::exception) @@ -667,10 +667,10 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInIndexDefinitions( ) thro return sal_False; } -sal_Bool ODatabaseMetaData::impl_supportsCatalogsInDataManipulation_throw( ) +bool ODatabaseMetaData::impl_supportsCatalogsInDataManipulation_throw( ) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::impl_supportsCatalogsInDataManipulation_throw" ); - return sal_False; + return false; } sal_Bool SAL_CALL ODatabaseMetaData::supportsOuterJoins( ) throw(SQLException, RuntimeException, std::exception) @@ -860,10 +860,10 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsMixedCaseIdentifiers( ) throw(SQLE return sal_True; } -sal_Bool ODatabaseMetaData::impl_supportsMixedCaseQuotedIdentifiers_throw( ) +bool ODatabaseMetaData::impl_supportsMixedCaseQuotedIdentifiers_throw( ) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::impl_supportsMixedCaseQuotedIdentifiers_throw" ); - return sal_False; + return false; } sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedAtEnd( ) throw(SQLException, RuntimeException, std::exception) diff --git a/connectivity/source/drivers/file/FPreparedStatement.cxx b/connectivity/source/drivers/file/FPreparedStatement.cxx index 9fac363c7874..f4ed968dcdc5 100644 --- a/connectivity/source/drivers/file/FPreparedStatement.cxx +++ b/connectivity/source/drivers/file/FPreparedStatement.cxx @@ -100,7 +100,7 @@ void OPreparedStatement::construct(const OUString& sql) throw(SQLException, Run } OValueRefRow aTemp; - OResultSet::setBoundedColumns(m_aEvaluateRow,aTemp,m_xParamColumns,xNames,sal_False,m_xDBMetaData,m_aColMapping); + OResultSet::setBoundedColumns(m_aEvaluateRow,aTemp,m_xParamColumns,xNames,false,m_xDBMetaData,m_aColMapping); } Reference<XResultSet> OPreparedStatement::makeResultSet() @@ -610,7 +610,7 @@ void OPreparedStatement::parseParamterElem(const OUString& _sColumnName, OSQLPar if(nParameter == -1) nParameter = AddParameter(pRow_Value_Constructor_Elem,xCol); // Save number of parameter in the variable: - SetAssignValue(_sColumnName, OUString(), sal_True, nParameter); + SetAssignValue(_sColumnName, OUString(), true, nParameter); } diff --git a/connectivity/source/drivers/file/FResultSet.cxx b/connectivity/source/drivers/file/FResultSet.cxx index c0b85c75050c..e51b25c3ed44 100644 --- a/connectivity/source/drivers/file/FResultSet.cxx +++ b/connectivity/source/drivers/file/FResultSet.cxx @@ -98,15 +98,15 @@ OResultSet::OResultSet(OStatement_Base* pStmt,OSQLParseTreeIterator& _aSQLIte ,m_nLastVisitedPos(-1) ,m_nRowCountResult(-1) ,m_nColumnCount(0) - ,m_bWasNull(sal_False) - ,m_bEOF(sal_False) - ,m_bLastRecord(sal_False) - ,m_bInserted(sal_False) - ,m_bRowUpdated(sal_False) - ,m_bRowInserted(sal_False) - ,m_bRowDeleted(sal_False) + ,m_bWasNull(false) + ,m_bEOF(false) + ,m_bLastRecord(false) + ,m_bInserted(false) + ,m_bRowUpdated(false) + ,m_bRowInserted(false) + ,m_bRowDeleted(false) ,m_bShowDeleted(pStmt->getOwnConnection()->showDeleted()) - ,m_bIsCount(sal_False) + ,m_bIsCount(false) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::OResultSet" ); osl_atomic_increment( &m_refCount ); @@ -439,7 +439,7 @@ void SAL_CALL OResultSet::afterLast( ) throw(SQLException, RuntimeException, st if(last()) next(); - m_bEOF = sal_True; + m_bEOF = true; } @@ -455,7 +455,7 @@ sal_Bool SAL_CALL OResultSet::first( ) throw(SQLException, RuntimeException, st SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::first" ); ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); - return m_pTable ? m_aSkipDeletedSet.skipDeleted(IResultSetHelper::FIRST,1,sal_True) : sal_False; + return m_pTable ? m_aSkipDeletedSet.skipDeleted(IResultSetHelper::FIRST,1,true) : sal_False; } @@ -465,7 +465,7 @@ sal_Bool SAL_CALL OResultSet::last( ) throw(SQLException, RuntimeException, std // here I know definitely that I stand on the last record ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); - return m_pTable ? m_aSkipDeletedSet.skipDeleted(IResultSetHelper::LAST,1,sal_True) : sal_False; + return m_pTable ? m_aSkipDeletedSet.skipDeleted(IResultSetHelper::LAST,1,true) : sal_False; } sal_Bool SAL_CALL OResultSet::absolute( sal_Int32 row ) throw(SQLException, RuntimeException, std::exception) @@ -473,7 +473,7 @@ sal_Bool SAL_CALL OResultSet::absolute( sal_Int32 row ) throw(SQLException, Runt SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::absolute" ); ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); - return m_pTable ? m_aSkipDeletedSet.skipDeleted(IResultSetHelper::ABSOLUTE,row,sal_True) : sal_False; + return m_pTable ? m_aSkipDeletedSet.skipDeleted(IResultSetHelper::ABSOLUTE,row,true) : sal_False; } sal_Bool SAL_CALL OResultSet::relative( sal_Int32 row ) throw(SQLException, RuntimeException, std::exception) @@ -481,7 +481,7 @@ sal_Bool SAL_CALL OResultSet::relative( sal_Int32 row ) throw(SQLException, Runt SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::relative" ); ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); - return m_pTable ? m_aSkipDeletedSet.skipDeleted(IResultSetHelper::RELATIVE,row,sal_True) : sal_False; + return m_pTable ? m_aSkipDeletedSet.skipDeleted(IResultSetHelper::RELATIVE,row,true) : sal_False; } sal_Bool SAL_CALL OResultSet::previous( ) throw(SQLException, RuntimeException, std::exception) @@ -489,7 +489,7 @@ sal_Bool SAL_CALL OResultSet::previous( ) throw(SQLException, RuntimeException, SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::previous" ); ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); - return m_pTable ? m_aSkipDeletedSet.skipDeleted(IResultSetHelper::PRIOR,0,sal_True) : sal_False; + return m_pTable ? m_aSkipDeletedSet.skipDeleted(IResultSetHelper::PRIOR,0,true) : sal_False; } Reference< XInterface > SAL_CALL OResultSet::getStatement( ) throw(SQLException, RuntimeException, std::exception) @@ -581,7 +581,7 @@ sal_Bool SAL_CALL OResultSet::next( ) throw(SQLException, RuntimeException, std ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); - return m_pTable ? m_aSkipDeletedSet.skipDeleted(IResultSetHelper::NEXT,1,sal_True) : sal_False; + return m_pTable ? m_aSkipDeletedSet.skipDeleted(IResultSetHelper::NEXT,1,true) : sal_False; } @@ -623,8 +623,8 @@ void SAL_CALL OResultSet::insertRow( ) throw(SQLException, RuntimeException, st // we know that we append new rows at the end // so we have to know where the end is - m_aSkipDeletedSet.skipDeleted(IResultSetHelper::LAST,1,sal_False); - m_bRowInserted = m_pTable->InsertRow(*m_aInsertRow, sal_True, m_xColsIdx); + m_aSkipDeletedSet.skipDeleted(IResultSetHelper::LAST,1,false); + m_bRowInserted = m_pTable->InsertRow(*m_aInsertRow, true, m_xColsIdx); if(m_bRowInserted && m_pFileSet.is()) { sal_Int32 nPos = (m_aInsertRow->get())[0]->getValue(); @@ -682,10 +682,10 @@ void SAL_CALL OResultSet::cancelRowUpdates( ) throw(SQLException, RuntimeExcept checkDisposed(OResultSet_BASE::rBHelper.bDisposed); - m_bInserted = sal_False; - m_bRowUpdated = sal_False; - m_bRowInserted = sal_False; - m_bRowDeleted = sal_False; + m_bInserted = false; + m_bRowUpdated = false; + m_bRowInserted = false; + m_bRowDeleted = false; if(m_aInsertRow.is()) { @@ -708,7 +708,7 @@ void SAL_CALL OResultSet::moveToInsertRow( ) throw(SQLException, RuntimeExcepti if(!m_pTable || m_pTable->isReadOnly()) lcl_throwError(STR_TABLE_READONLY,*this); - m_bInserted = sal_True; + m_bInserted = true; OValueRefVector::Vector::iterator aIter = m_aInsertRow->get().begin()+1; for(;aIter != m_aInsertRow->get().end();++aIter) @@ -880,10 +880,10 @@ IPropertyArrayHelper & OResultSet::getInfoHelper() } -sal_Bool OResultSet::ExecuteRow(IResultSetHelper::Movement eFirstCursorPosition, +bool OResultSet::ExecuteRow(IResultSetHelper::Movement eFirstCursorPosition, sal_Int32 nFirstOffset, - sal_Bool bEvaluate, - sal_Bool bRetrieveData) + bool bEvaluate, + bool bRetrieveData) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::ExecuteRow" ); OSL_ENSURE(m_pSQLAnalyzer,"OResultSet::ExecuteRow: Analyzer isn't set!"); @@ -893,31 +893,31 @@ sal_Bool OResultSet::ExecuteRow(IResultSetHelper::Movement eFirstCursorPosition, sal_Int32 nOffset = nFirstOffset; if (!m_pTable) - return sal_False; + return false; const OSQLColumns & rTableCols = *(m_pTable->getTableColumns()); - sal_Bool bHasRestriction = m_pSQLAnalyzer->hasRestriction(); + bool bHasRestriction = m_pSQLAnalyzer->hasRestriction(); again: // protect from reading over the end when someboby is inserting while we are reading // this method works only for dBase at the moment !!!! if (eCursorPosition == IResultSetHelper::NEXT && m_nFilePos == m_nLastVisitedPos) { - return sal_False; + return false; } if (!m_pTable || !m_pTable->seekRow(eCursorPosition, nOffset, m_nFilePos)) { - return sal_False; + return false; } if (!bEvaluate) // If no evaluation runs, then just fill the results-row { - m_pTable->fetchRow(m_aRow,rTableCols, sal_True,bRetrieveData); + m_pTable->fetchRow(m_aRow,rTableCols, true,bRetrieveData); } else { - m_pTable->fetchRow(m_aEvaluateRow, rTableCols, sal_True,bRetrieveData || bHasRestriction); + m_pTable->fetchRow(m_aEvaluateRow, rTableCols, true,bRetrieveData || bHasRestriction); if ( ( !m_bShowDeleted && m_aEvaluateRow->isDeleted() @@ -935,7 +935,7 @@ again: nOffset = (*m_aEvaluateIter); else { - return sal_False; + return false; } } else if (m_pFileSet.is()) @@ -963,7 +963,7 @@ again: } else { - return sal_False; + return false; } // Try again ... goto again; @@ -990,38 +990,38 @@ again: } else if (m_aSQLIterator.getStatementType() == SQL_STATEMENT_UPDATE) { - sal_Bool bOK = sal_True; + bool bOK = true; if (bEvaluate) { // read the actual result-row - bOK = m_pTable->fetchRow(m_aEvaluateRow, *(m_pTable->getTableColumns()), sal_True,sal_True); + bOK = m_pTable->fetchRow(m_aEvaluateRow, *(m_pTable->getTableColumns()), true,true); } if (bOK) { // just give the values to be changed: if(!m_pTable->UpdateRow(*m_aAssignValues,m_aEvaluateRow, m_xColsIdx)) - return sal_False; + return false; } } else if (m_aSQLIterator.getStatementType() == SQL_STATEMENT_DELETE) { - sal_Bool bOK = sal_True; + bool bOK = true; if (bEvaluate) { - bOK = m_pTable->fetchRow(m_aEvaluateRow, *(m_pTable->getTableColumns()), sal_True,sal_True); + bOK = m_pTable->fetchRow(m_aEvaluateRow, *(m_pTable->getTableColumns()), true,true); } if (bOK) { if(!m_pTable->DeleteRow(*m_xColumns)) - return sal_False; + return false; } } - return sal_True; + return true; } -sal_Bool OResultSet::Move(IResultSetHelper::Movement eCursorPosition, sal_Int32 nOffset, sal_Bool bRetrieveData) +bool OResultSet::Move(IResultSetHelper::Movement eCursorPosition, sal_Int32 nOffset, bool bRetrieveData) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::Move" ); @@ -1035,7 +1035,7 @@ sal_Bool OResultSet::Move(IResultSetHelper::Movement eCursorPosition, sal_Int32 if (!m_pFileSet.is()) //no Index available { // Normal FETCH - ExecuteRow(eCursorPosition,nOffset,sal_False,bRetrieveData); + ExecuteRow(eCursorPosition,nOffset,false,bRetrieveData); // now set the bookmark for outside this is the logical pos and not the file pos *(*m_aRow->get().begin()) = sal_Int32(m_nRowPos + 1); @@ -1063,7 +1063,7 @@ sal_Bool OResultSet::Move(IResultSetHelper::Movement eCursorPosition, sal_Int32 case IResultSetHelper::ABSOLUTE: case IResultSetHelper::BOOKMARK: if ( m_nRowPos == (nOffset -1) ) - return sal_True; + return true; m_nRowPos = nOffset -1; break; } @@ -1081,7 +1081,7 @@ sal_Bool OResultSet::Move(IResultSetHelper::Movement eCursorPosition, sal_Int32 if (m_nRowPos < (sal_Int32)m_pFileSet->get().size()) { // Fetch via Index - ExecuteRow(IResultSetHelper::BOOKMARK,(m_pFileSet->get())[m_nRowPos],sal_False,bRetrieveData); + ExecuteRow(IResultSetHelper::BOOKMARK,(m_pFileSet->get())[m_nRowPos],false,bRetrieveData); // now set the bookmark for outside *(*m_aRow->get().begin()) = sal_Int32(m_nRowPos + 1); @@ -1102,33 +1102,33 @@ sal_Bool OResultSet::Move(IResultSetHelper::Movement eCursorPosition, sal_Int32 m_aFileSetIter = m_pFileSet->get().end()-1; m_pTable->seekRow(IResultSetHelper::BOOKMARK, *m_aFileSetIter, m_nFilePos); } - sal_Bool bOK = sal_True; + bool bOK = true; // Determine the number of further Fetches while (bOK && m_nRowPos >= (sal_Int32)m_pFileSet->get().size()) { if (m_pEvaluationKeySet) { if (m_nRowPos >= (sal_Int32)m_pEvaluationKeySet->size()) - return sal_False; + return false; else if (m_nRowPos == 0) { m_aEvaluateIter = m_pEvaluationKeySet->begin(); - bOK = ExecuteRow(IResultSetHelper::BOOKMARK,*m_aEvaluateIter,sal_True, bRetrieveData); + bOK = ExecuteRow(IResultSetHelper::BOOKMARK,*m_aEvaluateIter,true, bRetrieveData); } else { ++m_aEvaluateIter; - bOK = ExecuteRow(IResultSetHelper::BOOKMARK,*m_aEvaluateIter,sal_True, bRetrieveData); + bOK = ExecuteRow(IResultSetHelper::BOOKMARK,*m_aEvaluateIter,true, bRetrieveData); } } else - bOK = ExecuteRow(IResultSetHelper::NEXT,1,sal_True, sal_False);//bRetrieveData); + bOK = ExecuteRow(IResultSetHelper::NEXT,1,true, false);//bRetrieveData); } if (bOK) { // read the results again - m_pTable->fetchRow(m_aRow, *(m_pTable->getTableColumns()), sal_True,bRetrieveData); + m_pTable->fetchRow(m_aRow, *(m_pTable->getTableColumns()), true,bRetrieveData); // now set the bookmark for outside *(*m_aRow->get().begin()) = sal_Int32(m_nRowPos + 1); @@ -1190,16 +1190,16 @@ sal_Bool OResultSet::Move(IResultSetHelper::Movement eCursorPosition, sal_Int32 } else { - m_bEOF = sal_True; + m_bEOF = true; m_nRowPos = 1; - return sal_False; + return false; } } else // Fetch only possible at SELECT! - return sal_False; + return false; - return sal_True; + return true; Error: // is the Cursor positioned before the first row @@ -1227,7 +1227,7 @@ Error: m_nRowPos = nTempPos; // last Position } } - return sal_False; + return false; } void OResultSet::sortRows() @@ -1311,19 +1311,19 @@ void OResultSet::sortRows() while (m_aEvaluateIter != m_pEvaluationKeySet->end()) { - ExecuteRow(IResultSetHelper::BOOKMARK,(*m_aEvaluateIter),sal_True); + ExecuteRow(IResultSetHelper::BOOKMARK,(*m_aEvaluateIter),true); ++m_aEvaluateIter; } } else { - while ( ExecuteRow( IResultSetHelper::NEXT, 1, sal_False, sal_True ) ) + while ( ExecuteRow( IResultSetHelper::NEXT, 1, false, true ) ) { m_aSelectRow->get()[0]->setValue( m_aRow->get()[0]->getValue() ); if ( m_pSQLAnalyzer->hasFunctions() ) m_pSQLAnalyzer->setSelectionEvaluationResult( m_aSelectRow, m_aColMapping ); const sal_Int32 nBookmark = (*m_aRow->get().begin())->getValue(); - ExecuteRow( IResultSetHelper::BOOKMARK, nBookmark, sal_True, sal_False ); + ExecuteRow( IResultSetHelper::BOOKMARK, nBookmark, true, false ); } } @@ -1337,7 +1337,7 @@ void OResultSet::sortRows() -sal_Bool OResultSet::OpenImpl() +bool OResultSet::OpenImpl() { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::OpenImpl" ); OSL_ENSURE(m_pSQLAnalyzer,"No analyzer set with setSqlAnalyzer!"); @@ -1395,7 +1395,7 @@ sal_Bool OResultSet::OpenImpl() // for now simply iterate over all rows and // do all actions (or just count) { - sal_Bool bOK = sal_True; + bool bOK = true; if (m_pEvaluationKeySet) { m_aEvaluateIter = m_pEvaluationKeySet->begin(); @@ -1405,9 +1405,9 @@ sal_Bool OResultSet::OpenImpl() while (bOK) { if (m_pEvaluationKeySet) - ExecuteRow(IResultSetHelper::BOOKMARK,(*m_aEvaluateIter),sal_True); + ExecuteRow(IResultSetHelper::BOOKMARK,(*m_aEvaluateIter),true); else - bOK = ExecuteRow(IResultSetHelper::NEXT,1,sal_True); + bOK = ExecuteRow(IResultSetHelper::NEXT,1,true); if (bOK) { @@ -1427,7 +1427,7 @@ sal_Bool OResultSet::OpenImpl() } else { - sal_Bool bDistinct = sal_False; + bool bDistinct = false; assert(m_pParseTree != 0); OSQLParseNode *pDistinct = m_pParseTree->getChild(1); @@ -1452,7 +1452,7 @@ sal_Bool OResultSet::OpenImpl() m_aOrderbyAscending.push_back(SQL_ASC); } } - bDistinct = sal_True; + bDistinct = true; } if (IsSorted()) @@ -1497,7 +1497,7 @@ sal_Bool OResultSet::OpenImpl() for( size_t j = nMaxRow-1; j > 0; --j) { nPos = (m_pFileSet->get())[j]; - ExecuteRow(IResultSetHelper::BOOKMARK,nPos,sal_False); + ExecuteRow(IResultSetHelper::BOOKMARK,nPos,false); m_pSQLAnalyzer->setSelectionEvaluationResult(m_aSelectRow,m_aColMapping); { // copy row values OValueRefVector::Vector::iterator copyFrom = m_aSelectRow->get().begin(); @@ -1510,7 +1510,7 @@ sal_Bool OResultSet::OpenImpl() // compare with next row nKey = (m_pFileSet->get())[j-1]; - ExecuteRow(IResultSetHelper::BOOKMARK,nKey,sal_False); + ExecuteRow(IResultSetHelper::BOOKMARK,nKey,false); m_pSQLAnalyzer->setSelectionEvaluationResult(m_aSelectRow,m_aColMapping); OValueRefVector::Vector::iterator loopInRow = m_aSelectRow->get().begin(); OValueVector::Vector::iterator existentInSearchRow = aSearchRow->get().begin(); @@ -1546,7 +1546,7 @@ sal_Bool OResultSet::OpenImpl() // run the actions (or simply count): { - sal_Bool bOK = sal_True; + bool bOK = true; if (m_pEvaluationKeySet) { m_aEvaluateIter = m_pEvaluationKeySet->begin(); @@ -1556,9 +1556,9 @@ sal_Bool OResultSet::OpenImpl() while (bOK) { if (m_pEvaluationKeySet) - ExecuteRow(IResultSetHelper::BOOKMARK,(*m_aEvaluateIter),sal_True); + ExecuteRow(IResultSetHelper::BOOKMARK,(*m_aEvaluateIter),true); else - bOK = ExecuteRow(IResultSetHelper::NEXT,1,sal_True); + bOK = ExecuteRow(IResultSetHelper::NEXT,1,true); if (bOK) { @@ -1580,10 +1580,10 @@ sal_Bool OResultSet::OpenImpl() m_nRowCountResult = 0; OSL_ENSURE(m_aAssignValues.is(),"No assign values set!"); - if(!m_pTable->InsertRow(*m_aAssignValues, sal_True,m_xColsIdx)) + if(!m_pTable->InsertRow(*m_aAssignValues, true,m_xColsIdx)) { m_nFilePos = 0; - return sal_False; + return false; } m_nRowCountResult = 1; @@ -1596,7 +1596,7 @@ sal_Bool OResultSet::OpenImpl() // reset FilePos m_nFilePos = 0; - return sal_True; + return true; } Sequence< sal_Int8 > OResultSet::getUnoTunnelImplementationId() @@ -1629,7 +1629,7 @@ void OResultSet::setBoundedColumns(const OValueRefRow& _rRow, const OValueRefRow& _rSelectRow, const ::rtl::Reference<connectivity::OSQLColumns>& _rxColumns, const Reference<XIndexAccess>& _xNames, - sal_Bool _bSetColumnMapping, + bool _bSetColumnMapping, const Reference<XDatabaseMetaData>& _xMetaData, ::std::vector<sal_Int32>& _rColMapping) { @@ -1802,13 +1802,13 @@ void OResultSet::initializeRow(OValueRefRow& _rRow,sal_Int32 _nColumnCount) } } -sal_Bool OResultSet::fillIndexValues(const Reference< XColumnsSupplier> &/*_xIndex*/) +bool OResultSet::fillIndexValues(const Reference< XColumnsSupplier> &/*_xIndex*/) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::fillIndexValues" ); - return sal_False; + return false; } -sal_Bool OResultSet::move(IResultSetHelper::Movement _eCursorPosition, sal_Int32 _nOffset, sal_Bool _bRetrieveData) +bool OResultSet::move(IResultSetHelper::Movement _eCursorPosition, sal_Int32 _nOffset, bool _bRetrieveData) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::move" ); return Move(_eCursorPosition,_nOffset,_bRetrieveData); @@ -1820,13 +1820,13 @@ sal_Int32 OResultSet::getDriverPos() const return (m_aRow->get())[0]->getValue(); } -sal_Bool OResultSet::deletedVisible() const +bool OResultSet::deletedVisible() const { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::deletedVisible" ); return m_bShowDeleted; } -sal_Bool OResultSet::isRowDeleted() const +bool OResultSet::isRowDeleted() const { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::isRowDeleted" ); return m_aRow->isDeleted(); diff --git a/connectivity/source/drivers/file/FStatement.cxx b/connectivity/source/drivers/file/FStatement.cxx index c3c892aeb506..af6936e5aabc 100644 --- a/connectivity/source/drivers/file/FStatement.cxx +++ b/connectivity/source/drivers/file/FStatement.cxx @@ -69,7 +69,7 @@ OStatement_Base::OStatement_Base(OConnection* _pConnection ) ,m_nResultSetType(ResultSetType::FORWARD_ONLY) ,m_nFetchDirection(FetchDirection::FORWARD) ,m_nResultSetConcurrency(ResultSetConcurrency::UPDATABLE) - ,m_bEscapeProcessing(sal_True) + ,m_bEscapeProcessing(true) ,rBHelper(OStatement_BASE::rBHelper) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OStatement_Base::OStatement_Base" ); @@ -474,7 +474,7 @@ void OStatement_Base::createColumnMapping() Reference<XIndexAccess> xNames(m_xColNames,UNO_QUERY); // now check which columns are bound - OResultSet::setBoundedColumns(m_aRow,m_aSelectRow,xColumns,xNames,sal_True,m_xDBMetaData,m_aColMapping); + OResultSet::setBoundedColumns(m_aRow,m_aSelectRow,xColumns,xNames,true,m_xDBMetaData,m_aColMapping); } void OStatement_Base::initializeResultSet(OResultSet* _pResult) @@ -662,7 +662,7 @@ void OStatement_Base::ParseAssignValues(const ::std::vector< OUString>& aColumnN else if (SQL_ISTOKEN(pRow_Value_Constructor_Elem,NULL)) { // set NULL - SetAssignValue(aColumnName, OUString(), sal_True); + SetAssignValue(aColumnName, OUString(), true); } else if (SQL_ISRULE(pRow_Value_Constructor_Elem,parameter)) parseParamterElem(aColumnName,pRow_Value_Constructor_Elem); @@ -674,7 +674,7 @@ void OStatement_Base::ParseAssignValues(const ::std::vector< OUString>& aColumnN void OStatement_Base::SetAssignValue(const OUString& aColumnName, const OUString& aValue, - sal_Bool bSetNull, + bool bSetNull, sal_uInt32 nParameter) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OStatement_Base::SetAssignValue" ); diff --git a/connectivity/source/drivers/file/FTable.cxx b/connectivity/source/drivers/file/FTable.cxx index 712cbc2a1df0..65c388695b32 100644 --- a/connectivity/source/drivers/file/FTable.cxx +++ b/connectivity/source/drivers/file/FTable.cxx @@ -44,7 +44,7 @@ OFileTable::OFileTable(sdbcx::OCollection* _pTables,OConnection* _pConnection) ,m_nFilePos(0) ,m_pBuffer(NULL) ,m_nBufferSize(0) - ,m_bWriteable(sal_False) + ,m_bWriteable(false) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OFileTable::OFileTable" ); construct(); @@ -68,7 +68,7 @@ OFileTable::OFileTable( sdbcx::OCollection* _pTables,OConnection* _pConnection, , m_nFilePos(0) , m_pBuffer(NULL) , m_nBufferSize(0) - , m_bWriteable(sal_False) + , m_bWriteable(false) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OFileTable::OFileTable" ); m_aColumns = new OSQLColumns(); @@ -187,22 +187,22 @@ void SAL_CALL OFileTable::release() throw() OTable_TYPEDEF::release(); } -sal_Bool OFileTable::InsertRow(OValueRefVector& /*rRow*/, sal_Bool /*bFlush*/,const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess>& /*_xCols*/) +bool OFileTable::InsertRow(OValueRefVector& /*rRow*/, bool /*bFlush*/, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess>& /*_xCols*/) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OFileTable::InsertRow" ); - return sal_False; + return false; } -sal_Bool OFileTable::DeleteRow(const OSQLColumns& /*_rCols*/) +bool OFileTable::DeleteRow(const OSQLColumns& /*_rCols*/) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OFileTable::DeleteRow" ); - return sal_False; + return false; } -sal_Bool OFileTable::UpdateRow(OValueRefVector& /*rRow*/, OValueRefRow& /*pOrgRow*/,const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess>& /*_xCols*/) +bool OFileTable::UpdateRow(OValueRefVector& /*rRow*/, OValueRefRow& /*pOrgRow*/,const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess>& /*_xCols*/) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OFileTable::UpdateRow" ); - return sal_False; + return false; } void OFileTable::addColumn(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& /*descriptor*/) diff --git a/connectivity/source/drivers/file/fanalyzer.cxx b/connectivity/source/drivers/file/fanalyzer.cxx index 0e6ff98ac37e..6f3b65b03c17 100644 --- a/connectivity/source/drivers/file/fanalyzer.cxx +++ b/connectivity/source/drivers/file/fanalyzer.cxx @@ -36,8 +36,8 @@ using namespace ::com::sun::star::container; OSQLAnalyzer::OSQLAnalyzer(OConnection* _pConnection) :m_pConnection(_pConnection) - ,m_bHasSelectionCode(sal_False) - ,m_bSelectionFirstTime(sal_True) + ,m_bHasSelectionCode(false) + ,m_bSelectionFirstTime(true) { m_aCompiler = new OPredicateCompiler(this); m_aInterpreter = new OPredicateInterpreter(m_aCompiler); @@ -207,16 +207,16 @@ OOperandAttr* OSQLAnalyzer::createOperandAttr(sal_Int32 _nPos, return new OOperandAttr(static_cast<sal_uInt16>(_nPos),_xCol); } -sal_Bool OSQLAnalyzer::hasRestriction() const +bool OSQLAnalyzer::hasRestriction() const { return m_aCompiler->hasCode(); } -sal_Bool OSQLAnalyzer::hasFunctions() const +bool OSQLAnalyzer::hasFunctions() const { if ( m_bSelectionFirstTime ) { - m_bSelectionFirstTime = sal_False; + m_bSelectionFirstTime = false; for ( ::std::vector< TPredicates >::const_iterator aIter = m_aSelectionEvaluations.begin(); aIter != m_aSelectionEvaluations.end() && !m_bHasSelectionCode ;++aIter) { if ( aIter->first.is() ) diff --git a/connectivity/source/drivers/file/fcode.cxx b/connectivity/source/drivers/file/fcode.cxx index c1d299fc4db2..a3e827e5275e 100644 --- a/connectivity/source/drivers/file/fcode.cxx +++ b/connectivity/source/drivers/file/fcode.cxx @@ -106,9 +106,9 @@ void OOperandValue::setValue(const ORowSetValue& _rVal) m_aValue = _rVal; } -sal_Bool OOperandAttr::isIndexed() const +bool OOperandAttr::isIndexed() const { - return sal_False; + return false; } OOperandParam::OOperandParam(OSQLParseNode* pNode, sal_Int32 _nPos) @@ -192,10 +192,10 @@ OOperandConst::OOperandConst(const OSQLParseNode& rColumnRef, const OUString& aS sal_uInt16 OOperator::getRequestedOperands() const {return 2;} -sal_Bool OBoolOperator::operate(const OOperand*, const OOperand*) const +bool OBoolOperator::operate(const OOperand*, const OOperand*) const { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OBoolOperator::operate" ); - return sal_False; + return false; } @@ -215,7 +215,7 @@ void OBoolOperator::Exec(OCodeStack& rCodeStack) delete pRight; } -sal_Bool OOp_NOT::operate(const OOperand* pLeft, const OOperand* ) const +bool OOp_NOT::operate(const OOperand* pLeft, const OOperand* ) const { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OOp_AND::operate" ); return !pLeft->isValid(); @@ -239,14 +239,14 @@ sal_uInt16 OOp_NOT::getRequestedOperands() const } -sal_Bool OOp_AND::operate(const OOperand* pLeft, const OOperand* pRight) const +bool OOp_AND::operate(const OOperand* pLeft, const OOperand* pRight) const { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OOp_AND::operate" ); return pLeft->isValid() && pRight->isValid(); } -sal_Bool OOp_OR::operate(const OOperand* pLeft, const OOperand* pRight) const +bool OOp_OR::operate(const OOperand* pLeft, const OOperand* pRight) const { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OOp_OR::operate" ); return pLeft->isValid() || pRight->isValid(); @@ -272,28 +272,28 @@ void OOp_ISNULL::Exec(OCodeStack& rCodeStack) } -sal_Bool OOp_ISNULL::operate(const OOperand* pOperand, const OOperand*) const +bool OOp_ISNULL::operate(const OOperand* pOperand, const OOperand*) const { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OOp_ISNULL::operate" ); return pOperand->getValue().isNull(); } -sal_Bool OOp_ISNOTNULL::operate(const OOperand* pOperand, const OOperand*) const +bool OOp_ISNOTNULL::operate(const OOperand* pOperand, const OOperand*) const { return !OOp_ISNULL::operate(pOperand); } -sal_Bool OOp_LIKE::operate(const OOperand* pLeft, const OOperand* pRight) const +bool OOp_LIKE::operate(const OOperand* pLeft, const OOperand* pRight) const { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OOp_ISNULL::operate" ); - sal_Bool bMatch; + bool bMatch; ORowSetValue aLH(pLeft->getValue()); ORowSetValue aRH(pRight->getValue()); if (aLH.isNull() || aRH.isNull()) - bMatch = sal_False; + bMatch = false; else { bMatch = match(aRH.getString(), aLH.getString(), cEscape); @@ -302,23 +302,23 @@ sal_Bool OOp_LIKE::operate(const OOperand* pLeft, const OOperand* pRight) const } -sal_Bool OOp_NOTLIKE::operate(const OOperand* pLeft, const OOperand* pRight) const +bool OOp_NOTLIKE::operate(const OOperand* pLeft, const OOperand* pRight) const { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OOp_NOTLIKE::operate" ); return !OOp_LIKE::operate(pLeft, pRight); } -sal_Bool OOp_COMPARE::operate(const OOperand* pLeft, const OOperand* pRight) const +bool OOp_COMPARE::operate(const OOperand* pLeft, const OOperand* pRight) const { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OOp_COMPARE::operate" ); ORowSetValue aLH(pLeft->getValue()); ORowSetValue aRH(pRight->getValue()); if (aLH.isNull() || aRH.isNull()) // if (!aLH.getValue() || !aRH.getValue()) - return sal_False; + return false; - sal_Bool bResult = sal_False; + bool bResult = false; sal_Int32 eDBType = pLeft->getDBType(); // Comparison (depending on Data-type): @@ -343,7 +343,7 @@ sal_Bool OOp_COMPARE::operate(const OOperand* pLeft, const OOperand* pRight) con case SQLFilterOperator::LESS_EQUAL: bResult = (nRes <= 0); break; case SQLFilterOperator::GREATER: bResult = (nRes > 0); break; case SQLFilterOperator::GREATER_EQUAL: bResult = (nRes >= 0); break; - default: bResult = sal_False; + default: bResult = false; } } break; case DataType::TINYINT: @@ -370,7 +370,7 @@ sal_Bool OOp_COMPARE::operate(const OOperand* pLeft, const OOperand* pRight) con case SQLFilterOperator::LESS_EQUAL: bResult = (n <= m); break; case SQLFilterOperator::GREATER: bResult = (n > m); break; case SQLFilterOperator::GREATER_EQUAL: bResult = (n >= m); break; - default: bResult = sal_False; + default: bResult = false; } } break; default: diff --git a/connectivity/source/drivers/file/fcomp.cxx b/connectivity/source/drivers/file/fcomp.cxx index c7bfcd5b816d..e79b4a93af30 100644 --- a/connectivity/source/drivers/file/fcomp.cxx +++ b/connectivity/source/drivers/file/fcomp.cxx @@ -46,7 +46,7 @@ using namespace com::sun::star; OPredicateCompiler::OPredicateCompiler(OSQLAnalyzer* pAnalyzer)//,OCursor& rCurs) : m_pAnalyzer(pAnalyzer) , m_nParamCounter(0) - , m_bORCondition(sal_False) + , m_bORCondition(false) { } @@ -153,7 +153,7 @@ OOperand* OPredicateCompiler::execute(OSQLParseNode* pPredicateNode) if (SQL_ISTOKEN(pPredicateNode->getChild(1),OR)) // OR-Operator { m_aCodeList.push_back(new OOp_OR()); - m_bORCondition = sal_True; + m_bORCondition = true; } else if (SQL_ISTOKEN(pPredicateNode->getChild(1),AND)) // AND-Operator m_aCodeList.push_back(new OOp_AND()); @@ -335,7 +335,7 @@ OOperand* OPredicateCompiler::execute_BETWEEN(OSQLParseNode* pPredicateNode) thr m_pAnalyzer->getConnection()->throwGenericSQLException(STR_QUERY_INVALID_BETWEEN,NULL); } - sal_Bool bNot = SQL_ISTOKEN(pPart2->getChild(0),NOT); + bool bNot = SQL_ISTOKEN(pPart2->getChild(0),NOT); OOperand* pColumnOp = execute(pColumn); OOperand* pOb1 = execute(p1stValue); @@ -543,13 +543,13 @@ OOperand* OPredicateCompiler::execute_Operand(OSQLParseNode* pPredicateNode) thr } -sal_Bool OPredicateInterpreter::evaluate(OCodeList& rCodeList) +bool OPredicateInterpreter::evaluate(OCodeList& rCodeList) { - static sal_Bool bResult; + static bool bResult; OCodeList::iterator aIter = rCodeList.begin(); if (!(*aIter)) - return sal_True; // no Predicate + return true; // no Predicate for(;aIter != rCodeList.end();++aIter) { @@ -602,7 +602,7 @@ OOperand* OPredicateCompiler::execute_Fold(OSQLParseNode* pPredicateNode) thro { DBG_ASSERT(pPredicateNode->count() >= 4,"OFILECursor: Fehler im Parse Tree"); - sal_Bool bUpper = SQL_ISTOKEN(pPredicateNode->getChild(0),UPPER); + bool bUpper = SQL_ISTOKEN(pPredicateNode->getChild(0),UPPER); execute(pPredicateNode->getChild(2)); OOperator* pOperator = NULL; |