Kaydet (Commit) 0eb5028a authored tarafından Oliver-Rainer Wittmann's avatar Oliver-Rainer Wittmann

122840: <ScXMLImport::SetNamedRanges()> - adding named ranges with temporary…

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>
üst a77275c6
...@@ -2751,7 +2751,7 @@ void ScXMLImport::SetNamedRanges() ...@@ -2751,7 +2751,7 @@ void ScXMLImport::SetNamedRanges()
//xNamedRanges->addNewByName((*aItr)->sName, sTempContent, aCellAddress, GetRangeType((*aItr)->sRangeType));//String::CreateFromInt32( (*aItr)->nNameScope) //xNamedRanges->addNewByName((*aItr)->sName, sTempContent, aCellAddress, GetRangeType((*aItr)->sRangeType));//String::CreateFromInt32( (*aItr)->nNameScope)
String sTabName; String sTabName;
GetDocument()->GetName( (*aItr)->nNameScope, 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& ) catch( uno::RuntimeException& )
{ {
...@@ -2790,11 +2790,10 @@ void ScXMLImport::SetNamedRanges() ...@@ -2790,11 +2790,10 @@ void ScXMLImport::SetNamedRanges()
if (ScRangeStringConverter::GetAddressFromString( if (ScRangeStringConverter::GetAddressFromString(
aCellAddress, (*aItr)->sBaseCellAddress, GetDocument(), FormulaGrammar::CONV_OOO, nOffset )) aCellAddress, (*aItr)->sBaseCellAddress, GetDocument(), FormulaGrammar::CONV_OOO, nOffset ))
{ {
//uno::Reference <sheet::XNamedRange> xNamedRange(xNamedRanges->getByName((*aItr)->sName), uno::UNO_QUERY);
String sTableName; String sTableName;
GetDocument()->GetName( (*aItr)->nNameScope, sTableName ); GetDocument()->GetName( (*aItr)->nNameScope, sTableName );
rtl::OUString sRangeScope( 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); uno::Reference <sheet::XNamedRange2> xNamedRange(xNamedRanges->getByScopeName( sRangeScope,(*aItr)->sName), uno::UNO_QUERY);
if (xNamedRange.is()) if (xNamedRange.is())
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment