User: kz Date: 2008-05-05 15:19:37+0000 Modified: dba/reportdesign/java/com/sun/star/report/pentaho/parser/rpt/RootTableReadHandler.java
Log: INTEGRATION: CWS dba30beta (1.4.6); FILE MERGED 2008/04/22 10:30:31 oj 1.4.6.1: #i88503# merge changes from rptchart02 File Changes: Directory: /dba/reportdesign/java/com/sun/star/report/pentaho/parser/rpt/ ========================================================================= File [changed]: RootTableReadHandler.java Url: http://dba.openoffice.org/source/browse/dba/reportdesign/java/com/sun/star/report/pentaho/parser/rpt/RootTableReadHandler.java?r1=1.4&r2=1.5 Delta lines: +6 -12 -------------------- --- RootTableReadHandler.java 2008-04-10 17:50:23+0000 1.4 +++ RootTableReadHandler.java 2008-05-05 15:19:33+0000 1.5 @@ -42,7 +42,7 @@ { private TableReadHandler sectionTableReadHandler; - private Section section; + private final Section section; public RootTableReadHandler() { @@ -72,21 +72,15 @@ final Attributes atts) throws SAXException { - if (OfficeNamespaces.TABLE_NS.equals(uri)) - { - if ("table".equals(tagName)) + if (OfficeNamespaces.TABLE_NS.equals(uri) && "table".equals(tagName)) { sectionTableReadHandler = new TableReadHandler(); return sectionTableReadHandler; } - } - if (OfficeNamespaces.OOREPORT_NS.equals(uri)) - { - if ("conditional-print-expression".equals(tagName)) + if (OfficeNamespaces.OOREPORT_NS.equals(uri) && "conditional-print-expression".equals(tagName)) { return new ConditionalPrintExpressionReadHandler(section); } - } return null; } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
