User: kz Date: 2008-03-05 17:48:43+0000 Modified: dba/reportdesign/java/com/sun/star/report/pentaho/parser/text/NoCDATATextContentReadHandler.java
Log: INTEGRATION: CWS rptchart01_DEV300 (1.2.62); FILE MERGED 2008/02/20 10:52:58 oj 1.2.62.2: format changes 2008/02/13 07:04:23 oj 1.2.62.1: #i85225# impl chart readhandler and oleproducer File Changes: Directory: /dba/reportdesign/java/com/sun/star/report/pentaho/parser/text/ ========================================================================== File [changed]: NoCDATATextContentReadHandler.java Url: http://dba.openoffice.org/source/browse/dba/reportdesign/java/com/sun/star/report/pentaho/parser/text/NoCDATATextContentReadHandler.java?r1=1.2&r2=1.3 Delta lines: +134 -125 ----------------------- --- NoCDATATextContentReadHandler.java 2007-08-03 09:51:55+0000 1.2 +++ NoCDATATextContentReadHandler.java 2008-03-05 17:48:40+0000 1.3 @@ -1,7 +1,6 @@ /* * Copyright (c) 2007, Your Corporation. All Rights Reserved. */ - package com.sun.star.report.pentaho.parser.text; import java.util.ArrayList; @@ -11,6 +10,7 @@ import com.sun.star.report.pentaho.parser.rpt.FormattedTextReadHandler; import com.sun.star.report.pentaho.parser.rpt.ImageReadHandler; import com.sun.star.report.pentaho.OfficeNamespaces; +import com.sun.star.report.pentaho.parser.rpt.SubDocumentReadHandler; import org.jfree.report.structure.Section; import org.jfree.report.structure.Element; import org.jfree.report.structure.StaticText; @@ -26,6 +26,7 @@ */ public class NoCDATATextContentReadHandler extends ElementReadHandler { + private Section section; private ArrayList children; private boolean copyType; @@ -40,7 +41,7 @@ public NoCDATATextContentReadHandler(final Section section) { - this (section, false); + this(section, false); } public NoCDATATextContentReadHandler() @@ -48,7 +49,6 @@ this(new Section(), true); } - /** * Starts parsing. * @@ -101,12 +101,22 @@ } if ("sub-document".equals(tagName)) { - return null; + final SubDocumentReadHandler subDocReadHandler = new SubDocumentReadHandler(section); + // children.add(subDocReadHandler); + return subDocReadHandler; } } if (OfficeNamespaces.DRAWING_NS.equals(uri)) { - final NoCDATATextContentReadHandler readHandler = new NoCDATATextContentReadHandler(); + XmlReadHandler readHandler = null; + if ("image".equals(tagName)) + { + readHandler = new ImageReadHandler(); + } + else + { + readHandler = new NoCDATATextContentReadHandler(); + } children.add(readHandler); return readHandler; } @@ -145,7 +155,6 @@ } } - public Element getElement() { return section; --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
