User: kz Date: 2008-03-05 18:04:17+0000 Modified: dba/reportdesign/source/filter/xml/xmlMasterFields.cxx
Log: INTEGRATION: CWS rptchart01_DEV300 (1.4.20); FILE MERGED 2008/02/13 07:11:53 oj 1.4.20.2: #i85225# impl chart readhandler and oleproducer 2008/01/25 13:56:00 oj 1.4.20.1: #i85225# export master detail different now File Changes: Directory: /dba/reportdesign/source/filter/xml/ =============================================== File [changed]: xmlMasterFields.cxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/filter/xml/xmlMasterFields.cxx?r1=1.4&r2=1.5 Delta lines: +5 -7 ------------------- --- xmlMasterFields.cxx 2007-11-20 19:02:50+0000 1.4 +++ xmlMasterFields.cxx 2008-03-05 18:04:14+0000 1.5 @@ -52,9 +52,7 @@ #ifndef RPT_XMLENUMS_HXX #include "xmlEnums.hxx" #endif -#ifndef RPT_XMLSUBDOCUMENT_HXX -#include "xmlSubDocument.hxx" -#endif +#include "xmlReport.hxx" #ifndef _TOOLS_DEBUG_HXX #include <tools/debug.hxx> #endif @@ -71,10 +69,10 @@ OXMLMasterFields::OXMLMasterFields( ORptFilter& rImport, sal_uInt16 nPrfx, const ::rtl::OUString& rLName, const Reference< XAttributeList > & _xAttrList - ,OXMLSubDocument* _pSubDocument + ,IMasterDetailFieds* _pReport ) : SvXMLImportContext( rImport, nPrfx, rLName) -,m_pSubDocument(_pSubDocument) +,m_pReport(_pReport) { DBG_CTOR( rpt_OXMLMasterFields,NULL); @@ -104,7 +102,7 @@ } if ( !sDetailField.getLength() ) sDetailField = sMasterField; - m_pSubDocument->addFieldPair(::std::pair< ::rtl::OUString,::rtl::OUString >(sMasterField,sDetailField)); + m_pReport->addMasterDetailPair(::std::pair< ::rtl::OUString,::rtl::OUString >(sMasterField,sDetailField)); } // ----------------------------------------------------------------------------- @@ -127,7 +125,7 @@ case XML_TOK_MASTER_DETAIL_FIELD: { GetImport().GetProgressBarHelper()->Increment( PROGRESS_BAR_STEP ); - pContext = new OXMLMasterFields(static_cast<ORptFilter&>(GetImport()), _nPrefix, _rLocalName,xAttrList ,m_pSubDocument); + pContext = new OXMLMasterFields(static_cast<ORptFilter&>(GetImport()), _nPrefix, _rLocalName,xAttrList ,m_pReport); } break; default: --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
