User: kz Date: 2008-03-05 18:04:47+0000 Modified: dba/reportdesign/source/filter/xml/xmlReport.cxx
Log: INTEGRATION: CWS rptchart01_DEV300 (1.5.20); FILE MERGED 2008/01/25 13:56:00 oj 1.5.20.1: #i85225# export master detail different now 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.5&r2=1.6 Delta lines: +16 -0 -------------------- --- xmlReport.cxx 2007-11-20 19:03:08+0000 1.5 +++ xmlReport.cxx 2008-03-05 18:04:45+0000 1.6 @@ -73,6 +73,7 @@ #ifndef _COM_SUN_STAR_SDB_COMMANDTYPE_HPP_ #include <com/sun/star/sdb/CommandType.hpp> #endif +#include "xmlMasterFields.hxx" namespace rptxml { @@ -202,6 +203,10 @@ pContext = new OXMLFunction( m_rImport, nPrefix, rLocalName,xAttrList,m_xComponent.get(),true); } break; + case XML_TOK_MASTER_DETAIL_FIELDS: + m_rImport.GetProgressBarHelper()->Increment( PROGRESS_BAR_STEP ); + pContext = new OXMLMasterFields(m_rImport, nPrefix, rLocalName,xAttrList ,this); + break; case XML_TOK_REPORT_HEADER: { m_rImport.GetProgressBarHelper()->Increment( PROGRESS_BAR_STEP ); @@ -259,6 +264,17 @@ const ORptFilter::TGroupFunctionMap::const_iterator aEnd = aFunctions.end(); for (; aIter != aEnd; ++aIter) xFunctions->insertByIndex(xFunctions->getCount(),uno::makeAny(aIter->second)); + + if ( !m_aMasterFields.empty() ) + m_xComponent->setMasterFields(Sequence< ::rtl::OUString>(&*m_aMasterFields.begin(),m_aMasterFields.size())); + if ( !m_aDetailFields.empty() ) + m_xComponent->setDetailFields(Sequence< ::rtl::OUString>(&*m_aDetailFields.begin(),m_aDetailFields.size())); +} +// ----------------------------------------------------------------------------- +void OXMLReport::addMasterDetailPair(const ::std::pair< ::rtl::OUString,::rtl::OUString >& _aPair) +{ + m_aMasterFields.push_back(_aPair.first); + m_aDetailFields.push_back(_aPair.second); } //---------------------------------------------------------------------------- } // namespace rptxml --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
