User: rt Date: 2008-01-29 14:35:13+0000 Modified: dba/reportdesign/java/com/sun/star/report/pentaho/output/text/TextRawReportTarget.java
Log: INTEGRATION: CWS pentaho2_SRC680 (1.3.74); FILE MERGED 2008/01/21 09:00:25 oj 1.3.74.1: #i79173# #i78502# import changes from pentaho1 File Changes: Directory: /dba/reportdesign/java/com/sun/star/report/pentaho/output/text/ ========================================================================== File [changed]: TextRawReportTarget.java Url: http://dba.openoffice.org/source/browse/dba/reportdesign/java/com/sun/star/report/pentaho/output/text/TextRawReportTarget.java?r1=1.3&r2=1.4 Delta lines: +9 -3 ------------------- --- TextRawReportTarget.java 2007-08-03 09:51:21+0000 1.3 +++ TextRawReportTarget.java 2008-01-29 14:35:11+0000 1.4 @@ -1031,7 +1031,9 @@ // repeating sections have other ways of defining columns .. return; } - if (getCurrentRole() == ROLE_TEMPLATE) + if (getCurrentRole() == ROLE_TEMPLATE || + getCurrentRole() == ROLE_SPREADSHEET_PAGE_HEADER || + getCurrentRole() == ROLE_SPREADSHEET_PAGE_FOOTER) { // the template section would break the multi-column stuff and we dont open up sections there // anyway .. @@ -1059,7 +1061,9 @@ throws IOException, DataSourceException, ReportProcessingException { sectionHeight = new LengthCalculator(); - if (role == OfficeDocumentReportTarget.ROLE_TEMPLATE) + if (role == OfficeDocumentReportTarget.ROLE_TEMPLATE || + role == OfficeDocumentReportTarget.ROLE_SPREADSHEET_PAGE_HEADER || + role == OfficeDocumentReportTarget.ROLE_SPREADSHEET_PAGE_FOOTER) { // Start buffering with an dummy styles-collection, so that the global styles dont get polluted .. startBuffering(new OfficeStylesCollection(), true); @@ -1199,7 +1203,9 @@ protected void endReportSection(final AttributeMap attrs, final int role) throws IOException, DataSourceException, ReportProcessingException { - if (role == ROLE_TEMPLATE) + if (role == OfficeDocumentReportTarget.ROLE_TEMPLATE || + role == OfficeDocumentReportTarget.ROLE_SPREADSHEET_PAGE_HEADER || + role == OfficeDocumentReportTarget.ROLE_SPREADSHEET_PAGE_FOOTER) { finishBuffering(); return; --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
