User: kz Date: 2008-05-05 15:27:51+0000 Modified: dba/reportdesign/java/com/sun/star/report/pentaho/parser/table/TableRowReadHandler.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]: TableRowReadHandler.java Url: http://dba.openoffice.org/source/browse/dba/reportdesign/java/com/sun/star/report/pentaho/parser/table/TableRowReadHandler.java?r1=1.4&r2=1.5 Delta lines: +65 -57 --------------------- --- TableRowReadHandler.java 2008-04-10 18:00:05+0000 1.4 +++ TableRowReadHandler.java 2008-05-05 15:27:48+0000 1.5 @@ -27,7 +27,6 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ - package com.sun.star.report.pentaho.parser.table; import java.util.ArrayList; @@ -39,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:51:47 @@ -47,8 +48,9 @@ */ public class TableRowReadHandler extends ElementReadHandler { - private ArrayList tableCells; - private Section tableRow; + + private final List tableCells; + private final Section tableRow; public TableRowReadHandler() { @@ -69,25 +71,31 @@ final Attributes atts) throws SAXException { - if (OfficeNamespaces.TABLE_NS.equals(uri) == false) + final XmlReadHandler rh; + if (OfficeNamespaces.TABLE_NS.equals(uri)) + { + if (OfficeToken.TABLE_CELL.equals(tagName)) { - return null; + rh = new TableCellReadHandler(); } - - if ("table-cell".equals(tagName)) + else if (OfficeToken.COVERED_TABLE_CELL.equals(tagName)) { - final TableCellReadHandler readHandler = new TableCellReadHandler(); - tableCells.add(readHandler); - return readHandler; + rh = new CoveredCellReadHandler(); } - if ("covered-table-cell".equals(tagName)) + else { - - final CoveredCellReadHandler readHandler = new CoveredCellReadHandler(); - tableCells.add(readHandler); - return readHandler; + rh = null; + } + if (rh != null) + { + tableCells.add(rh); + } + } + else + { + rh = null; } - return null; + return rh; } /** --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
