diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-06-16 12:17:59 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-06-16 12:17:59 +0000 |
| commit | ecc3a7ba98cee8737348a3cef3c33054d6833848 (patch) | |
| tree | f7545ad4f797a4fc43fe1dee2ffc4a357e88e87f /reportdesign/java | |
| parent | f585b47cf49bea07d8cafeb135c239dd2733268e (diff) | |
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
Diffstat (limited to 'reportdesign/java')
| -rw-r--r-- | reportdesign/java/com/sun/star/report/pentaho/parser/chart/ChartReadHandler.java | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/reportdesign/java/com/sun/star/report/pentaho/parser/chart/ChartReadHandler.java b/reportdesign/java/com/sun/star/report/pentaho/parser/chart/ChartReadHandler.java index d8eda7bb84d0..f915891837ba 100644 --- a/reportdesign/java/com/sun/star/report/pentaho/parser/chart/ChartReadHandler.java +++ b/reportdesign/java/com/sun/star/report/pentaho/parser/chart/ChartReadHandler.java @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: ChartReadHandler.java,v $ - * $Revision: 1.4 $ + * $Revision: 1.5 $ * * This file is part of OpenOffice.org. * @@ -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 @@ public class ChartReadHandler extends ElementReadHandler 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 @@ public class ChartReadHandler extends ElementReadHandler { 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()); } } |