User: kz Date: 2008-05-05 15:14:45+0000 Modified: dba/reportdesign/java/com/sun/star/report/pentaho/parser/rpt/FunctionReadHandler.java
Log: INTEGRATION: CWS dba30beta (1.4.6); FILE MERGED 2008/04/22 10:30:31 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]: FunctionReadHandler.java Url: http://dba.openoffice.org/source/browse/dba/reportdesign/java/com/sun/star/report/pentaho/parser/rpt/FunctionReadHandler.java?r1=1.4&r2=1.5 Delta lines: +6 -4 ------------------- --- FunctionReadHandler.java 2008-04-10 17:48:12+0000 1.4 +++ FunctionReadHandler.java 2008-05-05 15:14:40+0000 1.5 @@ -37,6 +37,7 @@ import org.xml.sax.SAXException; import org.xml.sax.Attributes; import com.sun.star.report.pentaho.OfficeNamespaces; +import com.sun.star.report.OfficeToken; /** * Parses a named expression. These expressions are encountered on reports and @@ -67,13 +68,13 @@ { throw new ParseException("Required attribute 'formula' is missing", getLocator()); } - final String initialFormula = attrs.getValue(OfficeNamespaces.OOREPORT_NS, "initial-formula"); + final String name = attrs.getValue(OfficeNamespaces.OOREPORT_NS, "name"); if (name == null) { throw new ParseException("Required attribute 'name' is missing", getLocator()); } - final String preEvaluated = attrs.getValue(OfficeNamespaces.OOREPORT_NS, "pre-evaluated"); + final String initialFormula = attrs.getValue(OfficeNamespaces.OOREPORT_NS, "initial-formula"); final String deepTraversing = attrs.getValue(OfficeNamespaces.OOREPORT_NS, "deep-traversing"); if (initialFormula != null) @@ -91,8 +92,9 @@ } expression.setName(name); - expression.setDeepTraversing("true".equals(deepTraversing)); - expression.setPrecompute("true".equals(preEvaluated)); + expression.setDeepTraversing(OfficeToken.TRUE.equals(deepTraversing)); + final String preEvaluated = attrs.getValue(OfficeNamespaces.OOREPORT_NS, "pre-evaluated"); + expression.setPrecompute(OfficeToken.TRUE.equals(preEvaluated)); } /** --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
