summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOcke Janssen <oj@openoffice.org>2009-10-12 12:32:19 +0000
committerOcke Janssen <oj@openoffice.org>2009-10-12 12:32:19 +0000
commit03387d4065fea0446469398dabe6dafe3557cb82 (patch)
tree9c98ac1fccdefdc3d73c87b355223b48fb2548d8
parent600f2071986f6d82ad3289fd79eb50579a7b6d3f (diff)
#i105724# check tDisplayCondition
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/TableCellLayoutController.java9
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 fc91ce2..10cfebc 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());
}