strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove range names with external references regardless of cells.

Browse source 
Sometimes range names may contain external references but no sheet
cells reference that range names.  Even then, breaking the link
should remove those range names.
This commit is contained in:
Kohei Yoshida 2011-05-06 01:50:02 -04:00
parent 0ae3f088e4
commit a174973051
1 changed files with 12 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
sc/source/ui/docshell/externalrefmgr.cxx
View file

@ -2442,23 +2442,22 @@ void ScExternalRefManager::breakLink(sal_uInt16 nFileId)
// the original container.
RefCellSet aSet = itrRefs->second;
for_each(aSet.begin(), aSet.end(), ConvertFormulaToStatic(mpDoc));
maRefCells.erase(nFileId);
}
// Remove all named ranges that reference this document.
// Remove all named ranges that reference this document.
// Global named ranges.
ScRangeName* pRanges = mpDoc->GetRangeName();
// Global named ranges.
ScRangeName* pRanges = mpDoc->GetRangeName();
if (pRanges)
removeRangeNamesBySrcDoc(*pRanges, nFileId);
// Sheet-local named ranges.
for (SCTAB i = 0, n = mpDoc->GetTableCount(); i < n; ++i)
{
pRanges = mpDoc->GetRangeName(i);
if (pRanges)
removeRangeNamesBySrcDoc(*pRanges, nFileId);
// Sheet-local named ranges.
for (SCTAB i = 0, n = mpDoc->GetTableCount(); i < n; ++i)
{
pRanges = mpDoc->GetRangeName(i);
if (pRanges)
removeRangeNamesBySrcDoc(*pRanges, nFileId);
}
maRefCells.erase(nFileId);
}
lcl_removeByFileId(nFileId, maDocShells);