User: kz Date: 2008-06-25 14:14:28+0000 Modified: dba/reportdesign/java/com/sun/star/report/pentaho/PentahoReportJob.java
Log: INTEGRATION: CWS rptwizard01 (1.5.8); FILE MERGED 2008/06/20 09:17:30 lla 1.5.8.2: RESYNC: (1.5-1.6); FILE MERGED 2008/06/03 06:18:21 lla 1.5.8.1: #i86092# functions could be 'null' File Changes: Directory: /dba/reportdesign/java/com/sun/star/report/pentaho/ ============================================================== File [changed]: PentahoReportJob.java Url: http://dba.openoffice.org/source/browse/dba/reportdesign/java/com/sun/star/report/pentaho/PentahoReportJob.java?r1=1.6&r2=1.7 Delta lines: +4 -1 ------------------- --- PentahoReportJob.java 2008-06-16 13:06:54+0000 1.6 +++ PentahoReportJob.java 2008-06-25 14:14:25+0000 1.7 @@ -240,7 +240,10 @@ try { - final FormulaFunction function = (FormulaFunction) parser.parse(exp.getFormulaExpression()); + final String expression = exp.getFormulaExpression(); + if ( expression == null) + continue; + final FormulaFunction function = (FormulaFunction) parser.parse(expression); final LValue[] parameters = function.getChildValues(); if (parameters.length > 0) { --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
