diff options
| author | Lionel Elie Mamane <lionel@mamane.lu> | 2013-10-08 16:37:32 +0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-10-09 13:19:30 +0000 |
| commit | b57d1cce3ecdfb77706cbf0643c88f66de047dbc (patch) | |
| tree | f30885c6454922228fb46f75419a9b9453d1a03c | |
| parent | fdo#67074 push the localized macinstall.ulf to solver (diff) | |
| download | core-b57d1cce3ecdfb77706cbf0643c88f66de047dbc.tar.gz core-b57d1cce3ecdfb77706cbf0643c88f66de047dbc.zip | |
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>
(cherry picked from commit ff8112e22eeb00dd0ed3b2232704d96e92333d76)
Reviewed-on: https://gerrit.libreoffice.org/6169
Reviewed-by: Lionel Elie Mamane <lionel@mamane.lu>
Tested-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/org/libreoffice/report/pentaho/layoutprocessor/FormattedTextLayoutController.java | 2 |
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); |