diff options
| author | Ocke Janssen <oj@openoffice.org> | 2011-03-04 07:53:39 +0100 |
|---|---|---|
| committer | Ocke Janssen <oj@openoffice.org> | 2011-03-04 07:53:39 +0100 |
| commit | 221cca20be4a9c79bb4373f632eec833651c0ecf (patch) | |
| tree | b6baabfec2766a263aec8e419d6922de9271b6a5 /connectivity/source/drivers/file/fcomp.cxx | |
| parent | 4fba42e5f98fcc0fa9addf41a793c1d7f11602c8 (diff) | |
| parent | 968263e4c26dd510afbf998cbaf970de92615691 (diff) | |
Automated merge with file:///d:\tools\master\ooo
Diffstat (limited to 'connectivity/source/drivers/file/fcomp.cxx')
| -rw-r--r-- | connectivity/source/drivers/file/fcomp.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/connectivity/source/drivers/file/fcomp.cxx b/connectivity/source/drivers/file/fcomp.cxx index 4ea918ef3e27..9a303d1f1d27 100644 --- a/connectivity/source/drivers/file/fcomp.cxx +++ b/connectivity/source/drivers/file/fcomp.cxx @@ -99,7 +99,7 @@ void OPredicateCompiler::start(OSQLParseNode* pSQLParseNode) OSQLParseNode * pTableExp = pSQLParseNode->getChild(3); DBG_ASSERT(pTableExp != NULL,"Fehler im Parse Tree"); DBG_ASSERT(SQL_ISRULE(pTableExp,table_exp)," Fehler im Parse Tree"); - DBG_ASSERT(pTableExp->count() == 5,"Fehler im Parse Tree"); + DBG_ASSERT(pTableExp->count() == TABLE_EXPRESSION_CHILD_COUNT,"Fehler im Parse Tree"); // check that we don't use anything other than count(*) as function OSQLParseNode* pSelection = pSQLParseNode->getChild(2); @@ -117,7 +117,7 @@ void OPredicateCompiler::start(OSQLParseNode* pSQLParseNode) pWhereClause = pTableExp->getChild(1); - pOrderbyClause = pTableExp->getChild(4); + pOrderbyClause = pTableExp->getChild(ORDER_BY_CHILD_POS); } else if (SQL_ISRULE(pSQLParseNode,update_statement_searched)) { |