[Libreoffice-commits] .: 2 commits - extensions/source reportbuilder/java

[Caolán McNamara]

 extensions/source/nsplugin/source/npshell.cxx                                         |    5 +++--
 reportbuilder/java/com/sun/star/report/pentaho/output/OfficeDocumentReportTarget.java |   10 ++++++----
 2 files changed, 9 insertions(+), 6 deletions(-)

New commits:
commit 04c5a36ab8d514cfbe8e40f4493787b2ab392ab5
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Oct 25 13:49:51 2011 +0100

    avoid using com.sun.org apis

diff --git a/reportbuilder/java/com/sun/star/report/pentaho/output/OfficeDocumentReportTarget.java b/reportbuilder/java/com/sun/star/report/pentaho/output/OfficeDocumentReportTarget.java
index cdc8eae..ef99a15 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/output/OfficeDocumentReportTarget.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/output/OfficeDocumentReportTarget.java
@@ -41,7 +41,6 @@ import com.sun.star.report.pentaho.model.OfficeStyles;
 import com.sun.star.report.pentaho.model.OfficeStylesCollection;
 import com.sun.star.report.pentaho.styles.LengthCalculator;
 import com.sun.star.report.pentaho.styles.StyleMapper;
-import com.sun.org.apache.xerces.internal.parsers.DOMParser;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import javax.xml.transform.OutputKeys;
@@ -49,6 +48,8 @@ import javax.xml.transform.Transformer;
 import javax.xml.transform.TransformerFactory;
 import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamResult;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.DocumentBuilder;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
@@ -1058,9 +1059,10 @@ public abstract class OfficeDocumentReportTarget extends AbstractReportTarget
             try
             {
                 inputStream = getInputRepository().createInputStream("meta.xml");
-                DOMParser dOMParser = new DOMParser();
-                dOMParser.parse(new InputSource(inputStream));
-                Document document = dOMParser.getDocument();
+                DocumentBuilderFactory dbFactory = DocumentBuilderFactory.newInstance();
+                DocumentBuilder dBuilder = dbFactory.newDocumentBuilder();
+                Document document = dBuilder.parse(new InputSource(inputStream));
+
                 NodeList nl = document.getElementsByTagName("document-meta/meta/generator");
                 Node node = document.getFirstChild().getFirstChild().getFirstChild().getFirstChild();
                 String creator = node.getNodeValue();
commit db02967f36ec7ac333f1564c7cd10f8a833e1927
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Oct 25 10:45:26 2011 +0100

    WaE: unused variables

diff --git a/extensions/source/nsplugin/source/npshell.cxx b/extensions/source/nsplugin/source/npshell.cxx
index 1967a92..b1208d7 100644
--- a/extensions/source/nsplugin/source/npshell.cxx
+++ b/extensions/source/nsplugin/source/npshell.cxx
@@ -120,10 +120,11 @@ long int NSP_WriteToPipe(NSP_PIPE_FD fp, void* buf, unsigned long int len)
     len_unix = NSP_Write_Pipe(fp, buf, len, &len_wnt);
 #ifdef UNIX
     (void)len_wnt;
-    return  len_unix;
+    return len_unix;
 #endif //end of UNIX
 #ifdef WNT
-    return  len_wnt;
+    (void)len_unix;
+    return len_wnt;
 #endif //end of WNT
 
 }