Tag: mws_bea300 User: obo Date: 2008-04-28 15:18:39+0000 Modified: dba/reportdesign/java/com/sun/star/report/pentaho/layoutprocessor/OfficeTableLayoutController.java
Log: INTEGRATION: CWS dba30beta_BEA300 (1.3.6); FILE MERGED 2008/04/22 10:30:26 oj 1.3.6.1: #i88503# merge changes from rptchart02 File Changes: Directory: /dba/reportdesign/java/com/sun/star/report/pentaho/layoutprocessor/ ============================================================================== File [changed]: OfficeTableLayoutController.java Url: http://dba.openoffice.org/source/browse/dba/reportdesign/java/com/sun/star/report/pentaho/layoutprocessor/OfficeTableLayoutController.java?r1=1.3&r2=1.3.4.1 Delta lines: +26 -27 --------------------- --- OfficeTableLayoutController.java 2008-04-10 17:26:01+0000 1.3 +++ OfficeTableLayoutController.java 2008-04-28 15:18:37+0000 1.3.4.1 @@ -27,8 +27,6 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ - - package com.sun.star.report.pentaho.layoutprocessor; import org.jfree.report.flow.layoutprocessor.SectionLayoutController; @@ -41,6 +39,7 @@ import org.jfree.report.util.IntegerCache; import org.jfree.layouting.util.AttributeMap; import com.sun.star.report.pentaho.OfficeNamespaces; +import com.sun.star.report.OfficeToken; /** * Creation-Date: 24.04.2007, 14:40:20 @@ -49,6 +48,7 @@ */ public class OfficeTableLayoutController extends SectionLayoutController { + public OfficeTableLayoutController() { } @@ -63,17 +63,16 @@ for (int i = 0; i < nodeArray.length; i++) { final Node node = nodeArray[i]; - if (node instanceof Element == false) + if (node instanceof Element) { - continue; - } final Element child = (Element) node; if (OfficeNamespaces.TABLE_NS.equals(child.getNamespace()) && - "table-row".equals(child.getType())) + OfficeToken.TABLE_ROW.equals(child.getType())) { rowCount += 1; } } + } attributeMap.setAttribute(OfficeNamespaces.INTERNAL_NS, "table-row-count", IntegerCache.getInteger(rowCount)); return attributeMap; } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
