User: hr      
Date: 2007-08-02 14:30:31+0000
Modified:
   dba/reportdesign/source/core/api/ReportEngineJFree.cxx

Log:
 INTEGRATION: CWS rpt23fix01 (1.2.2); FILE MERGED
 2007/07/18 09:34:30 lla 1.2.2.1: #i79744# empty group header has blocked 
execute because of empty 'order by' statement

File Changes:

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

File [changed]: ReportEngineJFree.cxx
Url: 
http://dba.openoffice.org/source/browse/dba/reportdesign/source/core/api/ReportEngineJFree.cxx?r1=1.2&r2=1.3
Delta lines:  +9 -6
-------------------
--- ReportEngineJFree.cxx       2007-07-09 11:56:14+0000        1.2
+++ ReportEngineJFree.cxx       2007-08-02 14:30:29+0000        1.3
@@ -288,8 +288,10 @@
                     
xRowSetProp->setPropertyValue(PROPERTY_ACTIVECONNECTION,uno::makeAny(m_xActiveConnection));
 
                     ::rtl::OUString sOrder = getOrderStatement();
+                                       if (sOrder.getLength() > 0)
+                                       {
                     
xRowSetProp->setPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Order")),uno::makeAny(sOrder));
-
+                                       }
                     if ( m_xReport->getFilter().getLength() )
                         
xRowSetProp->setPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ApplyFilter")),uno::makeAny(sal_True));
 
@@ -492,6 +494,7 @@
         if ( xColumns->hasByName(sExpression) )
             sExpression = ::dbtools::quoteName( sQuote, sExpression );
         aOrder.append( sExpression );
+        if (aOrder.getLength() > 0) 
         aOrder.appendAscii( " " );
         if ( !xGroup->getSortAscending() )
             aOrder.appendAscii( "DESC" );




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

Reply via email to