diff options
author | Ocke Janssen [oj] <Ocke.Janssen@sun.com> | 2009-12-10 07:40:02 +0100 |
---|---|---|
committer | Ocke Janssen [oj] <Ocke.Janssen@sun.com> | 2009-12-10 07:40:02 +0100 |
commit | b940775418226784f68a5ecdb74e9f5400241318 (patch) | |
tree | 4722dad11f20830b6e559593e0d2b75ba91fe6d7 /reportbuilder/java/com/sun/star | |
parent | 510361e19b2e8f0955795a6007c0baf8cbafc9cd (diff) | |
parent | d9aef5ad759049012c08d2a7d6d315c1c20bce90 (diff) |
dba33d: merge with DEV300_m67
Diffstat (limited to 'reportbuilder/java/com/sun/star')
-rw-r--r-- | reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/TableCellLayoutController.java | 9 |
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()); } |