[libreoffice] add cursor in postit scrolling fix

Caolan McNamara caolanm at fedoraproject.org
Tue Jan 18 20:25:40 UTC 2011


commit 6b095259d7a2723cce5a468e3d05ce236a55aadb
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Jan 18 20:25:29 2011 +0000

    add cursor in postit scrolling fix

 ...pect-hack.-Cursor-on-post-it-now-scrolls-.patch |   37 ++++++++++++++++++++
 libreoffice.spec                                   |    2 +
 2 files changed, 39 insertions(+), 0 deletions(-)
---
diff --git a/0001-Removed-suspect-hack.-Cursor-on-post-it-now-scrolls-.patch b/0001-Removed-suspect-hack.-Cursor-on-post-it-now-scrolls-.patch
new file mode 100644
index 0000000..4251db7
--- /dev/null
+++ b/0001-Removed-suspect-hack.-Cursor-on-post-it-now-scrolls-.patch
@@ -0,0 +1,37 @@
+From 092e1494c1d7d68873f50a0da7699b0fdd15c439 Mon Sep 17 00:00:00 2001
+From: Andy Hearn <cuvierster at gmail.com>
+Date: Sat, 8 Jan 2011 23:26:13 +0000
+Subject: [PATCH] Removed suspect hack. Cursor on post-it now scrolls out of view.
+
+Previously, when the user scrolls when the cursor is within a
+post-it note, the main view judders, refusing to let the cursor
+ go out of view.  The removed lines appears to have been a hack
+to retain focus of a post-it note containing the cursor.
+---
+ sw/source/ui/docvw/PostItMgr.cxx |   10 ----------
+ 1 files changed, 0 insertions(+), 10 deletions(-)
+
+diff --git a/sw/source/ui/docvw/PostItMgr.cxx b/sw/source/ui/docvw/PostItMgr.cxx
+index cb3e783..7dcdad7 100644
+--- a/sw/source/ui/docvw/PostItMgr.cxx
++++ b/sw/source/ui/docvw/PostItMgr.cxx
+@@ -716,16 +716,6 @@ void SwPostItMgr::LayoutPostIts()
+                                 OSL_ENSURE(mPages[n]->bScrollbar,"SwPostItMgr::LayoutByPage(): note overlaps, but bScrollbar is not true");
+                             }
+                         }
+-
+-                        // do some magic so we really see the focused note
+-                        for(SwSidebarWin_iterator i = aVisiblePostItList.begin(); i!= aVisiblePostItList.end() ; i++)
+-                        {
+-                                            if ((*i)->HasChildPathFocus())
+-                            {
+-                                MakeVisible((*i),n+1);
+-                                break;
+-                            }
+-                        }
+                     }
+                     else
+                     {
+-- 
+1.7.3.4
+
diff --git a/libreoffice.spec b/libreoffice.spec
index 5f9d7d2..5601d53 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -102,6 +102,7 @@ Patch15: libreoffice-bootstrap-kde.patch
 Patch16: 0001-fix-presenter-screens-description.xml-build.patch
 Patch17: 0001-don-t-pushback-and-process-a-corrupt-extension.patch
 Patch18: 0001-free-ctxt-after-taking-lastError-details.patch
+Patch19: 0001-Removed-suspect-hack.-Cursor-on-post-it-now-scrolls-.patch
 
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 %define instdir %{_libdir}
@@ -723,6 +724,7 @@ mv -f redhat.soc extras/source/palettes/standard.soc
 %patch16 -p1 -b .fix-presenter-screens-description.xml-build.patch
 %patch17 -p1 -b .don-t-pushback-and-process-a-corrupt-extension.patch
 %patch18 -p1 -b .free-ctxt-after-taking-lastError-details.patch
+%patch19 -p1 -b .Cursor-on-post-it-now-scrolls-.patch
 touch scripting/source/pyprov/delzip
 touch scripting/util/provider/beanshell/delzip
 touch scripting/util/provider/javascript/delzip


More information about the scm-commits mailing list