User: hr Date: 06/06/19 18:20:26 Modified: /dba/connectivity/source/drivers/dbase/ DIndexIter.cxx
Log: INTEGRATION: CWS warnings01 (1.6.28); FILE MERGED 2005/12/22 11:44:40 fs 1.6.28.1: #i57457# warning-free code File Changes: Directory: /dba/connectivity/source/drivers/dbase/ ================================================== File [changed]: DIndexIter.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/dbase/DIndexIter.cxx?r1=1.6&r2=1.7 Delta lines: +10 -9 -------------------- --- DIndexIter.cxx 8 Sep 2005 05:38:39 -0000 1.6 +++ DIndexIter.cxx 20 Jun 2006 01:20:24 -0000 1.7 @@ -181,21 +181,22 @@ switch (ePredicateType) { case SQLFilterOperator::NOT_EQUAL: - while ((pKey = GetNextKey()) && !m_pOperator->operate(pKey,m_pOperand)); + while ( ( ( pKey = GetNextKey() ) != NULL ) && !m_pOperator->operate(pKey,m_pOperand)); break; case SQLFilterOperator::LESS: - while ((pKey = GetNextKey()) && pKey->getValue().isNull()); + while ( ( ( pKey = GetNextKey() ) != NULL ) && pKey->getValue().isNull()); break; case SQLFilterOperator::LESS_EQUAL: - while (pKey = GetNextKey()); + while ( ( pKey = GetNextKey() ) != NULL ); break; case SQLFilterOperator::GREATER_EQUAL: case SQLFilterOperator::EQUAL: pKey = GetFirstKey(m_aRoot,*m_pOperand); break; case SQLFilterOperator::GREATER: - if (!(pKey = GetFirstKey(m_aRoot,*m_pOperand))) - while ((pKey = GetNextKey()) && !m_pOperator->operate(pKey,m_pOperand)); + pKey = GetFirstKey(m_aRoot,*m_pOperand); + if ( !pKey ) + while ( ( ( pKey = GetNextKey() ) != NULL ) && !m_pOperator->operate(pKey,m_pOperand)); } } else @@ -203,13 +204,13 @@ switch (ePredicateType) { case SQLFilterOperator::NOT_EQUAL: - while ((pKey = GetNextKey()) && !m_pOperator->operate(pKey,m_pOperand)) + while ( ( ( pKey = GetNextKey() ) != NULL ) && !m_pOperator->operate(pKey,m_pOperand)) ; break; case SQLFilterOperator::LESS: case SQLFilterOperator::LESS_EQUAL: case SQLFilterOperator::EQUAL: - if (!(pKey = GetNextKey()) || !m_pOperator->operate(pKey,m_pOperand)) + if ( ( ( pKey = GetNextKey() ) == NULL ) || !m_pOperator->operate(pKey,m_pOperand)) { pKey = NULL; m_aCurLeaf = NULL; @@ -240,7 +241,7 @@ } ONDXKey* pKey; - while ((pKey = GetNextKey()) && !m_pOperator->operate(pKey,m_pOperand)) + while ( ( ( pKey = GetNextKey() ) != NULL ) && !m_pOperator->operate(pKey,m_pOperand)) ; return pKey ? pKey->GetRecord() : STRING_NOTFOUND; } @@ -260,7 +261,7 @@ } ONDXKey* pKey; - if (!(pKey = GetNextKey()) || !pKey->getValue().isNull()) + if ( ( ( pKey = GetNextKey() ) == NULL ) || !pKey->getValue().isNull()) { pKey = NULL; m_aCurLeaf = NULL; --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
