From 11841937114b3f75ccd73d04147620b57b3b4bad Mon Sep 17 00:00:00 2001 From: Kurt Zenker Date: Wed, 5 Mar 2008 16:32:37 +0000 Subject: [PATCH] INTEGRATION: CWS rptchart01_DEV300 (1.2.70); FILE MERGED 2008/02/19 09:22:09 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 --- .../OfficeReportLayoutController.java | 22 ++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/reportdesign/java/com/sun/star/report/pentaho/layoutprocessor/OfficeReportLayoutController.java b/reportdesign/java/com/sun/star/report/pentaho/layoutprocessor/OfficeReportLayoutController.java index 0ef1657a926d..ba5e50f5afa6 100644 --- a/reportdesign/java/com/sun/star/report/pentaho/layoutprocessor/OfficeReportLayoutController.java +++ b/reportdesign/java/com/sun/star/report/pentaho/layoutprocessor/OfficeReportLayoutController.java @@ -4,9 +4,9 @@ * * $RCSfile: OfficeReportLayoutController.java,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: rt $ $Date: 2008-01-29 14:34:19 $ + * last change: $Author: kz $ $Date: 2008-03-05 17:32:37 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -69,9 +69,11 @@ public class OfficeReportLayoutController extends ElementLayoutController private static final int STATE_COLUMN_FOOTER_DONE = 7; private static final int STATE_INITIAL_VARIABLES_DONE = 8; private static final int STATE_REPORT_HEADER_DONE = 9; - private static final int STATE_REPORT_BODY_DONE = 10; - private static final int STATE_REPORT_FOOTER_VARIABLES = 11; - private static final int STATE_REPORT_FOOTER_DONE = 12; + private static final int STATE_REPORT_PRE_BODY_DONE = 10; + private static final int STATE_REPORT_BODY_DONE = 11; + private static final int STATE_REPORT_POST_BODY_DONE = 12; + private static final int STATE_REPORT_FOOTER_VARIABLES = 13; + private static final int STATE_REPORT_FOOTER_DONE = 14; private int state; private VariablesCollection variablesCollection; @@ -173,11 +175,21 @@ public class OfficeReportLayoutController extends ElementLayoutController OfficeReportLayoutController.STATE_REPORT_HEADER_DONE); } case OfficeReportLayoutController.STATE_REPORT_HEADER_DONE: + { + return delegateSection(or.getPreBodySection(), + OfficeReportLayoutController.STATE_REPORT_PRE_BODY_DONE); + } + case OfficeReportLayoutController.STATE_REPORT_PRE_BODY_DONE: { return delegateSection(or.getBodySection(), OfficeReportLayoutController.STATE_REPORT_BODY_DONE); } case OfficeReportLayoutController.STATE_REPORT_BODY_DONE: + { + return delegateSection(or.getPostBodySection(), + OfficeReportLayoutController.STATE_REPORT_POST_BODY_DONE); + } + case OfficeReportLayoutController.STATE_REPORT_POST_BODY_DONE: { return delegateSection(new VariablesDeclarationSection(), OfficeReportLayoutController.STATE_REPORT_FOOTER_VARIABLES);