Tag: cws_dev300_dba30c
User: oj      
Date: 2008-05-14 11:00:02+0000
Modified:
   dba/dbaccess/source/ui/querydesign/QueryDesignView.cxx

Log:
 #i83154# check if we are in having clause

File Changes:

Directory: /dba/dbaccess/source/ui/querydesign/
===============================================

File [changed]: QueryDesignView.cxx
Url: 
http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/querydesign/QueryDesignView.cxx?r1=1.92&r2=1.92.2.1
Delta lines:  +10 -2
--------------------
--- QueryDesignView.cxx 2008-05-05 16:05:19+0000        1.92
+++ QueryDesignView.cxx 2008-05-14 11:00:00+0000        1.92.2.1
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: QueryDesignView.cxx,v $
- * $Revision: 1.92 $
+ * $Revision: 1.92.2.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -1533,8 +1533,12 @@
 
                                OTableFieldDescRef aDragLeft = new 
OTableFieldDesc();
                                if ( eOk == ( eErrorCode = 
FillDragInfo(_pView,pValueExp,aDragLeft) ))
+                {
+                    if ( bHaving )
+                                           aDragLeft->SetGroupBy(sal_True);
                                        _pSelectionBrw->AddCondition(aDragLeft, 
aCondition, nLevel,bAddOrOnOneLine);
                        }
+                       }
             else if(SQL_ISRULEOR2(pValueExp,general_set_fct ,set_fct_spec)     
        ||
                                                        
SQL_ISRULEOR2(pValueExp,position_exp,extract_exp)       ||
                                                        
SQL_ISRULEOR2(pValueExp,fold,char_substring_fct)        ||
@@ -1572,9 +1576,13 @@
                                ::rtl::OUString sCondition = 
ParseCondition(pController,pCondition,sDecimal,aLocale,1);
                                OTableFieldDescRef      aDragLeft = new 
OTableFieldDesc();
                                if ( eOk == ( eErrorCode = 
FillDragInfo(_pView,pCondition->getChild(0),aDragLeft)) )
+                {
+                    if ( bHaving )
+                                           aDragLeft->SetGroupBy(sal_True);
                                        _pSelectionBrw->AddCondition(aDragLeft, 
sCondition, nLevel,bAddOrOnOneLine);
                        }
                }
+               }
                else if( SQL_ISRULEOR2(pCondition,existence_test,unique_test) )
                {
                        




---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to