User: kz Date: 2008-05-05 15:18:39+0000 Modified: dba/reportdesign/java/com/sun/star/report/pentaho/parser/rpt/MasterDetailReadHandler.java
Log: INTEGRATION: CWS dba30beta (1.3.6); FILE MERGED 2008/04/22 10:30:31 oj 1.3.6.1: #i88503# merge changes from rptchart02 File Changes: Directory: /dba/reportdesign/java/com/sun/star/report/pentaho/parser/rpt/ ========================================================================= File [changed]: MasterDetailReadHandler.java Url: http://dba.openoffice.org/source/browse/dba/reportdesign/java/com/sun/star/report/pentaho/parser/rpt/MasterDetailReadHandler.java?r1=1.3&r2=1.4 Delta lines: +9 -9 ------------------- --- MasterDetailReadHandler.java 2008-04-10 17:49:25+0000 1.3 +++ MasterDetailReadHandler.java 2008-05-05 15:18:36+0000 1.4 @@ -44,8 +44,8 @@ public class MasterDetailReadHandler extends ElementReadHandler { - private ObjectOleElement element; - private boolean parseMasterDetail; + private final ObjectOleElement element; + private final boolean parseMasterDetail; public MasterDetailReadHandler(final ObjectOleElement element) { @@ -71,10 +71,13 @@ if (parseMasterDetail) { final String master = attrs.getValue(OfficeNamespaces.OOREPORT_NS, "master"); + if (master != null && master.length() > 0 ) + { final String detail = attrs.getValue(OfficeNamespaces.OOREPORT_NS, "detail"); element.addMasterDetailFields(master, detail); } } + } /** * Returns the handler for a child element. @@ -89,15 +92,12 @@ final Attributes atts) throws SAXException { - if (OfficeNamespaces.OOREPORT_NS.equals(uri)) + if (OfficeNamespaces.OOREPORT_NS.equals(uri) && "master-detail-field".equals(tagName)) { // expect a report control. The control will modifiy the current // element (as we do not separate the elements that strictly ..) - if ("master-detail-field".equals(tagName)) - { return new MasterDetailReadHandler(element, true); } - } return null; } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
