diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-03-05 17:00:56 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-03-05 17:00:56 +0000 |
| commit | 1e449d4a0a10943b4103950441e6f59f83e3bece (patch) | |
| tree | 26599ba191947b108ed74ff066f69240fa23073f /reportdesign/source/filter/xml/xmlCell.cxx | |
| parent | 41d5289d84bf497c0949307164ebd404495dfa5c (diff) | |
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
Diffstat (limited to 'reportdesign/source/filter/xml/xmlCell.cxx')
| -rw-r--r-- | reportdesign/source/filter/xml/xmlCell.cxx | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/reportdesign/source/filter/xml/xmlCell.cxx b/reportdesign/source/filter/xml/xmlCell.cxx index 2b838ffea085..bec3ed14671b 100644 --- a/reportdesign/source/filter/xml/xmlCell.cxx +++ b/reportdesign/source/filter/xml/xmlCell.cxx @@ -4,9 +4,9 @@ * * $RCSfile: xmlCell.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: ihi $ $Date: 2007-11-20 18:59:41 $ + * last change: $Author: kz $ $Date: 2008-03-05 18:00:56 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -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,12 +208,11 @@ SvXMLImportContext* OXMLCell::CreateChildContext( 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() ) - pContext = new OXMLSubDocument( rImport, _nPrefix, _rLocalName,xControl.get(),m_pContainer); + 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 @@ SvXMLImportContext* OXMLCell::CreateChildContext( 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 @@ void OXMLCell::EndElement() 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() ) { |