Tag: mws_bea300 User: obo Date: 2008-04-28 15:26:05+0000 Modified: dba/reportdesign/java/com/sun/star/report/pentaho/output/text/PageContext.java
Log: INTEGRATION: CWS dba30beta_BEA300 (1.3.6); FILE MERGED 2008/04/22 10:30:29 oj 1.3.6.1: #i88503# merge changes from rptchart02 File Changes: Directory: /dba/reportdesign/java/com/sun/star/report/pentaho/output/text/ ========================================================================== File [changed]: PageContext.java Url: http://dba.openoffice.org/source/browse/dba/reportdesign/java/com/sun/star/report/pentaho/output/text/PageContext.java?r1=1.3&r2=1.3.4.1 Delta lines: +151 -157 ----------------------- --- PageContext.java 2008-04-10 17:39:38+0000 1.3 +++ PageContext.java 2008-04-28 15:26:03+0000 1.3.4.1 @@ -27,8 +27,6 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ - - package com.sun.star.report.pentaho.output.text; import org.jfree.layouting.input.style.values.CSSNumericValue; @@ -42,18 +40,17 @@ */ public class PageContext { + public static final int KEEP_TOGETHER_OFF = 0; public static final int KEEP_TOGETHER_GROUP = 1; public static final int KEEP_TOGETHER_FIRST_DETAIL = 2; - private PageContext parent; - private String header; private CSSNumericValue headerHeight; private String footer; private CSSNumericValue footerHeight; private int keepTogether; - private Integer columnCount; + private Integer columnCount = null; private boolean sectionOpen; public PageContext() @@ -64,7 +61,6 @@ public PageContext(final PageContext parent) { this.parent = parent; - this.columnCount = null; if (parent != null) { this.keepTogether = parent.getKeepTogether(); @@ -76,6 +72,7 @@ PageContext pc = this; while (pc != null) { + // TODO: IS this code correct? Why not columnCount = pc.getColumnCount(); ? if (columnCount != null) { return columnCount.intValue(); @@ -111,7 +108,6 @@ return footer; } - public CSSNumericValue getHeaderHeight() { return headerHeight; @@ -177,7 +173,6 @@ return lnc.getResult(); } - public String getPageFooterContent() { if (parent == null) @@ -190,10 +185,10 @@ PageContext pc = this; while (pc != null) { - final String footer = pc.getFooter(); - if (footer != null) + final String footer_ = pc.getFooter(); + if (footer_ != null) { - b.append(footer); + b.append(footer_); } pc = pc.getParent(); } @@ -217,10 +212,10 @@ PageContext pc = this; while (pc != null) { - final String header = pc.getHeader(); - if (header != null) + final String header_ = pc.getHeader(); + if (header_ != null) { - b.append(header); + b.append(header_); } pc = pc.getParent(); } @@ -232,7 +227,6 @@ return null; } - public boolean isSectionOpen() { return sectionOpen; --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
