Tag: cws_src680_rptchart01 User: oj Date: 2008-02-19 11:40:43+0000 Modified: dba/reportdesign/java/com/sun/star/report/pentaho/output/OfficeDocumentReportTarget.java dba/reportdesign/java/com/sun/star/report/pentaho/output/text/TextRawReportTarget.java
Log: #i85225# ongoing work File Changes: Directory: /dba/reportdesign/java/com/sun/star/report/pentaho/output/ ===================================================================== File [changed]: OfficeDocumentReportTarget.java Url: http://dba.openoffice.org/source/browse/dba/reportdesign/java/com/sun/star/report/pentaho/output/OfficeDocumentReportTarget.java?r1=1.3.62.3&r2=1.3.62.4 Delta lines: +9 -6 ------------------- --- OfficeDocumentReportTarget.java 2008-02-19 09:22:16+0000 1.3.62.3 +++ OfficeDocumentReportTarget.java 2008-02-19 11:40:40+0000 1.3.62.4 @@ -4,9 +4,9 @@ * * $RCSfile: OfficeDocumentReportTarget.java,v $ * - * $Revision: 1.3.62.3 $ + * $Revision: 1.3.62.4 $ * - * last change: $Author: oj $ $Date: 2008/02/19 09:22:16 $ + * last change: $Author: oj $ $Date: 2008/02/19 11:40:40 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -36,7 +36,6 @@ package com.sun.star.report.pentaho.output; import com.sun.star.report.DataSourceFactory; -import com.sun.star.report.pentaho.output.OleProducer; import java.awt.Image; import java.io.ByteArrayInputStream; import java.io.IOException; @@ -269,6 +268,7 @@ private StyleSheetParserUtil styleSheetParserUtil; private AttributeNameGenerator imageNames; private ImageProducer imageProducer; + private OleProducer oleProducer; private GroupContext groupContext; private static final boolean DEBUG_ELEMENTS = JFreeReportBoot.getInstance().getExtendedConfig().getBoolProperty @@ -280,7 +280,8 @@ final InputRepository inputRepository, final OutputRepository outputRepository, final String target, - final ImageService imageService) + final ImageService imageService, + final DataSourceFactory datasourcefactory) throws ReportProcessingException { super(reportJob, resourceManager, baseResource); @@ -303,6 +304,7 @@ this.imageNames = new AttributeNameGenerator(); this.imageProducer = new ImageProducer(inputRepository, outputRepository, imageService); + this.oleProducer = new OleProducer(inputRepository, outputRepository,imageService,datasourcefactory); try { @@ -1525,7 +1527,8 @@ paragraphProps.setType(type); style.addNode(paragraphProps); } - + return paragraphProps; + } protected void startChartProcessing(final AttributeMap attrs) throws ReportProcessingException { final String classId = (String) attrs.getAttribute(OfficeNamespaces.INTERNAL_NS, "class-id"); Directory: /dba/reportdesign/java/com/sun/star/report/pentaho/output/text/ ========================================================================== File [changed]: TextRawReportTarget.java Url: http://dba.openoffice.org/source/browse/dba/reportdesign/java/com/sun/star/report/pentaho/output/text/TextRawReportTarget.java?r1=1.3.62.3&r2=1.3.62.4 Delta lines: +6 -4 ------------------- --- TextRawReportTarget.java 2008-02-19 09:22:25+0000 1.3.62.3 +++ TextRawReportTarget.java 2008-02-19 11:40:41+0000 1.3.62.4 @@ -4,9 +4,9 @@ * * $RCSfile: TextRawReportTarget.java,v $ * - * $Revision: 1.3.62.3 $ + * $Revision: 1.3.62.4 $ * - * last change: $Author: oj $ $Date: 2008/02/19 09:22:25 $ + * last change: $Author: oj $ $Date: 2008/02/19 11:40:41 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -36,6 +36,7 @@ package com.sun.star.report.pentaho.output.text; +import com.sun.star.report.DataSourceFactory; import java.io.IOException; import java.io.OutputStream; import java.io.OutputStreamWriter; @@ -137,10 +138,11 @@ final InputRepository inputRepository, final OutputRepository outputRepository, final String target, - final ImageService imageService) + final ImageService imageService, + final DataSourceFactory datasourcefactory) throws ReportProcessingException { - super(reportJob, resourceManager, baseResource, inputRepository, outputRepository, target, imageService); + super(reportJob, resourceManager, baseResource, inputRepository, outputRepository, target, imageService,datasourcefactory); activePageContext = new FastStack(); this.sectionNames = new AttributeNameGenerator(); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
