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

rbuj robert.buj at gmail.com
Sat Aug 2 04:25:06 PDT 2014


 xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeDocument.java |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 316a6ddf1afd3d3dc7a5b18e7328d888e4230a73
Author: rbuj <robert.buj at gmail.com>
Date:   Sat Aug 2 12:18:16 2014 +0200

    xmerge: String comparison
    
    Change-Id: I9a99c188eb63a7854890da8e4088a4ce15a169e0
    Reviewed-on: https://gerrit.libreoffice.org/10687
    Reviewed-by: David Tardon <dtardon at redhat.com>
    Tested-by: David Tardon <dtardon at redhat.com>

diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeDocument.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeDocument.java
index d51dcfe..7be7b49 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeDocument.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeDocument.java
@@ -766,9 +766,9 @@ public abstract class OfficeDocument
         rootElement.setAttribute("xmlns:script","http://openoffice.org/2000/script" );
         rootElement.setAttribute("xmlns:config","http://openoffice.org/2001/config" );
         // #i41033# OASIS format needs the "office:class" set.
-        if(getDocumentMimeType() == SXC_MIME_TYPE)
+        if(getDocumentMimeType().equals(SXC_MIME_TYPE))
             rootElement.setAttribute("office:class","spreadsheet" );
-        else if(getDocumentMimeType() == SXW_MIME_TYPE)
+        else if(getDocumentMimeType().equals(SXW_MIME_TYPE))
             rootElement.setAttribute("office:class","text" );
         rootElement.setAttribute("office:version","1.0");
 


More information about the Libreoffice-commits mailing list