diff options
| -rw-r--r-- | connectivity/source/drivers/dbase/DIndexIter.cxx | 14 | ||||
| -rw-r--r-- | connectivity/source/drivers/dbase/DResultSet.cxx | 4 |
2 files changed, 9 insertions, 9 deletions
diff --git a/connectivity/source/drivers/dbase/DIndexIter.cxx b/connectivity/source/drivers/dbase/DIndexIter.cxx index efcc7b46df5d..6fd9812c748c 100644 --- a/connectivity/source/drivers/dbase/DIndexIter.cxx +++ b/connectivity/source/drivers/dbase/DIndexIter.cxx @@ -48,7 +48,7 @@ sal_uIntPtr OIndexIterator::Next() //------------------------------------------------------------------ sal_uIntPtr OIndexIterator::Find(sal_Bool bFirst) { - sal_uIntPtr nRes = STRING_NOTFOUND; + sal_uIntPtr nRes = NODE_NOTFOUND; if (bFirst) { @@ -69,7 +69,7 @@ sal_uIntPtr OIndexIterator::Find(sal_Bool bFirst) m_nCurNode = NODE_NOTFOUND; } ONDXKey* pKey = GetNextKey(); - nRes = pKey ? pKey->GetRecord() : STRING_NOTFOUND; + nRes = pKey ? pKey->GetRecord() : NODE_NOTFOUND; } else if (m_pOperator->IsA(TYPE(OOp_ISNOTNULL))) nRes = GetNotNull(bFirst); @@ -196,7 +196,7 @@ sal_uIntPtr OIndexIterator::GetCompare(sal_Bool bFirst) } } - return pKey ? pKey->GetRecord() : STRING_NOTFOUND; + return pKey ? pKey->GetRecord() : NODE_NOTFOUND; } //------------------------------------------------------------------ @@ -216,7 +216,7 @@ sal_uIntPtr OIndexIterator::GetLike(sal_Bool bFirst) ONDXKey* pKey; while ( ( ( pKey = GetNextKey() ) != NULL ) && !m_pOperator->operate(pKey,m_pOperand)) ; - return pKey ? pKey->GetRecord() : STRING_NOTFOUND; + return pKey ? pKey->GetRecord() : NODE_NOTFOUND; } //------------------------------------------------------------------ @@ -238,7 +238,7 @@ sal_uIntPtr OIndexIterator::GetNull(sal_Bool bFirst) pKey = NULL; m_aCurLeaf = NULL; } - return pKey ? pKey->GetRecord() : STRING_NOTFOUND; + return pKey ? pKey->GetRecord() : NODE_NOTFOUND; } //------------------------------------------------------------------ @@ -249,7 +249,7 @@ sal_uIntPtr OIndexIterator::GetNotNull(sal_Bool bFirst) { // go through all NULL values first for (sal_uIntPtr nRec = GetNull(bFirst); - nRec != STRING_NOTFOUND; + nRec != NODE_NOTFOUND; nRec = GetNull(sal_False)) ; pKey = m_aCurLeaf.Is() ? &(*m_aCurLeaf)[m_nCurNode].GetKey() : NULL; @@ -257,7 +257,7 @@ sal_uIntPtr OIndexIterator::GetNotNull(sal_Bool bFirst) else pKey = GetNextKey(); - return pKey ? pKey->GetRecord() : STRING_NOTFOUND; + return pKey ? pKey->GetRecord() : NODE_NOTFOUND; } //------------------------------------------------------------------ diff --git a/connectivity/source/drivers/dbase/DResultSet.cxx b/connectivity/source/drivers/dbase/DResultSet.cxx index dc5ac7d08c00..4df238369842 100644 --- a/connectivity/source/drivers/dbase/DResultSet.cxx +++ b/connectivity/source/drivers/dbase/DResultSet.cxx @@ -170,8 +170,8 @@ sal_Bool ODbaseResultSet::fillIndexValues(const Reference< XColumnsSupplier> &_x if (pIter) { - sal_uInt32 nRec = pIter->First(); - while (nRec != SQL_COLUMN_NOTFOUND) + sal_uIntPtr nRec = pIter->First(); + while (nRec != NODE_NOTFOUND) { if (m_aOrderbyAscending[0]) m_pFileSet->get().push_back(nRec); |