Kaydet (Commit) 73480e7a authored tarafından Eike Rathke's avatar Eike Rathke

early bail out only on same doc

... and rename that variable to what it actually does..

Change-Id: Ifd6b9a612d8a8dbc700e42eeb5a732295af283a3
üst 04bb10f1
...@@ -698,9 +698,9 @@ void adjustRangeName(formula::FormulaToken* pToken, ScDocument& rNewDoc, const S ...@@ -698,9 +698,9 @@ void adjustRangeName(formula::FormulaToken* pToken, ScDocument& rNewDoc, const S
// If no range name was found copy it. // If no range name was found copy it.
if (!pRangeData) if (!pRangeData)
{ {
bool bCopyGlobalName = (nOldSheet < 0 && (bGlobalNamesToLocal || !bSameDoc)); bool bEarlyBailOut = (nOldSheet < 0 && bSameDoc);
MightReferenceSheet eMightReference = mightRangeNameReferenceSheet( pOldRangeData, nOldTab); MightReferenceSheet eMightReference = mightRangeNameReferenceSheet( pOldRangeData, nOldTab);
if (bCopyGlobalName && eMightReference == MightReferenceSheet::NONE) if (bEarlyBailOut && eMightReference == MightReferenceSheet::NONE)
return; return;
if (eMightReference == MightReferenceSheet::NAME) if (eMightReference == MightReferenceSheet::NAME)
...@@ -713,7 +713,7 @@ void adjustRangeName(formula::FormulaToken* pToken, ScDocument& rNewDoc, const S ...@@ -713,7 +713,7 @@ void adjustRangeName(formula::FormulaToken* pToken, ScDocument& rNewDoc, const S
sc::UpdatedRangeNames aReferencingNames; sc::UpdatedRangeNames aReferencingNames;
findRangeNamesReferencingSheet( aReferencingNames, pToken, pOldDoc, findRangeNamesReferencingSheet( aReferencingNames, pToken, pOldDoc,
nGlobalRefTab, nLocalRefTab, nOldTokenTab, nOldTokenTabReplacement, 0); nGlobalRefTab, nLocalRefTab, nOldTokenTab, nOldTokenTabReplacement, 0);
if (bCopyGlobalName && aReferencingNames.isEmpty(-1) && aReferencingNames.isEmpty(nOldTokenTabReplacement)) if (bEarlyBailOut && aReferencingNames.isEmpty(-1) && aReferencingNames.isEmpty(nOldTokenTabReplacement))
return; return;
SheetIndexMap aSheetIndexMap; SheetIndexMap aSheetIndexMap;
......
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