[Libreoffice-commits] core.git: Branch 'aoo/trunk' - sc/source

[Oliver-Rainer Wittmann]

 sc/source/filter/xml/xmlimprt.cxx |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 0eb5028a3c3ea1725f698600af0bca30e24814b3
Author: Oliver-Rainer Wittmann <orw at apache.org>
Date:   Mon Sep 2 08:39:03 2013 +0000

    122840: <ScXMLImport::SetNamedRanges()> - adding named ranges with temporary content "0" (correcting typo in changes for 120478)
    
    patch by: Clarence Guo <clarence dot guo dot bj at gmail dot com>

diff --git a/sc/source/filter/xml/xmlimprt.cxx b/sc/source/filter/xml/xmlimprt.cxx
index 738f068..921305e 100644
--- a/sc/source/filter/xml/xmlimprt.cxx
+++ b/sc/source/filter/xml/xmlimprt.cxx
@@ -2751,7 +2751,7 @@ void ScXMLImport::SetNamedRanges()
                             //xNamedRanges->addNewByName((*aItr)->sName, sTempContent, aCellAddress, GetRangeType((*aItr)->sRangeType));//String::CreateFromInt32( (*aItr)->nNameScope)
                             String sTabName;
                             GetDocument()->GetName( (*aItr)->nNameScope, sTabName);
-                            xNamedRanges->addNewByScopeName( sTabName, (*aItr)->sName, (*aItr)->sContent, aCellAddress, GetRangeType((*aItr)->sRangeType) );
+                            xNamedRanges->addNewByScopeName( sTabName, (*aItr)->sName, sTempContent, aCellAddress, GetRangeType((*aItr)->sRangeType) );
                         }
                         catch( uno::RuntimeException& )
                         {
@@ -2790,11 +2790,10 @@ void ScXMLImport::SetNamedRanges()
                     if (ScRangeStringConverter::GetAddressFromString(
                         aCellAddress, (*aItr)->sBaseCellAddress, GetDocument(), FormulaGrammar::CONV_OOO, nOffset ))
                     {
+                        //uno::Reference <sheet::XNamedRange> xNamedRange(xNamedRanges->getByName((*aItr)->sName), uno::UNO_QUERY);
                         String sTableName;
                         GetDocument()->GetName( (*aItr)->nNameScope,  sTableName );
                         rtl::OUString sRangeScope( sTableName);
-                        //uno::Reference <sheet::XNamedRange> xNamedRange(xNamedRanges->getByName((*aItr)->sName), uno::UNO_QUERY);
-                        //getByScopeName
                         uno::Reference <sheet::XNamedRange2> xNamedRange(xNamedRanges->getByScopeName( sRangeScope,(*aItr)->sName), uno::UNO_QUERY);
                         if (xNamedRange.is())
                         {