User: kz Date: 2008-03-05 17:32:40+0000 Modified: dba/reportdesign/java/com/sun/star/report/pentaho/layoutprocessor/OfficeReportLayoutController.java
Log: 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 File Changes: Directory: /dba/reportdesign/java/com/sun/star/report/pentaho/layoutprocessor/ ============================================================================== File [changed]: OfficeReportLayoutController.java Url: http://dba.openoffice.org/source/browse/dba/reportdesign/java/com/sun/star/report/pentaho/layoutprocessor/OfficeReportLayoutController.java?r1=1.3&r2=1.4 Delta lines: +15 -3 -------------------- --- OfficeReportLayoutController.java 2008-01-29 14:34:19+0000 1.3 +++ OfficeReportLayoutController.java 2008-03-05 17:32:37+0000 1.4 @@ -69,9 +69,11 @@ 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; @@ -174,11 +176,21 @@ } 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); } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
