summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLionel Elie Mamane <lionel@mamane.lu>2013-10-08 16:37:32 +0200
committerCaolán McNamara <caolanm@redhat.com>2013-10-09 13:19:48 +0000
commite46902483fd59bec2a3c08a0643756cee2ffd3ec (patch)
treebe77567326771d167a345614cf9ba55d9d571197
parent2387a0e18061360cee229b1a4a54e438dca0668e (diff)
fdo#62994 reportbuilder survive empty formula
Change-Id: I1da053871d107730ad9a135deb48313d8a877d89 (cherry picked from commit 0089d3ae9442f26695ae742f5fbdeeaf698861f2) Signed-off-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit adc13d7b71cc9d9ccd33844ba2094dce481456ca) Reviewed-on: https://gerrit.libreoffice.org/6168 Reviewed-by: Lionel Elie Mamane <lionel@mamane.lu> Reviewed-by: David Ostrovsky <David.Ostrovsky@gmx.de> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/FormattedTextLayoutController.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/FormattedTextLayoutController.java b/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/FormattedTextLayoutController.java
index ea3d22bc169c..bb18d6172e9a 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/FormattedTextLayoutController.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/FormattedTextLayoutController.java
@@ -84,6 +84,8 @@ public class FormattedTextLayoutController
{
final FormattedTextElement element = (FormattedTextElement) getNode();
final FormulaExpression formulaExpression = element.getValueExpression();
+ if (formulaExpression.getFormulaExpression() == null)
+ return false;
final Formula formula = formulaExpression.getCompiledFormula();
final LValue lValue = formula.getRootReference();
return FormatValueUtility.isReferenceChanged(this, lValue);