User: kz Date: 2008-05-05 15:27:09+0000 Modified: dba/reportdesign/java/com/sun/star/report/pentaho/parser/table/TableColumnsReadHandler.java
Log: INTEGRATION: CWS dba30beta (1.4.6); FILE MERGED 2008/04/22 10:30:33 oj 1.4.6.1: #i88503# merge changes from rptchart02 File Changes: Directory: /dba/reportdesign/java/com/sun/star/report/pentaho/parser/table/ =========================================================================== File [changed]: TableColumnsReadHandler.java Url: http://dba.openoffice.org/source/browse/dba/reportdesign/java/com/sun/star/report/pentaho/parser/table/TableColumnsReadHandler.java?r1=1.4&r2=1.5 Delta lines: +5 -8 ------------------- --- TableColumnsReadHandler.java 2008-04-10 17:59:30+0000 1.4 +++ TableColumnsReadHandler.java 2008-05-05 15:27:06+0000 1.5 @@ -38,6 +38,8 @@ import org.xml.sax.SAXException; import com.sun.star.report.pentaho.parser.ElementReadHandler; import com.sun.star.report.pentaho.OfficeNamespaces; +import com.sun.star.report.OfficeToken; +import java.util.List; /** * Creation-Date: 03.07.2006, 13:50:41 @@ -47,8 +49,8 @@ public class TableColumnsReadHandler extends ElementReadHandler { - private ArrayList columns; - private Section tableColumns; + private final List columns; + private final Section tableColumns; public TableColumnsReadHandler() { @@ -69,12 +71,7 @@ final Attributes atts) throws SAXException { - if (OfficeNamespaces.TABLE_NS.equals(uri) == false) - { - return null; - } - - if ("table-column".equals(tagName)) + if (OfficeNamespaces.TABLE_NS.equals(uri) && OfficeToken.TABLE_COLUMN.equals(tagName) ) { final TableColumnReadHandler readHandler = new TableColumnReadHandler(); columns.add(readHandler); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
