Tag: mws_bea300 User: obo Date: 2008-04-28 15:30:20+0000 Modified: dba/reportdesign/java/com/sun/star/report/pentaho/parser/rpt/FixedContentReadHandler.java
Log: INTEGRATION: CWS dba30beta_BEA300 (1.4.6); FILE MERGED 2008/04/22 10:30:30 oj 1.4.6.1: #i88503# merge changes from rptchart02 File Changes: Directory: /dba/reportdesign/java/com/sun/star/report/pentaho/parser/rpt/ ========================================================================= File [changed]: FixedContentReadHandler.java Url: http://dba.openoffice.org/source/browse/dba/reportdesign/java/com/sun/star/report/pentaho/parser/rpt/FixedContentReadHandler.java?r1=1.4&r2=1.4.4.1 Delta lines: +4 -7 ------------------- --- FixedContentReadHandler.java 2008-04-10 17:47:22+0000 1.4 +++ FixedContentReadHandler.java 2008-04-28 15:30:17+0000 1.4.4.1 @@ -33,6 +33,7 @@ import com.sun.star.report.pentaho.parser.ElementReadHandler; import com.sun.star.report.pentaho.parser.text.TextContentReadHandler; import com.sun.star.report.pentaho.OfficeNamespaces; +import com.sun.star.report.OfficeToken; import org.jfree.report.structure.Element; import org.jfree.xmlns.parser.IgnoreAnyChildReadHandler; import org.jfree.xmlns.parser.XmlReadHandler; @@ -47,7 +48,7 @@ public class FixedContentReadHandler extends ElementReadHandler { - private FixedTextElement element; + private final FixedTextElement element; public FixedContentReadHandler() { @@ -67,16 +68,12 @@ final Attributes atts) throws SAXException { - if (OfficeNamespaces.TEXT_NS.equals(uri)) + if (OfficeNamespaces.TEXT_NS.equals(uri) && OfficeToken.P.equals(tagName)) { // expect a paragraph (which will be ignored; it is a structural // component that needs not to be printed at all. - if ("p".equals(tagName)) - { - return new TextContentReadHandler(element.getContent()); } - } if (OfficeNamespaces.OOREPORT_NS.equals(uri)) { --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
