User: kz Date: 2008-05-05 15:19:58+0000 Modified: dba/reportdesign/java/com/sun/star/report/pentaho/parser/rpt/SubDocumentReadHandler.java
Log: INTEGRATION: CWS dba30beta (1.3.6); FILE MERGED 2008/04/22 10:30:31 oj 1.3.6.1: #i88503# merge changes from rptchart02 File Changes: Directory: /dba/reportdesign/java/com/sun/star/report/pentaho/parser/rpt/ ========================================================================= File [changed]: SubDocumentReadHandler.java Url: http://dba.openoffice.org/source/browse/dba/reportdesign/java/com/sun/star/report/pentaho/parser/rpt/SubDocumentReadHandler.java?r1=1.3&r2=1.4 Delta lines: +9 -12 -------------------- --- SubDocumentReadHandler.java 2008-04-10 17:50:43+0000 1.3 +++ SubDocumentReadHandler.java 2008-05-05 15:19:55+0000 1.4 @@ -31,9 +31,9 @@ import com.sun.star.report.pentaho.model.ObjectOleElement; import com.sun.star.report.pentaho.OfficeNamespaces; +import com.sun.star.report.OfficeToken; import com.sun.star.report.pentaho.parser.draw.ObjectOleReadHandler; import com.sun.star.report.pentaho.parser.text.NoCDATATextContentReadHandler; -import org.jfree.report.structure.Element; import org.jfree.report.structure.Section; import org.jfree.xmlns.parser.XmlReadHandler; import org.jfree.xmlns.parser.IgnoreAnyChildReadHandler; @@ -47,7 +47,7 @@ public class SubDocumentReadHandler extends NoCDATATextContentReadHandler { - private ObjectOleElement element = null; + private final ObjectOleElement element; private boolean ignore = false; public SubDocumentReadHandler(final ObjectOleElement element) @@ -63,8 +63,7 @@ public SubDocumentReadHandler(final Section section) { - super(section); - this.element = new ObjectOleElement(); + this(section, new ObjectOleElement()); ignore = true; } @@ -114,8 +113,8 @@ } if (OfficeNamespaces.DRAWING_NS.equals(uri)) { - XmlReadHandler readHandler = null; - if ("object-ole".equals(tagName)) + final XmlReadHandler readHandler; + if (OfficeToken.OBJECT_OLE.equals(tagName)) { readHandler = new ObjectOleReadHandler(element); } @@ -123,6 +122,10 @@ { readHandler = new SubDocumentReadHandler(new Section(), element); } + else + { + readHandler = null; + } if (readHandler != null) { getChildren().add(readHandler); @@ -131,10 +134,4 @@ } return super.getHandlerForChild(uri, tagName, atts); } - - public Element getElement() - { - - return super.getElement(); - } } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
