[libreoffice/f20] Resolves: tdf#89484 check that sheet reference is within selected sheets

[Eike Rathke]

commit bc84eb9289b9fc05c85d7922167bb59e2b30c8dd
Author: Eike Rathke <erack at redhat.com>
Date:   Tue Feb 24 23:48:58 2015 +0100

    Resolves: tdf#89484 check that sheet reference is within selected sheets

 ...f-89484-check-that-sheet-reference-is-wit.patch | 46 ++++++++++++++++++++++
 libreoffice.spec                                   |  2 +
 2 files changed, 48 insertions(+)
---
diff --git a/0001-Resolves-tdf-89484-check-that-sheet-reference-is-wit.patch b/0001-Resolves-tdf-89484-check-that-sheet-reference-is-wit.patch
new file mode 100644
index 0000000..9c33273
--- /dev/null
+++ b/0001-Resolves-tdf-89484-check-that-sheet-reference-is-wit.patch
@@ -0,0 +1,46 @@
+From 19e583288aac725e9010bb731c5b789f5f785f21 Mon Sep 17 00:00:00 2001
+Message-Id: <19e583288aac725e9010bb731c5b789f5f785f21.1424817901.git.erack at redhat.com>
+From: Eike Rathke <erack at redhat.com>
+Date: Tue, 24 Feb 2015 20:29:39 +0100
+Subject: [PATCH] Resolves: tdf#89484 check that sheet reference is within
+ selected sheets
+MIME-Version: 1.0
+Content-Type: multipart/mixed; boundary="------------erAck-patch-parts"
+
+This is a multi-part message in MIME format.
+--------------erAck-patch-parts
+Content-Type: text/plain; charset=UTF-8; format=fixed
+Content-Transfer-Encoding: 8bit
+
+
+Change-Id: I88f1d0a134ffa3fbb9a5b5abdabbd4774f457e81
+(cherry picked from commit 5803c76f318b2a8b655bf83a8257f60cd112ac71)
+---
+ sc/source/core/tool/token.cxx | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+
+--------------erAck-patch-parts
+Content-Type: text/x-patch; name="0001-Resolves-tdf-89484-check-that-sheet-reference-is-wit.patch"
+Content-Transfer-Encoding: 8bit
+Content-Disposition: attachment; filename="0001-Resolves-tdf-89484-check-that-sheet-reference-is-wit.patch"
+
+diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
+index f561614..db7f339 100644
+--- a/sc/source/core/tool/token.cxx
++++ b/sc/source/core/tool/token.cxx
+@@ -2670,6 +2670,10 @@ bool expandRangeByEdge( const sc::RefUpdateContext& rCxt, ScRange& rRefRange, co
+         // Edge-expansion is turned off.
+         return false;
+ 
++    if (!(rSelectedRange.aStart.Tab() <= rRefRange.aStart.Tab() && rRefRange.aEnd.Tab() <= rSelectedRange.aEnd.Tab()))
++        // Sheet references not within selected range.
++        return false;
++
+     if (rCxt.mnColDelta > 0)
+     {
+         // Insert and shift right.
+
+--------------erAck-patch-parts--
+
+
diff --git a/libreoffice.spec b/libreoffice.spec
index e315cfa..a6d379f 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -349,6 +349,7 @@ Patch93: 0001-various-indic-short-cuts.patch
 Patch94: 0001-Resolves-tdf-83461-do-not-override-MatColsRows-if-al.patch
 Patch95: 0001-fdo-87199-sw-fix-root-cause-of-a11y-crash-when-mergi.patch
 Patch96: 0001-Resolves-tdf-89500-catch-ISO-8601-datetime-in-all-lo.patch
+Patch97: 0001-Resolves-tdf-89484-check-that-sheet-reference-is-wit.patch
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/libreoffice
@@ -2290,6 +2291,7 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
 - Resolves: tdf#83461 do not override MatColsRows if already set
 - Resolves: rhbz#1190657 tdf#87199 Writer crashes when merging table cells
 - Resolves: tdf#89500 catch ISO 8601 datetime in all locales
+- Resolves: tdf#89484 check that sheet reference is within selected sheets
 
 * Thu Jan 29 2015 Caolán McNamara <caolanm at redhat.com> - 1:4.2.8.2-5
 - Resolves: rhbz#1134841 bn/ml "close without saving" short-cuts