diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-06-25 13:14:25 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-06-25 13:14:25 +0000 |
| commit | ed2e0a6f835bb54230aa5c78642d716edc3bfc39 (patch) | |
| tree | 42a16ec27cc11423b89101b9131edfc9199ecb95 /reportdesign/java | |
| parent | c1d6ff57fc83d4e5fd74edc4ceda18e412192139 (diff) | |
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'
Diffstat (limited to 'reportdesign/java')
| -rw-r--r-- | reportdesign/java/com/sun/star/report/pentaho/PentahoReportJob.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/reportdesign/java/com/sun/star/report/pentaho/PentahoReportJob.java b/reportdesign/java/com/sun/star/report/pentaho/PentahoReportJob.java index 4dda60649c17..5dd95f6e0d43 100644 --- a/reportdesign/java/com/sun/star/report/pentaho/PentahoReportJob.java +++ b/reportdesign/java/com/sun/star/report/pentaho/PentahoReportJob.java @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: PentahoReportJob.java,v $ - * $Revision: 1.6 $ + * $Revision: 1.7 $ * * This file is part of OpenOffice.org. * @@ -240,7 +240,10 @@ public class PentahoReportJob implements ReportJob 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) { |