User: kz Date: 2008-05-05 15:18:24+0000 Modified: dba/reportdesign/java/com/sun/star/report/pentaho/parser/rpt/ImageReadHandler.java
Log: INTEGRATION: CWS dba30beta (1.5.6); FILE MERGED 2008/04/22 10:30:31 oj 1.5.6.1: #i88503# merge changes from rptchart02 File Changes: Directory: /dba/reportdesign/java/com/sun/star/report/pentaho/parser/rpt/ ========================================================================= File [changed]: ImageReadHandler.java Url: http://dba.openoffice.org/source/browse/dba/reportdesign/java/com/sun/star/report/pentaho/parser/rpt/ImageReadHandler.java?r1=1.5&r2=1.6 Delta lines: +7 -9 ------------------- --- ImageReadHandler.java 2008-04-10 17:49:09+0000 1.5 +++ ImageReadHandler.java 2008-05-05 15:18:21+0000 1.6 @@ -30,6 +30,7 @@ package com.sun.star.report.pentaho.parser.rpt; import com.sun.star.report.pentaho.OfficeNamespaces; +import com.sun.star.report.OfficeToken; import com.sun.star.report.pentaho.model.ImageElement; import com.sun.star.report.pentaho.parser.ElementReadHandler; import com.sun.star.report.pentaho.parser.xlink.XLinkReadHandler; @@ -49,7 +50,7 @@ public class ImageReadHandler extends ElementReadHandler { - private ImageElement contentElement; + private final ImageElement contentElement; private XLinkReadHandler xLinkReadHandler; public ImageReadHandler() @@ -67,7 +68,7 @@ { super.startParsing(attrs); final String formula = attrs.getValue(OfficeNamespaces.OOREPORT_NS, "formula"); -// final String preserveIRI = attrs.getValue(OfficeNamespaces.OOREPORT_NS, "preserve-IRI"); +// final String preserveIRI = attrs.getValue(OfficeNamespaces.OOREPORT_NS, OfficeToken.PRESERVE_IRI); if (formula != null && formula.length() != 0) { // now, the evaulated content ends up in the 'content' attribute of the @@ -78,7 +79,7 @@ } contentElement.setNamespace(OfficeNamespaces.FORM_NS); - contentElement.setType("image"); + contentElement.setType(OfficeToken.IMAGE); } /** @@ -94,14 +95,11 @@ final Attributes atts) throws SAXException { - if (OfficeNamespaces.DRAWING_NS.equals(uri)) - { - if ("image-data".equals(tagName)) + if (OfficeNamespaces.DRAWING_NS.equals(uri) && OfficeToken.IMAGE_DATA.equals(tagName)) { xLinkReadHandler = new XLinkReadHandler(); return xLinkReadHandler; } - } if (OfficeNamespaces.OOREPORT_NS.equals(uri)) { --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
