User: kz Date: 2008-03-05 18:00:59+0000 Modified: dba/reportdesign/source/filter/xml/xmlCell.cxx
Log: INTEGRATION: CWS rptchart01_DEV300 (1.5.20); FILE MERGED 2008/02/13 07:11:53 oj 1.5.20.3: #i85225# impl chart readhandler and oleproducer 2008/01/25 13:56:00 oj 1.5.20.2: #i85225# export master detail different now 2008/01/24 12:39:32 oj 1.5.20.1: #i85225# changes for chart File Changes: Directory: /dba/reportdesign/source/filter/xml/ =============================================== File [changed]: xmlCell.cxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/filter/xml/xmlCell.cxx?r1=1.5&r2=1.6 Delta lines: +7 -12 -------------------- --- xmlCell.cxx 2007-11-20 18:59:41+0000 1.5 +++ xmlCell.cxx 2008-03-05 18:00:56+0000 1.6 @@ -91,12 +91,10 @@ #ifndef RPT_XMLIMAGE_HXX #include "xmlImage.hxx" #endif -#ifndef RPT_XMLSUBDOCUMENT_HXX -#include "xmlSubDocument.hxx" -#endif #ifndef RPT_XMLFIXEDCONTENT_HXX #include "xmlFixedContent.hxx" #endif +#include "xmlSubDocument.hxx" namespace rptxml { @@ -210,11 +208,10 @@ case XML_TOK_SUB_DOCUMENT: { rImport.GetProgressBarHelper()->Increment( PROGRESS_BAR_STEP ); - Reference< XReportDefinition > xControl(xFactor->createInstance(SERVICE_REPORTDEFINITION),uno::UNO_QUERY); - - OSL_ENSURE(xControl.is(),"Could not create ReportDefinition!"); - setComponent(xControl.get()); - if ( xControl.is() ) + if ( !m_bContainsShape ) + m_nCurrentCount = m_pContainer->getSection()->getCount(); + uno::Reference< uno::XInterface> xInt = xFactor->createInstance(SERVICE_FORMATTEDFIELD); + Reference< report::XFormattedField > xControl(xInt,uno::UNO_QUERY); pContext = new OXMLSubDocument( rImport, _nPrefix, _rLocalName,xControl.get(),m_pContainer); } break; @@ -223,6 +220,7 @@ pContext = new OXMLCell( rImport, _nPrefix, _rLocalName,xAttrList ,m_pContainer,this); break; case XML_TOK_CUSTOM_SHAPE: + case XML_TOK_FRAME: { if ( !m_bContainsShape ) m_nCurrentCount = m_pContainer->getSection()->getCount(); @@ -256,9 +254,6 @@ if ( xShape.is() ) m_pContainer->addCell(xShape.get()); } - //m_xComponent.set(,uno::UNO_QUERY); - - //m_pCell->setComponent(m_xComponent); } if ( m_pCell != this && m_sText.getLength() ) { --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
