commit 1f0bca308e677a3e7a75837f93f14b679f698846
author Kohei Yoshida <kohei.yoshida@collabora.com> Sun Oct 26 14:43:14 2014 -0700
committer Eike Rathke <erack@redhat.com> Thu Nov 20 11:21:08 2014 +0100
tree dcd23106ec48a24788e44a74d9b79bcc61441ddd
parent b7b3934b052365e5fb19b4c62a7d78aa6ed8a536

fdo#85215: Don't adjust references wrt cell position when disabled.

Change-Id: Ie1a12cc189bcb66fad59ea9901ac0dc95bb68788
(cherry picked from commit 10fc138307afb4b39baddb0d56eb8e986e5d29ea)
Signed-off-by: Eike Rathke <erack@redhat.com>

sc/source/core/data/table3.cxx

diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx
index c36b4cd..d646678 100644
--- a/sc/source/core/data/table3.cxx
+++ b/sc/source/core/data/table3.cxx
@@ -864,8 +864,11 @@ void ScTable::SortReorderByRow(
                    ScAddress aOldPos = rCell.maCell.mpFormula->aPos;

                    ScFormulaCell* pNew = rCell.maCell.mpFormula->Clone( aCellPos, SC_CLONECELL_DEFAULT);
                    pNew->CopyAllBroadcasters(*rCell.maCell.mpFormula);
                    pNew->GetCode()->AdjustReferenceOnMovedOrigin(aOldPos, aCellPos);
                    if (pArray->IsUpdateRefs())
                    {
                        pNew->CopyAllBroadcasters(*rCell.maCell.mpFormula);
                        pNew->GetCode()->AdjustReferenceOnMovedOrigin(aOldPos, aCellPos);
                    }

                    sc::CellStoreType::iterator itBlk = rCellStore.push_back(pNew);
                }

sc/source/ui/undo/undosort.cxx

diff --git a/sc/source/ui/undo/undosort.cxx b/sc/source/ui/undo/undosort.cxx
index 36156fe..4a00707 100644
--- a/sc/source/ui/undo/undosort.cxx
+++ b/sc/source/ui/undo/undosort.cxx
@@ -46,8 +46,7 @@ void UndoSort::Execute( bool bUndo )

    ScUndoUtil::MarkSimpleBlock(pDocShell, maParam.maSortRange);

    pDocShell->PostPaint(maParam.maSortRange, PAINT_GRID);
    pDocShell->PostDataChanged();
    rDoc.SetDirty(maParam.maSortRange);
    if (!aParam.mbUpdateRefs)
        rDoc.BroadcastCells(aParam.maSortRange, SC_HINT_DATACHANGED);
}