[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sc/source

Kohei Yoshida kohei.yoshida at collabora.com
Sun Feb 9 09:21:29 PST 2014


 sc/source/core/data/formulacell.cxx |    8 ++++++++
 1 file changed, 8 insertions(+)

New commits:
commit 5674cf16d2e053ac0590e665310683654b1036d7
Author: Kohei Yoshida <kohei.yoshida at collabora.com>
Date:   Sat Feb 8 15:13:18 2014 -0500

    fdo#74453: Only adjust tokens for top formula cells of formula group.
    
    Change-Id: Id04387dffac271b3d617da0fbc19c862c929d60a
    (cherry picked from commit 1556dbc451f067d8744378fb9bac0eaa7ef8f5ac)
    Reviewed-on: https://gerrit.libreoffice.org/7946
    Tested-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>

diff --git a/sc/source/core/data/formulacell.cxx b/sc/source/core/data/formulacell.cxx
index 7d1dff1..0de5c87 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -3024,6 +3024,10 @@ void ScFormulaCell::UpdateInsertTabAbs(SCTAB nTable)
     if (pDocument->IsClipOrUndo())
         return;
 
+    bool bAdjustCode = !mxGroup || mxGroup->mpTopCell == this;
+    if (!bAdjustCode)
+        return;
+
     pCode->Reset();
     ScToken* p = static_cast<ScToken*>(pCode->GetNextReferenceRPN());
     while (p)
@@ -3046,6 +3050,10 @@ bool ScFormulaCell::TestTabRefAbs(SCTAB nTable)
     if (pDocument->IsClipOrUndo())
         return false;
 
+    bool bAdjustCode = !mxGroup || mxGroup->mpTopCell == this;
+    if (!bAdjustCode)
+        return false;
+
     bool bRet = false;
     pCode->Reset();
     ScToken* p = static_cast<ScToken*>(pCode->GetNextReferenceRPN());


More information about the Libreoffice-commits mailing list