User: kz Date: 2008-03-05 17:32:58+0000 Modified: dba/reportdesign/java/com/sun/star/report/pentaho/layoutprocessor/OfficeTableTemplateLayoutController.java
Log: INTEGRATION: CWS rptchart01_DEV300 (1.2.70); FILE MERGED 2008/02/21 09:57:24 oj 1.2.70.4: #i85225# fixes found with PMD 2008/02/20 07:41:32 oj 1.2.70.3: check if section is null 2008/02/19 09:22:13 oj 1.2.70.2: RESYNC: (1.2-1.3); FILE MERGED 2008/02/19 06:42:48 oj 1.2.70.1: #i85225# ongoing work File Changes: Directory: /dba/reportdesign/java/com/sun/star/report/pentaho/layoutprocessor/ ============================================================================== File [changed]: OfficeTableTemplateLayoutController.java Url: http://dba.openoffice.org/source/browse/dba/reportdesign/java/com/sun/star/report/pentaho/layoutprocessor/OfficeTableTemplateLayoutController.java?r1=1.3&r2=1.4 Delta lines: +138 -123 ----------------------- --- OfficeTableTemplateLayoutController.java 2008-01-29 14:34:32+0000 1.3 +++ OfficeTableTemplateLayoutController.java 2008-03-05 17:32:55+0000 1.4 @@ -33,8 +33,6 @@ * MA 02111-1307 USA * ************************************************************************/ - - package com.sun.star.report.pentaho.layoutprocessor; import java.util.ArrayList; @@ -59,6 +57,7 @@ */ public class OfficeTableTemplateLayoutController extends SectionLayoutController { + private Node[] nodes; public OfficeTableTemplateLayoutController() @@ -99,7 +98,9 @@ { addFromSection(tables, (Section) report.getReportHeader()); } + addPBody(tables, (Section) report.getPreBodySection()); addFromBody(tables, (Section) report.getBodySection()); + addPBody(tables, (Section) report.getPostBodySection()); if (report.getReportFooter() != null) { addFromSection(tables, (Section) report.getReportFooter()); @@ -112,6 +113,20 @@ this.nodes = (Node[]) tables.toArray(new Node[tables.size()]); } + private void addPBody(final ArrayList tables, final Section section) + { + if (section != null) + { + tables.add(section); + } +// final Node[] nodeArray = section.getNodeArray(); +// for (int i = 0; i < nodeArray.length; i++) +// { +// final Node node = nodeArray[i]; +// tables.add(node); +// } + } + private void addFromBody(final ArrayList tables, final Section section) { final Node[] nodeArray = section.getNodeArray(); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
