User: hr Date: 2007-08-02 14:34:00+0000 Modified: dba/reportdesign/source/filter/xml/xmlReport.cxx
Log: INTEGRATION: CWS rpt23fix01 (1.2.2); FILE MERGED 2007/07/12 12:59:57 oj 1.2.2.1: #i77832# #i77146# impl group on and interval File Changes: Directory: /dba/reportdesign/source/filter/xml/ =============================================== File [changed]: xmlReport.cxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/filter/xml/xmlReport.cxx?r1=1.2&r2=1.3 Delta lines: +13 -4 -------------------- --- xmlReport.cxx 2007-07-09 11:56:18+0000 1.2 +++ xmlReport.cxx 2007-08-02 14:33:57+0000 1.3 @@ -197,7 +197,7 @@ case XML_TOK_REPORT_FUNCTION: { m_rImport.GetProgressBarHelper()->Increment( PROGRESS_BAR_STEP ); - pContext = new OXMLFunction( m_rImport, nPrefix, rLocalName,xAttrList,m_xComponent.get()); + pContext = new OXMLFunction( m_rImport, nPrefix, rLocalName,xAttrList,m_xComponent.get(),true); } break; case XML_TOK_REPORT_HEADER: @@ -249,6 +249,15 @@ return pContext; } // ----------------------------------------------------------------------------- +void OXMLReport::EndElement() +{ + Reference< XFunctions > xFunctions = m_xComponent->getFunctions(); + const ORptFilter::TGroupFunctionMap& aFunctions = m_rImport.getFunctions(); + ORptFilter::TGroupFunctionMap::const_iterator aIter = aFunctions.begin(); + const ORptFilter::TGroupFunctionMap::const_iterator aEnd = aFunctions.end(); + for (; aIter != aEnd; ++aIter) + xFunctions->insertByIndex(xFunctions->getCount(),uno::makeAny(aIter->second)); +} //---------------------------------------------------------------------------- } // namespace rptxml // ----------------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
