summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLionel Elie Mamane <lionel@mamane.lu>2013-10-08 16:37:32 +0200
committerMichael Stahl <mstahl@redhat.com>2013-10-08 20:00:01 +0000
commitff8112e22eeb00dd0ed3b2232704d96e92333d76 (patch)
tree06b1c04e2fa73b8f73b8630c0a50848a4e9f8962
parente2ed0bc526db564114a4daf58d32b8bbcdbb84c9 (diff)
fdo#62994 reportbuilder survive empty formula
Change-Id: I1da053871d107730ad9a135deb48313d8a877d89 Reviewed-on: https://gerrit.libreoffice.org/6166 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
-rw-r--r--reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FormattedTextLayoutController.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FormattedTextLayoutController.java b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FormattedTextLayoutController.java
index dcc153c71962..cd09775bd2ca 100644
--- a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FormattedTextLayoutController.java
+++ b/reportbuilder/java/org/libreoffice/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);