[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - 2 commits - sc/source

[Kohei Yoshida]

 sc/source/core/tool/token.cxx |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 69a7f2d94f0cb87cbc7f911f0393204a9c0eef1a
Author: Kohei Yoshida <kohei.yoshida at collabora.com>
Date:   Mon Oct 6 14:33:49 2014 -0400

    cp#1000103: Set 3D flag when adjusting reference on cell move.
    
    This is conceptually a backport of 31abf4ce4e18cf2e94c6e598f255ae7cd8f675fa,
    adjusted to apply to the 4.2 code base.
    
    Change-Id: Id2979c7699e2b28cc752d527f4cb328da1529c0d

diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index 68f9cf6..73d284a 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -2899,6 +2899,8 @@ void ScTokenArray::MoveReference(
                 {
                     aAbs.Move(rDelta.Col(), rDelta.Row(), rDelta.Tab());
                     rRef.SetAddress(aAbs, rPos);
+                    if (rDelta.Tab())
+                        rRef.SetFlag3D(aAbs.Tab()!=rPos.Tab());
                 }
             }
             break;
@@ -2911,6 +2913,8 @@ void ScTokenArray::MoveReference(
                 {
                     aAbs.Move(rDelta.Col(), rDelta.Row(), rDelta.Tab());
                     rRef.SetRange(aAbs, rPos);
+                    if (rDelta.Tab())
+                        rRef.Ref1.SetFlag3D(aAbs.aStart.Tab()!=rPos.Tab());
                 }
             }
             break;
commit 470ff027834f40682cbff14e36f32530f7a237af
Author: Eike Rathke <erack at redhat.com>
Date:   Fri Aug 22 12:59:47 2014 +0200

    resolved fdo#82936 do not clear the 3D flag on refupdate
    
    Change-Id: I2ae1368a2ffc20e988ff3ab66590a9f98902b862
    (cherry picked from commit 75aad687cb5e63a41303aea568bf68b2b5f15d31)

diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index 24f0343..68f9cf6 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -2847,7 +2847,8 @@ sc::RefUpdateResult ScTokenArray::AdjustReferenceOnMove(
                 }
 
                 rRef.SetAddress(aAbs, rNewPos);
-                rRef.SetFlag3D(b3DFlag);
+                if (b3DFlag)
+                    rRef.SetFlag3D(b3DFlag);
             }
             break;
             case svDoubleRef: