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

[Markus Mohrhard]

 sc/source/filter/xml/XMLExportDataPilot.cxx      |    3 ++-
 sc/source/filter/xml/XMLExportDatabaseRanges.cxx |    3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 409005c87aadda681705b7cd4decdd6c5b4c8a91
Author: Markus Mohrhard <markus.mohrh...@googlemail.com>
Date:   Tue Apr 7 00:26:20 2015 +0200

    condition-source-range-address is optional but may not be empty
    
    Change-Id: I63706daa3a53f444f96617feec22bc920a098469

diff --git a/sc/source/filter/xml/XMLExportDataPilot.cxx 
b/sc/source/filter/xml/XMLExportDataPilot.cxx
index e175408..ff2da63 100644
--- a/sc/source/filter/xml/XMLExportDataPilot.cxx
+++ b/sc/source/filter/xml/XMLExportDataPilot.cxx
@@ -178,7 +178,8 @@ void ScXMLExportDataPilot::WriteDPFilter(const 
ScQueryParam& aQueryParam)
                     aQueryParam.nCol2, aQueryParam.nRow2, aQueryParam.nTab);
                 OUString sConditionRange;
                 ScRangeStringConverter::GetStringFromRange( sConditionRange, 
aConditionRange, pDoc, ::formula::FormulaGrammar::CONV_OOO );
-                rExport.AddAttribute(XML_NAMESPACE_TABLE, 
XML_CONDITION_SOURCE_RANGE_ADDRESS, sConditionRange);
+                if (!sConditionRange.isEmpty())
+                    rExport.AddAttribute(XML_NAMESPACE_TABLE, 
XML_CONDITION_SOURCE_RANGE_ADDRESS, sConditionRange);
             }
             if (!aQueryParam.bDuplicate)
                 rExport.AddAttribute(XML_NAMESPACE_TABLE, 
XML_DISPLAY_DUPLICATES, XML_FALSE);
diff --git a/sc/source/filter/xml/XMLExportDatabaseRanges.cxx 
b/sc/source/filter/xml/XMLExportDatabaseRanges.cxx
index 758a1f9..12ce267 100644
--- a/sc/source/filter/xml/XMLExportDatabaseRanges.cxx
+++ b/sc/source/filter/xml/XMLExportDatabaseRanges.cxx
@@ -504,7 +504,8 @@ private:
             OUString aAddrStr;
             ScRangeStringConverter::GetStringFromRange(
                 aAddrStr, aAdvSource, mpDoc, 
::formula::FormulaGrammar::CONV_OOO);
-            mrExport.AddAttribute(XML_NAMESPACE_TABLE, 
XML_CONDITION_SOURCE_RANGE_ADDRESS, aAddrStr);
+            if (!aAddrStr.isEmpty())
+                mrExport.AddAttribute(XML_NAMESPACE_TABLE, 
XML_CONDITION_SOURCE_RANGE_ADDRESS, aAddrStr);
         }
 
         if (!aParam.bDuplicate)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits