summaryrefslogtreecommitdiffstats
path: root/reportbuilder
diff options
context:
space:
mode:
authorOcke Janssen [oj] <Ocke.Janssen@sun.com>2009-12-10 07:40:02 +0100
committerOcke Janssen [oj] <Ocke.Janssen@sun.com>2009-12-10 07:40:02 +0100
commitb940775418226784f68a5ecdb74e9f5400241318 (patch)
tree4722dad11f20830b6e559593e0d2b75ba91fe6d7 /reportbuilder
parentdba33d: #i104712# qurtal expression fixed (diff)
parentmasterfix: #i10000# help of presenter added for missing platforms (diff)
downloadcore-b940775418226784f68a5ecdb74e9f5400241318.tar.gz
core-b940775418226784f68a5ecdb74e9f5400241318.zip
dba33d: merge with DEV300_m67
Diffstat (limited to 'reportbuilder')
-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 27d3f47c9fc0..5393a5e13a15 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());
}