[libreoffice] Resolves: rhbz#678284 Calc crashes during cell select with keys

[David Tardon]

commit 8898f6dcf36e4c54ecd82818e07af8e352de5272
Author: David Tardon <dtardon at redhat.com>
Date:   Thu Feb 17 15:41:29 2011 +0100

    Resolves: rhbz#678284 Calc crashes during cell select with keys

 ...-current-position-when-shift-page-up-and-.patch |   44 ++++++++++++++++++++
 libreoffice.spec                                   |    8 +++-
 2 files changed, 51 insertions(+), 1 deletions(-)
---
diff --git a/0001-rhbz-678284-Get-correct-current-position-when-shift-page-up-and-.patch b/0001-rhbz-678284-Get-correct-current-position-when-shift-page-up-and-.patch
new file mode 100644
index 0000000..8cb1ce2
--- /dev/null
+++ b/0001-rhbz-678284-Get-correct-current-position-when-shift-page-up-and-.patch
@@ -0,0 +1,44 @@
+From e4decda5e2cf3f6cd2a7a41b23fb68ccf91e3f23 Mon Sep 17 00:00:00 2001
+From: Kohei Yoshida <kyoshida at novell.com>
+Date: Sat, 12 Feb 2011 01:32:12 -0500
+Subject: [PATCH] Get correct current position when shift-page up and down. (fdo#34026)
+
+When expanding a selection, we need to use the block end position
+as the "current" position instead of the current cursor position, as
+the cursor no longer moves during block selection.
+---
+ sc/source/ui/view/tabview2.cxx |   18 +++++++++++++++++-
+ 1 files changed, 17 insertions(+), 1 deletions(-)
+
+diff --git a/sc/source/ui/view/tabview2.cxx b/sc/source/ui/view/tabview2.cxx
+index 3bc9a82..73207ff 100644
+--- a/sc/source/ui/view/tabview2.cxx
++++ b/sc/source/ui/view/tabview2.cxx
+@@ -371,7 +371,23 @@ void ScTabView::GetPageMoveEndPosition(SCsCOL nMovX, SCsROW nMovY, SCsCOL& rPage
+ {
+     SCCOL nCurX;
+     SCROW nCurY;
+-    aViewData.GetMoveCursor( nCurX,nCurY );
++    if (aViewData.IsRefMode())
++    {
++        nCurX = aViewData.GetRefEndX();
++        nCurY = aViewData.GetRefEndY();
++    }
++    else if (IsBlockMode())
++    {
++        // block end position.
++        nCurX = nBlockEndX;
++        nCurY = nBlockEndY;
++    }
++    else
++    {
++        // cursor position
++        nCurX = aViewData.GetCurX();
++        nCurY = aViewData.GetCurY();
++    }
+ 
+     ScSplitPos eWhich = aViewData.GetActivePart();
+     ScHSplitPos eWhichX = WhichH( eWhich );
+-- 
+1.7.4
+
diff --git a/libreoffice.spec b/libreoffice.spec
index 61bc900..6ff7d79 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -28,7 +28,7 @@
 Summary:        Free Software Productivity Suite
 Name:           libreoffice
 Version:        3.3.1.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and (CDDL or GPLv2) and Public Domain
 Group:          Applications/Productivity
 URL:            http://www.documentfoundation.org/develop
@@ -113,6 +113,7 @@ Patch25: 0001-Resolves-rhbz-676539-handle-missing-pWindows-from-xW.patch
 Patch26: 0001-Resolves-fdo-33750-i94623-use-optimal-border-width-w.patch
 Patch27: 0001-rhbz-649310-don-t-crash-deregistering-diff.-platform.patch
 Patch28: 0001-Resolves-rhbz-674330-dereference-of-NULL-mpBase.patch
+Patch29: 0001-rhbz-678284-Get-correct-current-position-when-shift-page-up-and-.patch
 
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 %define instdir %{_libdir}
@@ -744,6 +745,7 @@ mv -f redhat.soc extras/source/palettes/standard.soc
 %patch26 -p1 -b .fdo33750-i94623-use-optimal-border-width-w.patch
 %patch27 -p1 -b .rhbz649310-don-t-crash-deregistering-diff.-platform.patch
 %patch28 -p1 -b .rhbz674330-dereference-of-NULL-mpBase.patch
+%patch29 -p1 -b .rhbz678284-Get-correct-current-position-when-shift-page-up-and-.patch
 touch scripting/source/pyprov/delzip
 touch scripting/util/provider/beanshell/delzip
 touch scripting/util/provider/javascript/delzip
@@ -2089,6 +2091,10 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
 %{basisinstdir}/program/kde-open-url
 
 %changelog
+* Thu Feb 17 2011 Caolán McNamara <caolanm at redhat.com> 3.3.1.2-2
+- Resolves: rhbz#678284 Calc crashes during cell select with keys
+  (dtardon)
+
 * Thu Feb 17 2011 Caolán McNamara <caolanm at redhat.com> 3.3.1.2-1
 - RC2