Tag: cws_src680_rptchart01 User: oj Date: 2008-02-13 07:11:55+0000 Modified: dba/reportdesign/source/filter/xml/makefile.mk dba/reportdesign/source/filter/xml/xmlCell.cxx dba/reportdesign/source/filter/xml/xmlEnums.hxx dba/reportdesign/source/filter/xml/xmlExport.cxx dba/reportdesign/source/filter/xml/xmlExport.hxx dba/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx dba/reportdesign/source/filter/xml/xmlHelper.cxx dba/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx dba/reportdesign/source/filter/xml/xmlMasterFields.cxx dba/reportdesign/source/filter/xml/xmlMasterFields.hxx dba/reportdesign/source/filter/xml/xmlReport.hxx dba/reportdesign/source/filter/xml/xmlReportElementBase.hxx
Log: #i85225# impl chart readhandler and oleproducer File Changes: Directory: /dba/reportdesign/source/filter/xml/ =============================================== File [changed]: makefile.mk Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/filter/xml/makefile.mk?r1=1.2.70.2&r2=1.2.70.3 Delta lines: +3 -2 ------------------- --- makefile.mk 2008-01-25 13:56:00+0000 1.2.70.2 +++ makefile.mk 2008-02-13 07:11:53+0000 1.2.70.3 @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.2.70.2 $ +# $Revision: 1.2.70.3 $ # -# last change: $Author: oj $ $Date: 2008/01/25 13:56:00 $ +# last change: $Author: oj $ $Date: 2008/02/13 07:11:53 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -69,6 +69,7 @@ $(SLO)$/xmlCell.obj \ $(SLO)$/xmlTable.obj \ $(SLO)$/xmlFixedContent.obj \ + $(SLO)$/xmlSubDocument.obj \ $(SLO)$/xmlservices.obj \ $(SLO)$/xmlImportDocumentHandler.obj \ $(SLO)$/xmlExportDocumentHandler.obj File [changed]: xmlCell.cxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/filter/xml/xmlCell.cxx?r1=1.5.20.2&r2=1.5.20.3 Delta lines: +13 -16 --------------------- --- xmlCell.cxx 2008-01-25 13:56:00+0000 1.5.20.2 +++ xmlCell.cxx 2008-02-13 07:11:53+0000 1.5.20.3 @@ -4,9 +4,9 @@ * * $RCSfile: xmlCell.cxx,v $ * - * $Revision: 1.5.20.2 $ + * $Revision: 1.5.20.3 $ * - * last change: $Author: oj $ $Date: 2008/01/25 13:56:00 $ + * last change: $Author: oj $ $Date: 2008/02/13 07:11:53 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -94,6 +94,7 @@ #ifndef RPT_XMLFIXEDCONTENT_HXX #include "xmlFixedContent.hxx" #endif +#include "xmlSubDocument.hxx" namespace rptxml { @@ -204,17 +205,16 @@ pContext = new OXMLImage( rImport, _nPrefix, _rLocalName,xAttrList,xControl.get(),m_pContainer); } break; - // 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); - //} - //break; + case XML_TOK_SUB_DOCUMENT: + { + rImport.GetProgressBarHelper()->Increment( PROGRESS_BAR_STEP ); + 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; case XML_TOK_P: pContext = new OXMLCell( rImport, _nPrefix, _rLocalName,xAttrList ,m_pContainer,this); @@ -254,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() ) { File [changed]: xmlEnums.hxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/filter/xml/xmlEnums.hxx?r1=1.3.20.2&r2=1.3.20.3 Delta lines: +4 -3 ------------------- --- xmlEnums.hxx 2008-01-25 13:56:00+0000 1.3.20.2 +++ xmlEnums.hxx 2008-02-13 07:11:53+0000 1.3.20.3 @@ -6,9 +6,9 @@ * * $RCSfile: xmlEnums.hxx,v $ * - * $Revision: 1.3.20.2 $ + * $Revision: 1.3.20.3 $ * - * last change: $Author: oj $ $Date: 2008/01/25 13:56:00 $ + * last change: $Author: oj $ $Date: 2008/02/13 07:11:53 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -67,7 +67,8 @@ XML_TOK_REPORT_ELEMENT , XML_TOK_REPORT_MIMETYPE , XML_TOK_REPORT_NAME , - XML_TOK_MASTER_DETAIL_FIELDS + XML_TOK_MASTER_DETAIL_FIELDS , + XML_TOK_SUB_FRAME }; enum XMLGroup { File [changed]: xmlExport.cxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/filter/xml/xmlExport.cxx?r1=1.6.20.2&r2=1.6.20.3 Delta lines: +19 -10 --------------------- --- xmlExport.cxx 2008-01-25 13:56:00+0000 1.6.20.2 +++ xmlExport.cxx 2008-02-13 07:11:53+0000 1.6.20.3 @@ -4,9 +4,9 @@ * * $RCSfile: xmlExport.cxx,v $ * - * $Revision: 1.6.20.2 $ + * $Revision: 1.6.20.3 $ * - * last change: $Author: oj $ $Date: 2008/01/25 13:56:00 $ + * last change: $Author: oj $ $Date: 2008/02/13 07:11:53 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -440,13 +440,13 @@ SvXMLElementExport aFunction(*this,XML_NAMESPACE_REPORT, XML_FUNCTION, sal_True, sal_True); } // ----------------------------------------------------------------------------- -void ORptExport::exportMasterDetailFields(const Reference<XReportDefinition>& _xReportDefinition) +void ORptExport::exportMasterDetailFields(const Reference<XReportComponent>& _xReportComponet) { - const uno::Sequence< ::rtl::OUString> aMasterFields = _xReportDefinition->getMasterFields(); + const uno::Sequence< ::rtl::OUString> aMasterFields = _xReportComponet->getMasterFields(); if ( aMasterFields.getLength() ) { SvXMLElementExport aElement(*this,XML_NAMESPACE_REPORT, XML_MASTER_DETAIL_FIELDS, sal_True, sal_True); - const uno::Sequence< ::rtl::OUString> aDetailFields = _xReportDefinition->getDetailFields(); + const uno::Sequence< ::rtl::OUString> aDetailFields = _xReportComponet->getDetailFields(); OSL_ENSURE(aDetailFields.getLength() == aMasterFields.getLength(),"not equal length for master and detail fields!"); @@ -469,7 +469,7 @@ { exportFunctions(_xReportDefinition->getFunctions().get()); exportGroupsExpressionAsFunction(_xReportDefinition->getGroups()); - exportMasterDetailFields(_xReportDefinition); + exportMasterDetailFields(_xReportDefinition.get()); if ( _xReportDefinition->getReportHeaderOn() ) { @@ -555,7 +555,7 @@ { OSL_ENSURE(_xReportElement.is(),"_xReportElement is NULL -> GPF"); ::rtl::OUString sDataField = convertFormula(_xReportElement->getDataField()); - sal_Int32 nCount = _xReportElement->getCount(); + const sal_Int32 nCount = _xReportElement->getCount(); try { for (sal_Int32 i = 0; i < nCount ; ++i) @@ -585,7 +585,7 @@ if ( !_xReportElement->getPrintRepeatedValues() ) AddAttribute(XML_NAMESPACE_REPORT, XML_PRINT_REPEATED_VALUES,XML_FALSE); - SvXMLElementExport aElem(*this,XML_NAMESPACE_REPORT, XML_REPORT_ELEMENT, sal_False, sal_False); + SvXMLElementExport aElem(*this,XML_NAMESPACE_REPORT, XML_REPORT_ELEMENT, sal_True, sal_True); if ( _xReportElement->getCount() ) { exportFormatConditions(_xReportElement); @@ -595,7 +595,7 @@ if ( sExpr.getLength() ) { exportFormula(XML_FORMULA,sExpr); - SvXMLElementExport aPrintExpr(*this,XML_NAMESPACE_REPORT, XML_CONDITIONAL_PRINT_EXPRESSION, sal_False, sal_False); + SvXMLElementExport aPrintExpr(*this,XML_NAMESPACE_REPORT, XML_CONDITIONAL_PRINT_EXPRESSION, sal_True, sal_True); } // if ( sExpr.getLength() ) // only export when parent exists @@ -1687,17 +1687,26 @@ UniReference< XMLShapeExport > xShapeExport = GetShapeExport(); xShapeExport->seekShapes(_xSection.get()); const sal_Int32 nCount = _xSection->getCount(); - awt::Point aRefPoint; ::std::auto_ptr<SvXMLElementExport> pParagraphContent; if ( _bAddParagraph ) pParagraphContent.reset(new SvXMLElementExport(*this,XML_NAMESPACE_TEXT, XML_P, sal_True, sal_False)); + awt::Point aRefPoint; aRefPoint.X = rptui::getStyleProperty<sal_Int32>(_xSection->getReportDefinition(),PROPERTY_LEFTMARGIN); for (sal_Int32 i = 0; i < nCount; ++i) { uno::Reference< XShape > xShape(_xSection->getByIndex(i),uno::UNO_QUERY); if ( xShape.is() ) { + ::std::auto_ptr<SvXMLElementExport> pSubDocument; + uno::Sequence< ::rtl::OUString> aMasterFields = xShape->getMasterFields(); + if ( aMasterFields.getLength() ) + { + pSubDocument.reset(new SvXMLElementExport(*this,XML_NAMESPACE_REPORT, XML_SUB_DOCUMENT, sal_False, sal_False)); + exportMasterDetailFields(xShape.get()); + exportReportElement(xShape.get()); + } + AddAttribute( XML_NAMESPACE_TEXT, XML_ANCHOR_TYPE, XML_PARAGRAPH ); xShapeExport->exportShape(xShape.get(),SEF_DEFAULT|SEF_EXPORT_NO_WS,&aRefPoint); } File [changed]: xmlExport.hxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/filter/xml/xmlExport.hxx?r1=1.6.24.1&r2=1.6.24.2 Delta lines: +3 -3 ------------------- --- xmlExport.hxx 2008-01-24 12:39:32+0000 1.6.24.1 +++ xmlExport.hxx 2008-02-13 07:11:53+0000 1.6.24.2 @@ -6,9 +6,9 @@ * * $RCSfile: xmlExport.hxx,v $ * - * $Revision: 1.6.24.1 $ + * $Revision: 1.6.24.2 $ * - * last change: $Author: oj $ $Date: 2008/01/24 12:39:32 $ + * last change: $Author: oj $ $Date: 2008/02/13 07:11:53 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -209,7 +209,7 @@ void exportReportAttributes(const Reference<XReportDefinition>& _xReport); void exportFunctions(const Reference<XIndexAccess>& _xFunctions); /// <ref name="rpt-function"/> void exportFunction(const Reference< XFunction>& _xFunction); - void exportMasterDetailFields(const Reference<XReportDefinition>& _xReportDefinition); + void exportMasterDetailFields(const Reference<XReportComponent>& _xReportComponet); void exportComponent(const Reference<XReportComponent>& _xReportComponent); void exportImagePosition(sal_Int16 _nImagePosition); sal_Bool exportGroup(const Reference<XReportDefinition>& _xReportDefinition,sal_Int32 _nPos,sal_Bool _bExportAutoStyle = sal_False); File [changed]: xmlExportDocumentHandler.cxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx?r1=1.1.2.4&r2=1.1.2.5 Delta lines: +5 -4 ------------------- --- xmlExportDocumentHandler.cxx 2008-01-31 10:51:24+0000 1.1.2.4 +++ xmlExportDocumentHandler.cxx 2008-02-13 07:11:53+0000 1.1.2.5 @@ -4,9 +4,9 @@ * * $RCSfile: xmlExportDocumentHandler.cxx,v $ * - * $Revision: 1.1.2.4 $ + * $Revision: 1.1.2.5 $ * - * last change: $Author: oj $ $Date: 2008/01/31 10:51:24 $ + * last change: $Author: oj $ $Date: 2008/02/13 07:11:53 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -48,6 +48,7 @@ #include <svtools/saveopt.hxx> #include <rtl/ustrbuf.hxx> #include <connectivity/dbtools.hxx> +#include <rtl/ustrbuf.hxx> namespace rptxml { File [changed]: xmlHelper.cxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/filter/xml/xmlHelper.cxx?r1=1.4.62.2&r2=1.4.62.3 Delta lines: +3 -2 ------------------- --- xmlHelper.cxx 2008-01-25 13:56:00+0000 1.4.62.2 +++ xmlHelper.cxx 2008-02-13 07:11:53+0000 1.4.62.3 @@ -4,9 +4,9 @@ * * $RCSfile: xmlHelper.cxx,v $ * - * $Revision: 1.4.62.2 $ + * $Revision: 1.4.62.3 $ * - * last change: $Author: oj $ $Date: 2008/01/25 13:56:00 $ + * last change: $Author: oj $ $Date: 2008/02/13 07:11:53 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -508,6 +508,7 @@ { XML_NAMESPACE_OFFICE, XML_MIMETYPE, XML_TOK_REPORT_MIMETYPE }, { XML_NAMESPACE_DRAW, XML_NAME, XML_TOK_REPORT_NAME }, { XML_NAMESPACE_REPORT, XML_MASTER_DETAIL_FIELDS, XML_TOK_MASTER_DETAIL_FIELDS }, + { XML_NAMESPACE_DRAW, XML_FRAME, XML_TOK_SUB_FRAME }, XML_TOKEN_MAP_END }; return new SvXMLTokenMap( aElemTokenMap ); File [changed]: xmlImportDocumentHandler.cxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx?r1=1.1.2.2&r2=1.1.2.3 Delta lines: +4 -3 ------------------- --- xmlImportDocumentHandler.cxx 2008-01-25 13:56:00+0000 1.1.2.2 +++ xmlImportDocumentHandler.cxx 2008-02-13 07:11:53+0000 1.1.2.3 @@ -4,9 +4,9 @@ * * $RCSfile: xmlImportDocumentHandler.cxx,v $ * - * $Revision: 1.1.2.2 $ + * $Revision: 1.1.2.3 $ * - * last change: $Author: oj $ $Date: 2008/01/25 13:56:00 $ + * last change: $Author: oj $ $Date: 2008/02/13 07:11:53 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -333,3 +333,4 @@ // ----------------------------------------------------------------------------- } // namespace rptxml // ----------------------------------------------------------------------------- \ No newline at end of file + File [changed]: xmlMasterFields.cxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/filter/xml/xmlMasterFields.cxx?r1=1.4.20.1&r2=1.4.20.2 Delta lines: +3 -3 ------------------- --- xmlMasterFields.cxx 2008-01-25 13:56:00+0000 1.4.20.1 +++ xmlMasterFields.cxx 2008-02-13 07:11:53+0000 1.4.20.2 @@ -4,9 +4,9 @@ * * $RCSfile: xmlMasterFields.cxx,v $ * - * $Revision: 1.4.20.1 $ + * $Revision: 1.4.20.2 $ * - * last change: $Author: oj $ $Date: 2008/01/25 13:56:00 $ + * last change: $Author: oj $ $Date: 2008/02/13 07:11:53 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -69,7 +69,7 @@ OXMLMasterFields::OXMLMasterFields( ORptFilter& rImport, sal_uInt16 nPrfx, const ::rtl::OUString& rLName, const Reference< XAttributeList > & _xAttrList - ,OXMLReport* _pReport + ,IMasterDetailFieds* _pReport ) : SvXMLImportContext( rImport, nPrfx, rLName) ,m_pReport(_pReport) File [changed]: xmlMasterFields.hxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/filter/xml/xmlMasterFields.hxx?r1=1.2.70.1&r2=1.2.70.2 Delta lines: +5 -5 ------------------- --- xmlMasterFields.hxx 2008-01-25 13:56:00+0000 1.2.70.1 +++ xmlMasterFields.hxx 2008-02-13 07:11:53+0000 1.2.70.2 @@ -6,9 +6,9 @@ * * $RCSfile: xmlMasterFields.hxx,v $ * - * $Revision: 1.2.70.1 $ + * $Revision: 1.2.70.2 $ * - * last change: $Author: oj $ $Date: 2008/01/25 13:56:00 $ + * last change: $Author: oj $ $Date: 2008/02/13 07:11:53 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -41,10 +41,10 @@ namespace rptxml { class ORptFilter; - class OXMLReport; + class IMasterDetailFieds; class OXMLMasterFields : public SvXMLImportContext { - OXMLReport* m_pReport; + IMasterDetailFieds* m_pReport; OXMLMasterFields(const OXMLMasterFields&); void operator =(const OXMLMasterFields&); public: @@ -52,7 +52,7 @@ OXMLMasterFields( ORptFilter& rImport, sal_uInt16 nPrfx, const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList - ,OXMLReport* _pReport); + ,IMasterDetailFieds* _pReport); virtual ~OXMLMasterFields(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, File [changed]: xmlReport.hxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/filter/xml/xmlReport.hxx?r1=1.3.62.1&r2=1.3.62.2 Delta lines: +4 -4 ------------------- --- xmlReport.hxx 2008-01-25 13:56:00+0000 1.3.62.1 +++ xmlReport.hxx 2008-02-13 07:11:53+0000 1.3.62.2 @@ -6,9 +6,9 @@ * * $RCSfile: xmlReport.hxx,v $ * - * $Revision: 1.3.62.1 $ + * $Revision: 1.3.62.2 $ * - * last change: $Author: oj $ $Date: 2008/01/25 13:56:00 $ + * last change: $Author: oj $ $Date: 2008/02/13 07:11:53 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -43,7 +43,7 @@ namespace rptxml { class ORptFilter; - class OXMLReport : public OXMLReportElementBase + class OXMLReport : public OXMLReportElementBase, public IMasterDetailFieds { ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportDefinition > m_xComponent; ::std::vector< ::rtl::OUString> m_aMasterFields; @@ -65,7 +65,7 @@ virtual void EndElement(); - void addMasterDetailPair(const ::std::pair< ::rtl::OUString,::rtl::OUString >& _aPair); + virtual void addMasterDetailPair(const ::std::pair< ::rtl::OUString,::rtl::OUString >& _aPair); private: /** initializes our object's properties whose runtime (API) default is different from the file File [changed]: xmlReportElementBase.hxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/filter/xml/xmlReportElementBase.hxx?r1=1.2&r2=1.2.70.1 Delta lines: +10 -3 -------------------- --- xmlReportElementBase.hxx 2007-07-09 11:56:18+0000 1.2 +++ xmlReportElementBase.hxx 2008-02-13 07:11:53+0000 1.2.70.1 @@ -6,9 +6,9 @@ * * $RCSfile: xmlReportElementBase.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.2.70.1 $ * - * last change: $Author: rt $ $Date: 2007/07/09 11:56:18 $ + * last change: $Author: oj $ $Date: 2008/02/13 07:11:53 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -41,12 +41,19 @@ #ifndef _COM_SUN_STAR_REPORT_XREPORTCOMPONENT_HPP_ #include <com/sun/star/report/XReportComponent.hpp> #endif - +#include <vector> namespace rptxml { class ORptFilter; class OXMLTable; + + class SAL_NO_VTABLE IMasterDetailFieds + { + public: + virtual void addMasterDetailPair(const ::std::pair< ::rtl::OUString,::rtl::OUString >& _aPair) = 0; + }; + class OXMLReportElementBase : public SvXMLImportContext { OXMLReportElementBase(const OXMLReportElementBase&); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
