[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - dbaccess/source

Tue Mar 3 01:07:08 PST 2015

dbaccess/source/ui/querydesign/QueryDesignView.cxx |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 1ce2461ab77f2ad28671ac1542509bbb16a155ef
Author: Lionel Elie Mamane <lionel at mamane.lu>
Date:   Wed Jan 28 21:09:42 2015 +0100

    not all OrCriteria have three children
    
    and some contain a column in the second child
    
    Change-Id: Ifd69758336233ed0233120b3315d4f33655fa994
    Reviewed-on: https://gerrit.libreoffice.org/14719
    Tested-by: David Tardon <dtardon at redhat.com>
    Reviewed-by: David Tardon <dtardon at redhat.com>

diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
index 880cafc..7f6a1b1 100644
--- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
@@ -1304,9 +1304,11 @@ namespace
     {
         bool bRet = true;
         ::connectivity::OSQLParseNode* pFirstColumnRef = _pFirstColumnRef;
-        for (int i = 0; i < 3 && bRet; i+=2)
+        for (size_t i = 0; i < _pCondition->count() && bRet; ++i)
         {
             const  ::connectivity::OSQLParseNode* pChild = _pCondition->getChild(i);
+            if ( pChild->isToken() )
+                continue;
             if ( SQL_ISRULE(pChild,search_condition) )
                 bRet = CheckOrCriteria(pChild,pFirstColumnRef);
             else
