sc/source/core/data/formulacell.cxx | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 73480e7a18536b62d314929fbfe27a8f2c0a03cc
Author: Eike Rathke <er...@redhat.com>
Date: Fri Apr 1 12:50:03 2016 +0200
early bail out only on same doc
... and rename that variable to what it actually does..
Change-Id: Ifd6b9a612d8a8dbc700e42eeb5a732295af283a3
diff --git a/sc/source/core/data/formulacell.cxx
b/sc/source/core/data/formulacell.cxx
index 9f94264..ac877f8 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -698,9 +698,9 @@ void adjustRangeName(formula::FormulaToken* pToken,
ScDocument& rNewDoc, const S
// If no range name was found copy it.
if (!pRangeData)
{
- bool bCopyGlobalName = (nOldSheet < 0 && (bGlobalNamesToLocal ||
!bSameDoc));
+ bool bEarlyBailOut = (nOldSheet < 0 && bSameDoc);
MightReferenceSheet eMightReference = mightRangeNameReferenceSheet(
pOldRangeData, nOldTab);
- if (bCopyGlobalName && eMightReference == MightReferenceSheet::NONE)
+ if (bEarlyBailOut && eMightReference == MightReferenceSheet::NONE)
return;
if (eMightReference == MightReferenceSheet::NAME)
@@ -713,7 +713,7 @@ void adjustRangeName(formula::FormulaToken* pToken,
ScDocument& rNewDoc, const S
sc::UpdatedRangeNames aReferencingNames;
findRangeNamesReferencingSheet( aReferencingNames, pToken, pOldDoc,
nGlobalRefTab, nLocalRefTab, nOldTokenTab,
nOldTokenTabReplacement, 0);
- if (bCopyGlobalName && aReferencingNames.isEmpty(-1) &&
aReferencingNames.isEmpty(nOldTokenTabReplacement))
+ if (bEarlyBailOut && aReferencingNames.isEmpty(-1) &&
aReferencingNames.isEmpty(nOldTokenTabReplacement))
return;
SheetIndexMap aSheetIndexMap;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
