Kaydet (Commit) 4283bc18 authored tarafından Noel Grandin's avatar Noel Grandin

convert STRING_NOTFOUND -> NODE_NOTFOUND in connectivity

The code was interchangably using the two anyway.

Change-Id: I4f3fe8f1d699a9725bbcce0138a9d978a1eff28a
üst 268f7ef4
......@@ -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;
}
//------------------------------------------------------------------
......
......@@ -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);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment