From e46902483fd59bec2a3c08a0643756cee2ffd3ec Mon Sep 17 00:00:00 2001
From: Lionel Elie Mamane <lionel@mamane.lu>
Date: Tue, 8 Oct 2013 16:37:32 +0200
Subject: fdo#62994 reportbuilder survive empty formula
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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>
---
 .../report/pentaho/layoutprocessor/FormattedTextLayoutController.java   | 2 ++
 1 file changed, 2 insertions(+)

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);
-- 
cgit v1.2.3