summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--dbaccess/source/ui/querydesign/QueryDesignView.cxx6
1 files changed, 4 insertions, 2 deletions
diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
index 8acc4115413f..032ca0dfdcce 100644
--- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
@@ -1305,10 +1305,12 @@ namespace
{
bool bRet = true;
::connectivity::OSQLParseNode* pFirstColumnRef = _pFirstColumnRef;
- for (int i = 0; i < 3 && bRet; i+=2)
+ for (size_t i = 0; bRet && i < _pCondition->count() && bRet; ++i)
{
const ::connectivity::OSQLParseNode* pChild = _pCondition->getChild(i);
- if ( SQL_ISRULE(pChild,search_condition) )
+ if ( pChild->isToken() )
+ continue;
+ else if ( SQL_ISRULE(pChild,search_condition) )
bRet = CheckOrCriteria(pChild,pFirstColumnRef);
else
{