User: rt Date: 2008-06-16 13:18:02+0000 Modified: dba/reportdesign/java/com/sun/star/report/pentaho/parser/chart/ChartReadHandler.java
Log: INTEGRATION: CWS rptchart02 (1.2.4); FILE MERGED 2008/06/11 09:14:47 oj 1.2.4.3: #i90545# import text:p 2008/04/16 06:24:30 oj 1.2.4.2: RESYNC: (1.2-1.3); FILE MERGED 2008/03/12 09:42:53 oj 1.2.4.1: impl chart handling and some code refactoring File Changes: Directory: /dba/reportdesign/java/com/sun/star/report/pentaho/parser/chart/ =========================================================================== File [changed]: ChartReadHandler.java Url: http://dba.openoffice.org/source/browse/dba/reportdesign/java/com/sun/star/report/pentaho/parser/chart/ChartReadHandler.java?r1=1.4&r2=1.5 Delta lines: +9 -1 ------------------- --- ChartReadHandler.java 2008-05-05 14:57:54+0000 1.4 +++ ChartReadHandler.java 2008-06-16 13:17:59+0000 1.5 @@ -29,11 +29,13 @@ ************************************************************************/ package com.sun.star.report.pentaho.parser.chart; +import com.sun.star.report.pentaho.OfficeNamespaces; import java.util.ArrayList; import com.sun.star.report.pentaho.parser.ElementReadHandler; import com.sun.star.report.pentaho.parser.rpt.DetailRootTableReadHandler; import com.sun.star.report.pentaho.parser.rpt.ReportReadHandler; +import com.sun.star.report.pentaho.parser.text.TextContentReadHandler; import java.util.List; import org.jfree.report.structure.Element; import org.jfree.report.structure.Section; @@ -78,6 +80,12 @@ reportHandler.setDetail(detail); return detail; } + else if ("p".equals(tagName) && OfficeNamespaces.TEXT_NS.equals(uri)) + { + final TextContentReadHandler readHandler = new TextContentReadHandler(); + children.add(readHandler); + return readHandler; + } final ChartReadHandler erh = new ChartReadHandler(reportHandler); children.add(erh); return erh; @@ -92,7 +100,7 @@ { for (int i = 0; i < children.size(); i++) { - final ChartReadHandler handler = (ChartReadHandler) children.get(i); + final ElementReadHandler handler = (ElementReadHandler) children.get(i); element.addNode(handler.getElement()); } } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
