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

Kohei Yoshida kohei.yoshida at collabora.com
Fri Feb 21 04:49:09 PST 2014


 sc/source/ui/view/tabview2.cxx |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit de7ea676a51832d502b449b39809ce26299aa09a
Author: Kohei Yoshida <kohei.yoshida at collabora.com>
Date:   Tue Feb 18 20:40:27 2014 -0500

    fdo#74857: Update the incrementer when skipping over hidden regions.
    
    Otherwise it would over-shoot.
    
    Change-Id: I1f9741345dfe353e0b035ff3bead736ab3fccbef
    (cherry picked from commit 637353bb46d3c7d9537e47e4e003aef78a0c0ab3)
    Reviewed-on: https://gerrit.libreoffice.org/8117
    Tested-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
    (cherry picked from commit 793c2b2b3ac8c8e74ccdfc6876ce47e5039fb65a)
    Reviewed-on: https://gerrit.libreoffice.org/8131
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sc/source/ui/view/tabview2.cxx b/sc/source/ui/view/tabview2.cxx
index bcce76e..8762520 100644
--- a/sc/source/ui/view/tabview2.cxx
+++ b/sc/source/ui/view/tabview2.cxx
@@ -86,6 +86,7 @@ void moveCursorByProtRule(
                 if(nNewUnhiddenCol >= MAXCOL)
                     return;
 
+                i += nEndCol - nNewUnhiddenCol + 1;
                 nNewUnhiddenCol = nEndCol +1;
             }
 
@@ -105,6 +106,7 @@ void moveCursorByProtRule(
                 if(nNewUnhiddenCol <= 0)
                     return;
 
+                i -= nNewUnhiddenCol - nStartCol + 1;
                 nNewUnhiddenCol = nStartCol - 1;
             }
 
@@ -125,6 +127,7 @@ void moveCursorByProtRule(
                 if(nNewUnhiddenRow >= MAXROW)
                     return;
 
+                i += nEndRow - nNewUnhiddenRow + 1;
                 nNewUnhiddenRow = nEndRow + 1;
             }
 
@@ -144,6 +147,7 @@ void moveCursorByProtRule(
                 if(nNewUnhiddenRow <= 0)
                     return;
 
+                i -= nNewUnhiddenRow - nStartRow + 1;
                 nNewUnhiddenRow = nStartRow - 1;
             }
 


More information about the Libreoffice-commits mailing list