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

[Markus Mohrhard]

 sc/source/core/tool/token.cxx |   35 +++++++++++++++++------------------
 1 file changed, 17 insertions(+), 18 deletions(-)

New commits:
commit d74436c22a72abc7ddb7a06352934e0a8e423f16
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Mon Jan 27 11:55:23 2014 +0100

    only put bounds in vector if range is outside of copy range, fdo#74041
    
    There are 4 cases of which only two need an entry in the vector. If the
    start is before the copy range and if the end is past the end of the
    copy range.
    
    Change-Id: Ia88f6891e03257c3321dbfb271be559378e39625
    Reviewed-on: https://gerrit.libreoffice.org/7684
    Reviewed-by: Eike Rathke <erack at redhat.com>
    Tested-by: Eike Rathke <erack at redhat.com>
    Reviewed-by: Kohei Yoshida <libreoffice at kohei.us>
    Tested-by: Kohei Yoshida <libreoffice at kohei.us>

diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index e23659c..ff456eb 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -3162,36 +3162,35 @@ void checkBounds(
         // No intersections.
         return;
 
-    if (aAbs.aEnd.Row() <= rCxt.maRange.aEnd.Row())
+    if (aAbs.aStart.Row() <= rCxt.maRange.aStart.Row())
     {
         //    +-+ <---- top
         //    | |
         // +--+-+--+ <---- boundary row position
         // |  | |  |
-        // |  +-+  |
+        // |       |
         // +-------+
 
         // Add offset from the reference top to the cell position.
         SCROW nOffset = rCxt.maRange.aStart.Row() - aAbs.aStart.Row();
         rBounds.push_back(rPos.Row()+nOffset);
-        return;
     }
 
-    //    +-+ <---- top
-    //    | |
-    // +--+-+--+ <---- boundary row position
-    // |  | |  |
-    // |  | |  |
-    // +--+-+--+ <---- boundary row position
-    //    | |
-    //    +-+
-
-    // Add offset from the reference top to the cell position.
-    SCROW nOffset = rCxt.maRange.aStart.Row() - aAbs.aStart.Row();
-    rBounds.push_back(rPos.Row()+nOffset);
-    // Ditto.
-    nOffset = rCxt.maRange.aEnd.Row() + 1 - aAbs.aStart.Row();
-    rBounds.push_back(rPos.Row()+nOffset);
+    if (aAbs.aEnd.Row() >= rCxt.maRange.aEnd.Row())
+    {
+        // only check for end range
+
+        // +-------+
+        // |       |
+        // |  | |  |
+        // +--+-+--+ <---- boundary row position
+        //    | |
+        //    +-+
+
+        // Ditto.
+        SCROW nOffset = rCxt.maRange.aEnd.Row() + 1 - aAbs.aStart.Row();
+        rBounds.push_back(rPos.Row()+nOffset);
+    }
 }
 
 }