[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sc/source

[Markus Mohrhard]

 sc/source/filter/xml/XMLExportDatabaseRanges.cxx |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 1cb71ca9840ec241242776548a42814d21463040
Author: Markus Mohrhard <markus.mohrh...@collabora.co.uk>
Date:   Wed Feb 19 00:39:53 2014 +0100

    don't generate broken XML files, related #i116460#
    
    Change-Id: I5d7f487b787295af6189425601c5d7e829a3db52
    Reviewed-on: https://gerrit.libreoffice.org/8121
    Tested-by: Michael Stahl <mst...@redhat.com>
    Reviewed-by: Michael Stahl <mst...@redhat.com>

diff --git a/sc/source/filter/xml/XMLExportDatabaseRanges.cxx 
b/sc/source/filter/xml/XMLExportDatabaseRanges.cxx
index f9ea2c6..ea2b31c 100644
--- a/sc/source/filter/xml/XMLExportDatabaseRanges.cxx
+++ b/sc/source/filter/xml/XMLExportDatabaseRanges.cxx
@@ -431,10 +431,6 @@ private:
 
     void writeCondition(const ScQueryEntry& rEntry, SCCOLROW nFieldStart, bool 
bCaseSens, bool bRegExp)
     {
-        mrExport.AddAttribute(XML_NAMESPACE_TABLE, XML_FIELD_NUMBER, 
OUString::number(rEntry.nField - nFieldStart));
-        if (bCaseSens)
-            mrExport.AddAttribute(XML_NAMESPACE_TABLE, XML_CASE_SENSITIVE, 
XML_TRUE);
-
         const ScQueryEntry::QueryItemsType& rItems = rEntry.GetQueryItems();
         if (rItems.empty())
         {
@@ -442,7 +438,11 @@ private:
             return;
         }
 
-        else if (rItems.size() == 1)
+        mrExport.AddAttribute(XML_NAMESPACE_TABLE, XML_FIELD_NUMBER, 
OUString::number(rEntry.nField - nFieldStart));
+        if (bCaseSens)
+            mrExport.AddAttribute(XML_NAMESPACE_TABLE, XML_CASE_SENSITIVE, 
XML_TRUE);
+
+        if (rItems.size() == 1)
         {
             // Single item condition.
             const ScQueryEntry::Item& rItem = rItems.front();
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits