diff options
| author | Eike Rathke <erack@redhat.com> | 2015-05-06 19:07:38 +0200 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2015-05-06 19:17:06 +0200 |
| commit | 595b2bbaedf730efc487fd9901365ffe03591e13 (patch) | |
| tree | ab68f555150b94997d75f315a702c65aa27a8be5 | |
| parent | 45ed509f71aeef52cb86cc3d88aa2bcf86334bb7 (diff) | |
now also ocTableRef is DBData, tdf#91078 related
Change-Id: I70d3f595b3fe26b77788a668a430d4d777320754
| -rw-r--r-- | sc/source/core/tool/token.cxx | 102 |
1 files changed, 84 insertions, 18 deletions
diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx index 67d45da01c2d..4b82778ae0c9 100644 --- a/sc/source/core/tool/token.cxx +++ b/sc/source/core/tool/token.cxx @@ -2827,9 +2827,20 @@ sc::RefUpdateResult ScTokenArray::AdjustReferenceOnShift( const sc::RefUpdateCon break; case svIndex: { - if (((*p)->GetOpCode() == ocName && isNameModified(rCxt.maUpdatedNames, rOldPos.Tab(), **p)) || - ((*p)->GetOpCode() == ocDBArea && isDBDataModified(rCxt.mrDoc, **p))) - aRes.mbNameModified = true; + switch ((*p)->GetOpCode()) + { + 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; + break; + default: + ; // nothing + } } break; default: @@ -2896,9 +2907,20 @@ sc::RefUpdateResult ScTokenArray::AdjustReferenceOnMove( break; case svIndex: { - if (((*p)->GetOpCode() == ocName && isNameModified(rCxt.maUpdatedNames, rOldPos.Tab(), **p)) || - ((*p)->GetOpCode() == ocDBArea && isDBDataModified(rCxt.mrDoc, **p))) - aRes.mbNameModified = true; + switch ((*p)->GetOpCode()) + { + 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; + break; + default: + ; // nothing + } } break; default: @@ -2952,9 +2974,20 @@ sc::RefUpdateResult ScTokenArray::MoveReference( const ScAddress& rPos, const sc break; case svIndex: { - if (((*p)->GetOpCode() == ocName && isNameModified(rCxt.maUpdatedNames, aOldRange.aStart.Tab(), **p)) || - ((*p)->GetOpCode() == ocDBArea && isDBDataModified(rCxt.mrDoc, **p))) - aRes.mbNameModified = true; + switch ((*p)->GetOpCode()) + { + case ocName: + if (isNameModified(rCxt.maUpdatedNames, aOldRange.aStart.Tab(), **p)) + aRes.mbNameModified = true; + break; + case ocDBArea: + case ocTableRef: + if (isDBDataModified(rCxt.mrDoc, **p)) + aRes.mbNameModified = true; + break; + default: + ; // nothing + } } break; default: @@ -3469,9 +3502,20 @@ sc::RefUpdateResult ScTokenArray::AdjustReferenceOnDeletedTab( sc::RefUpdateDele break; case svIndex: { - if (((*p)->GetOpCode() == ocName && isNameModified(rCxt.maUpdatedNames, rOldPos.Tab(), **p)) || - ((*p)->GetOpCode() == ocDBArea && isDBDataModified(rCxt.mrDoc, **p))) - aRes.mbNameModified = true; + switch ((*p)->GetOpCode()) + { + 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; + break; + default: + ; // nothing + } } break; default: @@ -3514,9 +3558,20 @@ sc::RefUpdateResult ScTokenArray::AdjustReferenceOnInsertedTab( sc::RefUpdateIns break; case svIndex: { - if (((*p)->GetOpCode() == ocName && isNameModified(rCxt.maUpdatedNames, rOldPos.Tab(), **p)) || - ((*p)->GetOpCode() == ocDBArea && isDBDataModified(rCxt.mrDoc, **p))) - aRes.mbNameModified = true; + switch ((*p)->GetOpCode()) + { + 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; + break; + default: + ; // nothing + } } break; default: @@ -3580,9 +3635,20 @@ sc::RefUpdateResult ScTokenArray::AdjustReferenceOnMovedTab( sc::RefUpdateMoveTa break; case svIndex: { - if (((*p)->GetOpCode() == ocName && isNameModified(rCxt.maUpdatedNames, rOldPos.Tab(), **p)) || - ((*p)->GetOpCode() == ocDBArea && isDBDataModified(rCxt.mrDoc, **p))) - aRes.mbNameModified = true; + switch ((*p)->GetOpCode()) + { + 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; + break; + default: + ; // nothing + } } break; default: |