[Libreoffice-commits] .: sc/source

[Kohei Yoshida]

 sc/source/filter/xml/xmlexprt.cxx |   22 ++--------------------
 1 file changed, 2 insertions(+), 20 deletions(-)

New commits:
commit 6615f2f65452aa9cfe869ee09f787361a9c8fa43
Author: Kohei Yoshida <kohei.yoshida at suse.com>
Date:   Wed Aug 10 00:53:05 2011 -0400

    Partially reverted 96336b01a8e2836a3cabe407a92ac5d7b5ac5bf7.
    
    Be careful here.  It's not right to mark the whole expression #REF!
    when only one of the references is invalid.  fdo#37391 is about
    invalidating a single reference, not a whole formula expression.

diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx
index 5737d28..5ef06cf 100644
--- a/sc/source/filter/xml/xmlexprt.cxx
+++ b/sc/source/filter/xml/xmlexprt.cxx
@@ -2856,15 +2856,7 @@ void ScXMLExport::WriteTable(sal_Int32 nTable, const Reference<sheet::XSpreadshe
                 AddAttribute(XML_NAMESPACE_TABLE, XML_BASE_CELL_ADDRESS, aStr);
 
                 // expression
-                ScRange aRan;
-                if (itr->GetErrCode() || itr->IsValidReference(aRan))
-                {
-                    aStr = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("[#REF!]"));
-                }
-                else
-                {
-                    itr->GetSymbol(aStr, pDoc->GetStorageGrammar());
-                }
+                itr->GetSymbol(aStr, pDoc->GetStorageGrammar());
                 AddAttribute(XML_NAMESPACE_TABLE, XML_EXPRESSION, aStr);
 
                 SvXMLElementExport aElemNR(*this, XML_NAMESPACE_TABLE, XML_NAMED_EXPRESSION, sal_True, sal_True);
@@ -3816,17 +3808,7 @@ void ScXMLExport::WriteNamedExpressions(const com::sun::star::uno::Reference <co
         }
         else
         {
-            ScRange aRange;
-            rtl::OUString aStr;
-            if (pNamedRange->GetErrCode() || !pNamedRange->IsValidReference(aRange))
-            {
-                aStr = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("[#REF!]"));
-            }
-            else
-            {
-                pNamedRange->GetSymbol(aStr, pDoc->GetStorageGrammar());
-            }
-            AddAttribute(XML_NAMESPACE_TABLE, XML_EXPRESSION, aStr);
+            AddAttribute(XML_NAMESPACE_TABLE, XML_EXPRESSION, sOUTempContent);
             SvXMLElementExport aElemNE(*this, XML_NAMESPACE_TABLE, XML_NAMED_EXPRESSION, sal_True, sal_True);
         }
     }