[dba-cvs] CVS update [cws_src680_oj14]: /dba/reportdesign/java/com/sun/star/report/pentaho/output/OfficeDocumentReportTarget.java

[fs]

Tag: cws_src680_oj14
User: fs      
Date: 2007-06-13 12:23:40+0000
Modified:
   
dba/reportdesign/java/com/sun/star/report/pentaho/output/OfficeDocumentReportTarget.java

Log:
 #i77331#

File Changes:

Directory: /dba/reportdesign/java/com/sun/star/report/pentaho/output/
=====================================================================

File [changed]: OfficeDocumentReportTarget.java
Url: 
http://dba.openoffice.org/source/browse/dba/reportdesign/java/com/sun/star/report/pentaho/output/OfficeDocumentReportTarget.java?r1=1.1.2.7&r2=1.1.2.8
Delta lines:  +12 -21
---------------------
--- OfficeDocumentReportTarget.java     2007-06-12 20:54:02+0000        1.1.2.7
+++ OfficeDocumentReportTarget.java     2007-06-13 12:23:38+0000        1.1.2.8
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: OfficeDocumentReportTarget.java,v $
  *
- *  $Revision: 1.1.2.7 $
+ *  $Revision: 1.1.2.8 $
  *
- *  last change: $Author: fs $ $Date: 2007/06/12 20:54:02 $
+ *  last change: $Author: fs $ $Date: 2007/06/13 12:23:38 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -38,14 +38,12 @@
 package com.sun.star.report.pentaho.output;
 
 import java.awt.Image;
-import java.io.BufferedReader;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.OutputStream;
 import java.io.OutputStreamWriter;
 import java.io.Reader;
-import java.io.StringReader;
 import java.io.StringWriter;
 import java.io.Writer;
 import java.util.Iterator;
@@ -53,9 +51,9 @@
 import java.util.zip.DeflaterOutputStream;
 import java.util.zip.InflaterInputStream;
 
+import com.sun.star.report.ImageService;
 import com.sun.star.report.InputRepository;
 import com.sun.star.report.OutputRepository;
-import com.sun.star.report.ImageService;
 import com.sun.star.report.pentaho.OfficeNamespaces;
 import com.sun.star.report.pentaho.layoutprocessor.ImageElementContext;
 import com.sun.star.report.pentaho.model.OfficeDocument;
@@ -90,8 +88,8 @@
 import org.jfree.resourceloader.ResourceKey;
 import org.jfree.resourceloader.ResourceManager;
 import org.jfree.util.FastStack;
-import org.jfree.util.Log;
 import org.jfree.util.LineBreakIterator;
+import org.jfree.util.Log;
 import org.jfree.xmlns.common.AttributeList;
 import org.jfree.xmlns.writer.DefaultTagDescription;
 import org.jfree.xmlns.writer.XmlWriter;
@@ -776,22 +774,15 @@
     final String text = String.valueOf(rawvalue);
     try
     {
-      final StringReader sreader = new StringReader(text);
-      final BufferedReader breader = new BufferedReader(sreader);
-
-      String line = breader.readLine();
-      while (line != null)
+      final LineBreakIterator lb = new LineBreakIterator(text);
+      while (lb.hasNext())
       {
-        // replace all newlines with paragraphs, so that Office display
-        // them correctly.
-        xmlWriter.writeText(XmlWriterSupport.normalize(line, false));
-        line = breader.readLine();
-        // Is this OK? Shouldn't we use soft-breaks instead?
-        if (line != null)
-        {
-          xmlWriter.writeCloseTag();
-          xmlWriter.writeTag(OfficeNamespaces.TEXT_NS, "p",
-              XmlWriterSupport.OPEN);
+        final String line = (String) lb.next();
+        final String normalizedText = XmlWriterSupport.normalize(line, false);
+        xmlWriter.writeText(normalizedText);
+        if (lb.hasNext())
+        {
+          xmlWriter.writeTag(OfficeNamespaces.TEXT_NS, "line-break", 
XmlWriterSupport.CLOSE);
         }
       }
     }




---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]