[Libreoffice-commits] core.git: Branch 'libreoffice-4-0-6' - reportbuilder/java

[Lionel Elie Mamane]

 reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/FormattedTextLayoutController.java |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit e46902483fd59bec2a3c08a0643756cee2ffd3ec
Author: Lionel Elie Mamane <lionel at mamane.lu>
Date:   Tue Oct 8 16:37:32 2013 +0200

    fdo#62994 reportbuilder survive empty formula
    
    Change-Id: I1da053871d107730ad9a135deb48313d8a877d89
    (cherry picked from commit 0089d3ae9442f26695ae742f5fbdeeaf698861f2)
    Signed-off-by: Michael Stahl <mstahl at redhat.com>
    (cherry picked from commit adc13d7b71cc9d9ccd33844ba2094dce481456ca)
    Reviewed-on: https://gerrit.libreoffice.org/6168
    Reviewed-by: Lionel Elie Mamane <lionel at mamane.lu>
    Reviewed-by: David Ostrovsky <David.Ostrovsky at gmx.de>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

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 ea3d22b..bb18d61 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);