Tag: cws_dev300_rptchart02 User: oj Date: 2008-04-24 11:34:53+0000 Modified: dba/reportdesign/java/com/sun/star/report/pentaho/output/spreadsheet/SpreadsheetRawReportTarget.java
Log: paragraph handling corrected File Changes: Directory: /dba/reportdesign/java/com/sun/star/report/pentaho/output/spreadsheet/ ================================================================================= File [changed]: SpreadsheetRawReportTarget.java Url: http://dba.openoffice.org/source/browse/dba/reportdesign/java/com/sun/star/report/pentaho/output/spreadsheet/SpreadsheetRawReportTarget.java?r1=1.5.4.4&r2=1.5.4.5 Delta lines: +35 -29 --------------------- --- SpreadsheetRawReportTarget.java 2008-04-21 12:53:37+0000 1.5.4.4 +++ SpreadsheetRawReportTarget.java 2008-04-24 11:34:50+0000 1.5.4.5 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: SpreadsheetRawReportTarget.java,v $ - * $Revision: 1.5.4.4 $ + * $Revision: 1.5.4.5 $ * * This file is part of OpenOffice.org. * @@ -200,7 +200,7 @@ } final String elementType = ReportTargetUtil.getElemenTypeFromAttribute(attrs); - if (OfficeNamespaces.TEXT_NS.equals(namespace) && OfficeToken.P.equals(elementType)) + if (OfficeNamespaces.TEXT_NS.equals(namespace) && OfficeToken.P.equals(elementType) && !paragraphHandled) { paragraphFound = true; return; @@ -308,6 +308,7 @@ final XmlWriter xmlWriter = getXmlWriter(); xmlWriter.writeTag(OfficeNamespaces.TEXT_NS, OfficeToken.P, null, XmlWriterSupport.OPEN); paragraphHandled = true; + paragraphFound = false; } catch (IOException ex) { @@ -523,6 +524,8 @@ private void createTableShapes() throws ReportProcessingException { + if (!shapes.isEmpty()) + { try { final XmlWriter xmlWriter = getXmlWriter(); @@ -551,6 +554,7 @@ throw new ReportProcessingException("Failed", e); } } + } private void createTableColumns() throws ReportProcessingException { @@ -603,8 +607,7 @@ return; } - if (ReportTargetUtil.isElementOfType(OfficeNamespaces.TABLE_NS, OfficeToken.TABLE_ROW, attrs) - && isElementBoundaryCollectionPass() && getCurrentRole() != ROLE_TEMPLATE ) + if (ReportTargetUtil.isElementOfType(OfficeNamespaces.TABLE_NS, OfficeToken.TABLE_ROW, attrs) && isElementBoundaryCollectionPass() && getCurrentRole() != ROLE_TEMPLATE) { final String styleName = (String) attrs.getAttribute(OfficeNamespaces.TABLE_NS, OfficeToken.STYLE_NAME); rowHeights.add(computeRowHeight(styleName)); @@ -635,12 +638,15 @@ return; } - if (!paragraphHandled && OfficeNamespaces.TEXT_NS.equals(namespace) && OfficeToken.P.equals(elementType)) + if (OfficeNamespaces.TEXT_NS.equals(namespace) && OfficeToken.P.equals(elementType)) + { + if ( !paragraphHandled ) { return; } paragraphHandled = false; + } try { final XmlWriter xmlWriter = getXmlWriter(); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
