User: rt Date: 2008-06-06 14:13:11+0000 Modified: dba/dbaccess/source/ui/querydesign/QueryDesignView.cxx
Log: INTEGRATION: CWS dba30c (1.92.2); FILE MERGED 2008/05/14 11:00:00 oj 1.92.2.1: #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.93 Delta lines: +8 -0 ------------------- --- QueryDesignView.cxx 2008-05-05 16:05:19+0000 1.92 +++ QueryDesignView.cxx 2008-06-06 14:13:08+0000 1.93 @@ -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]
