merge to m67

1 files changed, 9 insertions, 0 deletions

diff --git a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/TableCellLayoutController.java b/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/TableCellLayoutController.java
index 44117380e176..e9025330a60f 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/TableCellLayoutController.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/TableCellLayoutController.java
@@ -98,6 +98,15 @@ public class TableCellLayoutController extends SectionLayoutController
         {
             return null;
         }
+        final Expression dc = element.getDisplayCondition();
+        if (dc != null)
+        {
+            final Object o = LayoutControllerUtil.evaluateExpression(getFlowController(), element, dc);
+            if (Boolean.FALSE.equals(o))
+            {
+                return null;
+            }
+        }
         return FormatValueUtility.computeDataFlag(element, getFlowController());
     }