Skip to content

C
core
Kaydet (Commit) 595b2bba authored tarafından Eike Rathke's avatar Eike Rathke
Dosyalara gözat
Seçenekler

now also ocTableRef is DBData, tdf#91078 related 

Change-Id: I70d3f595b3fe26b77788a668a430d4d777320754
üst 45ed509f
Show whitespace changes
Inline Side-by-side
Showing with 78 additions and 12 deletions
sc/source/core/tool/token.cxx
Dosyayı görüntüle @ 595b2bba
...@@ -2827,9 +2827,20 @@ sc::RefUpdateResult ScTokenArray::AdjustReferenceOnShift( const sc::RefUpdateCon ...@@ -2827,9 +2827,20 @@ sc::RefUpdateResult ScTokenArray::AdjustReferenceOnShift( const sc::RefUpdateCon
break; break;
case svIndex: case svIndex:
{ {
if (((*p)->GetOpCode() == ocName && isNameModified(rCxt.maUpdatedNames, rOldPos.Tab(), **p)) || switch ((*p)->GetOpCode())
((*p)->GetOpCode() == ocDBArea && isDBDataModified(rCxt.mrDoc, **p))) {
case ocName:
if (isNameModified(rCxt.maUpdatedNames, rOldPos.Tab(), **p))
aRes.mbNameModified = true;
break;
case ocDBArea:
case ocTableRef:
if (isDBDataModified(rCxt.mrDoc, **p))
aRes.mbNameModified = true; aRes.mbNameModified = true;
break;
default:
; // nothing
}
} }
break; break;
default: default:
...@@ -2896,9 +2907,20 @@ sc::RefUpdateResult ScTokenArray::AdjustReferenceOnMove( ...@@ -2896,9 +2907,20 @@ sc::RefUpdateResult ScTokenArray::AdjustReferenceOnMove(
break; break;
case svIndex: case svIndex:
{ {
if (((*p)->GetOpCode() == ocName && isNameModified(rCxt.maUpdatedNames, rOldPos.Tab(), **p)) || switch ((*p)->GetOpCode())
((*p)->GetOpCode() == ocDBArea && isDBDataModified(rCxt.mrDoc, **p))) {
case ocName:
if (isNameModified(rCxt.maUpdatedNames, rOldPos.Tab(), **p))
aRes.mbNameModified = true;
break;
case ocDBArea:
case ocTableRef:
if (isDBDataModified(rCxt.mrDoc, **p))
aRes.mbNameModified = true; aRes.mbNameModified = true;
break;
default:
; // nothing
}
} }
break; break;
default: default:
...@@ -2952,9 +2974,20 @@ sc::RefUpdateResult ScTokenArray::MoveReference( const ScAddress& rPos, const sc ...@@ -2952,9 +2974,20 @@ sc::RefUpdateResult ScTokenArray::MoveReference( const ScAddress& rPos, const sc
break; break;
case svIndex: case svIndex:
{ {
if (((*p)->GetOpCode() == ocName && isNameModified(rCxt.maUpdatedNames, aOldRange.aStart.Tab(), **p)) || switch ((*p)->GetOpCode())
((*p)->GetOpCode() == ocDBArea && isDBDataModified(rCxt.mrDoc, **p))) {
case ocName:
if (isNameModified(rCxt.maUpdatedNames, aOldRange.aStart.Tab(), **p))
aRes.mbNameModified = true; aRes.mbNameModified = true;
break;
case ocDBArea:
case ocTableRef:
if (isDBDataModified(rCxt.mrDoc, **p))
aRes.mbNameModified = true;
break;
default:
; // nothing
}
} }
break; break;
default: default:
...@@ -3469,9 +3502,20 @@ sc::RefUpdateResult ScTokenArray::AdjustReferenceOnDeletedTab( sc::RefUpdateDele ...@@ -3469,9 +3502,20 @@ sc::RefUpdateResult ScTokenArray::AdjustReferenceOnDeletedTab( sc::RefUpdateDele
break; break;
case svIndex: case svIndex:
{ {
if (((*p)->GetOpCode() == ocName && isNameModified(rCxt.maUpdatedNames, rOldPos.Tab(), **p)) || switch ((*p)->GetOpCode())
((*p)->GetOpCode() == ocDBArea && isDBDataModified(rCxt.mrDoc, **p))) {
case ocName:
if (isNameModified(rCxt.maUpdatedNames, rOldPos.Tab(), **p))
aRes.mbNameModified = true;
break;
case ocDBArea:
case ocTableRef:
if (isDBDataModified(rCxt.mrDoc, **p))
aRes.mbNameModified = true; aRes.mbNameModified = true;
break;
default:
; // nothing
}
} }
break; break;
default: default:
...@@ -3514,9 +3558,20 @@ sc::RefUpdateResult ScTokenArray::AdjustReferenceOnInsertedTab( sc::RefUpdateIns ...@@ -3514,9 +3558,20 @@ sc::RefUpdateResult ScTokenArray::AdjustReferenceOnInsertedTab( sc::RefUpdateIns
break; break;
case svIndex: case svIndex:
{ {
if (((*p)->GetOpCode() == ocName && isNameModified(rCxt.maUpdatedNames, rOldPos.Tab(), **p)) || switch ((*p)->GetOpCode())
((*p)->GetOpCode() == ocDBArea && isDBDataModified(rCxt.mrDoc, **p))) {
case ocName:
if (isNameModified(rCxt.maUpdatedNames, rOldPos.Tab(), **p))
aRes.mbNameModified = true;
break;
case ocDBArea:
case ocTableRef:
if (isDBDataModified(rCxt.mrDoc, **p))
aRes.mbNameModified = true; aRes.mbNameModified = true;
break;
default:
; // nothing
}
} }
break; break;
default: default:
...@@ -3580,9 +3635,20 @@ sc::RefUpdateResult ScTokenArray::AdjustReferenceOnMovedTab( sc::RefUpdateMoveTa ...@@ -3580,9 +3635,20 @@ sc::RefUpdateResult ScTokenArray::AdjustReferenceOnMovedTab( sc::RefUpdateMoveTa
break; break;
case svIndex: case svIndex:
{ {
if (((*p)->GetOpCode() == ocName && isNameModified(rCxt.maUpdatedNames, rOldPos.Tab(), **p)) || switch ((*p)->GetOpCode())
((*p)->GetOpCode() == ocDBArea && isDBDataModified(rCxt.mrDoc, **p))) {
case ocName:
if (isNameModified(rCxt.maUpdatedNames, rOldPos.Tab(), **p))
aRes.mbNameModified = true; aRes.mbNameModified = true;
break;
case ocDBArea:
case ocTableRef:
if (isDBDataModified(rCxt.mrDoc, **p))
aRes.mbNameModified = true;
break;
default:
; // nothing
}
} }
break; break;
default: default:
......
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