[Libreoffice-commits] core.git: xmerge/source

rbuj robert.buj at gmail.com
Tue Sep 9 11:35:02 PDT 2014


 xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentDeserializerImpl.java |    2 +-
 xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentSerializerImpl.java   |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit b53415f168b06a0ae1dfbc73f796bb03ddd40651
Author: rbuj <robert.buj at gmail.com>
Date:   Tue Sep 9 16:22:19 2014 +0200

    xmerge: use String.length()==0 instead of String.equals(empty string)
    
    Change-Id: I41b64c2dccad41193e15b6be2e62ce9dd63e0c3a
    Reviewed-on: https://gerrit.libreoffice.org/11358
    Reviewed-by: Thomas Arnhold <thomas at arnhold.org>
    Tested-by: Thomas Arnhold <thomas at arnhold.org>

diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentDeserializerImpl.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentDeserializerImpl.java
index 434d60c..b29e89f 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentDeserializerImpl.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentDeserializerImpl.java
@@ -105,7 +105,7 @@ public final class DocumentDeserializerImpl
 
     public Source resolve(String href, String base) throws TransformerException {
         if (href != null) {
-            if (href.equals("javax.xml.transform.dom.DOMSource") || href.equals("")) {
+            if (href.equals("javax.xml.transform.dom.DOMSource") || href.length() == 0) {
                 return null;
             }
             try {
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentSerializerImpl.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentSerializerImpl.java
index 25131cb..6c238db 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentSerializerImpl.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentSerializerImpl.java
@@ -200,7 +200,7 @@ public final class DocumentSerializerImpl
     public Source resolve(String href, String base)
             throws TransformerException {
         if (href != null) {
-            if (href.equals("javax.xml.transform.dom.DOMSource") || href.equals("")) {
+            if (href.equals("javax.xml.transform.dom.DOMSource") || href.length() == 0) {
                 return null;
             }
             try {


More information about the Libreoffice-commits mailing list