Mark formula cells dirty when a referenced range gets partially shifted.

Change-Id: I5d97cb0e325c0168fdae57f8ec39f62c85bec524

sc/inc/refupdatecontext.hxx

@@ -49,6 +49,7 @@ struct RefUpdateResult
     bool mbRangeSizeModified;
 
     RefUpdateResult();
+    RefUpdateResult(const RefUpdateResult& r);
 };
 
 }

sc/source/core/data/formulacell.cxx

@@ -2310,18 +2310,13 @@ bool ScFormulaCell::UpdateReferenceOnShift(
             EndListeningTo(pDocument, pOldCode.get(), aOldPos);
     }
 
-    bool bNeedDirty = false;
     // NeedDirty for changes except for Copy and Move/Insert without RelNames
-    if (bRangeModified || bColRowNameCompile ||
-        (bValChanged && (bHasRelName || bInDeleteUndo || bRefSizeChanged)) || bOnRefMove)
-        bNeedDirty = true;
+    bool bNeedDirty = (bRangeModified || bValChanged || bColRowNameCompile || bOnRefMove);
 
     if (pUndoDoc && (bValChanged || bOnRefMove))
         setOldCodeToUndo(pUndoDoc, aUndoPos, pOldCode.get(), eTempGrammar, cMatrixFlag);
 
-    bValChanged = false;
-
-    if ( ( bCompile = (bCompile || bValChanged || bRangeModified || bColRowNameCompile) ) != 0 )
+    if ( ( bCompile = (bCompile || bRangeModified || bColRowNameCompile) ) != 0 )
     {
         CompileTokenArray( bNewListening ); // no Listening
         bNeedDirty = true;
@@ -2539,7 +2534,6 @@ bool ScFormulaCell::UpdateReferenceOnCopy(
         bOnRefMove = (bValChanged || (aPos != aOldPos));
 
     bool bColRowNameCompile = false;
-    bool bHasRelName = false;
     bool bNewListening = false;
     bool bInDeleteUndo = false;
 
@@ -2553,8 +2547,6 @@ bool ScFormulaCell::UpdateReferenceOnCopy(
         ScChangeTrack* pChangeTrack = pDocument->GetChangeTrack();
         bInDeleteUndo = (pChangeTrack && pChangeTrack->IsInDeleteUndo());
 
-        // RelNameRefs are always moved
-        bHasRelName = HasRelNameReference();
         // Reference changed and new listening needed?
         // Except in Insert/Delete without specialties.
         bNewListening =

sc/source/core/data/refupdatecontext.cxx

@@ -20,6 +20,8 @@ bool RefUpdateContext::hasDelta() const
 }
 
 RefUpdateResult::RefUpdateResult() : mbValueChanged(false), mbRangeSizeModified(false) {}
+RefUpdateResult::RefUpdateResult(const RefUpdateResult& r) :
+    mbValueChanged(r.mbValueChanged), mbRangeSizeModified(r.mbRangeSizeModified) {}
 
 }
 

sc/source/core/tool/token.cxx

@@ -2250,6 +2250,12 @@ sc::RefUpdateResult ScTokenArray::AdjustReferenceOnShift( const sc::RefUpdateCon
 
                 if (rCxt.maRange.In(aAbs))
                     aAbs.Move(rCxt.mnColDelta, rCxt.mnRowDelta, rCxt.mnTabDelta);
+                else if (rCxt.maRange.Intersects(aAbs))
+                {
+                    // Part of the referenced range is being shifted. This
+                    // will change the values of the range.
+                    aRes.mbValueChanged = true;
+                }
 
                 rRef.SetRange(aAbs, aNewPos);
             }