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

[Eike Rathke]

 sc/source/core/tool/token.cxx |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit d0b7506b135fd7edd986376a5174a88159ca2f80
Author: Eike Rathke <erack at redhat.com>
Date:   Tue Feb 24 20:29:39 2015 +0100

    Resolves: tdf#89484 check that sheet reference is within selected sheets
    
    Change-Id: I88f1d0a134ffa3fbb9a5b5abdabbd4774f457e81
    (cherry picked from commit 5803c76f318b2a8b655bf83a8257f60cd112ac71)
    Reviewed-on: https://gerrit.libreoffice.org/14609
    Tested-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>

diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index 43e1963..9218498 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -2514,6 +2514,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.