User: vg      
Date: 2007/01/15 06:30:01

Modified:
   dba/dbaccess/source/core/api/RowSet.cxx

Log:
 INTEGRATION: CWS dba22b (1.151.6); FILE MERGED
 2006/12/13 10:42:50 fs 1.151.6.1: GroupBy doesn't depend on ApplyFilter

File Changes:

Directory: /dba/dbaccess/source/core/api/
=========================================

File [changed]: RowSet.cxx
Url: 
http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/api/RowSet.cxx?r1=1.151&r2=1.152
Delta lines:  +2 -2
-------------------
--- RowSet.cxx  21 Nov 2006 17:15:36 -0000      1.151
+++ RowSet.cxx  15 Jan 2007 14:29:58 -0000      1.152
@@ -2376,8 +2376,6 @@
                        m_xComposer->setFilter(m_aFilter);
                if ( m_aHavingClause.getLength() )
                        m_xComposer->setHavingClause(m_aHavingClause);
-               if ( m_aGroupBy.getLength() )
-                       m_xComposer->setGroup(m_aGroupBy);
        }
 
     if ( m_bIgnoreResult )
@@ -2391,6 +2389,8 @@
 
        if ( m_aOrder.getLength() )
                m_xComposer->setOrder( m_aOrder );
+       if ( m_aGroupBy.getLength() )
+               m_xComposer->setGroup( m_aGroupBy );
 
     if ( !m_xColumns.is() )
     {




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

Reply via email to