User: kz Date: 2008-05-05 13:59:31+0000 Modified: dba/reportdesign/java/com/sun/star/report/pentaho/layoutprocessor/OfficeReportLayoutController.java
Log: INTEGRATION: CWS dba30beta (1.5.6); FILE MERGED 2008/04/22 10:30:26 oj 1.5.6.1: #i88503# merge changes from rptchart02 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.5&r2=1.6 Delta lines: +3 -15 -------------------- --- OfficeReportLayoutController.java 2008-04-10 17:25:43+0000 1.5 +++ OfficeReportLayoutController.java 2008-05-05 13:59:24+0000 1.6 @@ -63,11 +63,9 @@ 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_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 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 int state; private VariablesCollection variablesCollection; @@ -170,21 +168,11 @@ } 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]
