summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLionel Elie Mamane <lionel@mamane.lu>2013-10-08 16:37:32 +0200
committerLionel Elie Mamane <lionel@mamane.lu>2013-10-08 20:42:37 +0200
commit0089d3ae9442f26695ae742f5fbdeeaf698861f2 (patch)
tree431515200ac1488c681e70156ef88f7ce1fcc00e
parent76232a90b969bdb8664cb1ec238e8c4db92620ca (diff)
fdo#62994 reportbuilder survive empty formula
Change-Id: I1da053871d107730ad9a135deb48313d8a877d89
-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 5bda08ba7900..1841122e26e5 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);