From 50e6e5c6436a6f88b88c96b52200187e7c55b482 Mon Sep 17 00:00:00 2001 From: Jens-Heiner Rechtien Date: Wed, 26 Sep 2007 13:52:43 +0000 Subject: [PATCH] INTEGRATION: CWS dba24a (1.86.36); FILE MERGED 2007/08/06 07:25:37 oj 1.86.36.1: #i70081# impl datediff --- dbaccess/source/ui/querydesign/QueryDesignView.cxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx b/dbaccess/source/ui/querydesign/QueryDesignView.cxx index af55406a4b42..5fb694b838b5 100644 --- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx +++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx @@ -4,9 +4,9 @@ * * $RCSfile: QueryDesignView.cxx,v $ * - * $Revision: 1.86 $ + * $Revision: 1.87 $ * - * last change: $Author: kz $ $Date: 2007-05-10 10:38:14 $ + * last change: $Author: hr $ $Date: 2007-09-26 14:52:43 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -2902,7 +2902,7 @@ OSQLParseNode* OQueryDesignView::getPredicateTreeFromEntry(OTableFieldDescRef pE String sFunction; if ( pEntry->isNumericOrAggreateFunction() ) sFunction = pEntry->GetFunction(); - else + if ( !sFunction.Len() ) sFunction = pEntry->GetField(); if(sFunction.GetTokenCount('(') > 1)