|
 |
f085be |
From ca8a6d4ff366f0ad7c2da6b76f76f624c593592f Mon Sep 17 00:00:00 2001
|
|
|
f085be |
From: Kohei Yoshida <kohei.yoshida@collabora.com>
|
|
|
f085be |
Date: Tue, 29 Jul 2014 22:33:56 -0400
|
|
|
f085be |
Subject: [PATCH 070/137] fdo#81330: When moving to a different sheet, set 3D
|
|
|
f085be |
flag on.
|
|
|
f085be |
|
|
|
f085be |
Change-Id: I16c6e687259635c4d0ac0e5dab0140941b409bc8
|
|
|
f085be |
(cherry picked from commit 5e55d5ffb70437e917e4092f4030d5a454fd20d6)
|
|
|
f085be |
Reviewed-on: https://gerrit.libreoffice.org/10637
|
|
|
f085be |
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
|
|
|
f085be |
Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
|
|
|
f085be |
---
|
|
|
f085be |
sc/source/core/tool/token.cxx | 5 +++++
|
|
|
f085be |
1 file changed, 5 insertions(+)
|
|
|
f085be |
|
|
|
f085be |
diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
|
|
|
f085be |
index c289960..d392550 100644
|
|
|
f085be |
--- a/sc/source/core/tool/token.cxx
|
|
|
f085be |
+++ b/sc/source/core/tool/token.cxx
|
|
|
f085be |
@@ -2827,6 +2827,8 @@ sc::RefUpdateResult ScTokenArray::AdjustReferenceOnMove(
|
|
|
f085be |
ScRange aOldRange = rCxt.maRange;
|
|
|
f085be |
aOldRange.Move(-rCxt.mnColDelta, -rCxt.mnRowDelta, -rCxt.mnTabDelta);
|
|
|
f085be |
|
|
|
f085be |
+ bool b3DFlag = rOldPos.Tab() != rNewPos.Tab();
|
|
|
f085be |
+
|
|
|
f085be |
FormulaToken** p = pCode;
|
|
|
f085be |
FormulaToken** pEnd = p + static_cast<size_t>(nLen);
|
|
|
f085be |
for (; p != pEnd; ++p)
|
|
|
f085be |
@@ -2845,6 +2847,7 @@ sc::RefUpdateResult ScTokenArray::AdjustReferenceOnMove(
|
|
|
f085be |
}
|
|
|
f085be |
|
|
|
f085be |
rRef.SetAddress(aAbs, rNewPos);
|
|
|
f085be |
+ rRef.SetFlag3D(b3DFlag);
|
|
|
f085be |
}
|
|
|
f085be |
break;
|
|
|
f085be |
case svDoubleRef:
|
|
|
f085be |
@@ -2859,6 +2862,8 @@ sc::RefUpdateResult ScTokenArray::AdjustReferenceOnMove(
|
|
|
f085be |
}
|
|
|
f085be |
|
|
|
f085be |
rRef.SetRange(aAbs, rNewPos);
|
|
|
f085be |
+ if (b3DFlag)
|
|
|
f085be |
+ rRef.Ref1.SetFlag3D(true);
|
|
|
f085be |
}
|
|
|
f085be |
break;
|
|
|
f085be |
case svIndex:
|
|
|
f085be |
--
|
|
|
f085be |
1.9.3
|
|
|
f085be |
|