rpms/openoffice.org/devel openoffice.org-3.2.0.ooo90599.accelsequence.crash.patch, NONE, 1.1 openoffice.org.spec, 1.2051, 1.2052

[Caolan McNamara]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12866

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.2.0.ooo90599.accelsequence.crash.patch 
Log Message:
Resolves: rhbz#531732 possible crash in about dialog with unfinished accelerators

openoffice.org-3.2.0.ooo90599.accelsequence.crash.patch:
 accmgr.cxx |   17 +++++++++++++++++
 1 file changed, 17 insertions(+)

--- NEW FILE openoffice.org-3.2.0.ooo90599.accelsequence.crash.patch ---
diff -r 170d9f615c3e vcl/source/window/accmgr.cxx
--- a/vcl/source/window/accmgr.cxx	Wed Oct 28 10:10:41 2009 +0000
+++ b/vcl/source/window/accmgr.cxx	Thu Oct 29 12:30:32 2009 +0000
@@ -83,6 +83,23 @@
     if ( !mpAccelList )
         return;
 
+    //e.g. #i90599#. Someone starts typing a sequence in a dialog, but doesn't
+    //end it, and then closes the dialog, deleting the accelerators. So if
+    //we're removing an accelerator that a sub-accelerator which is in the
+    //sequence list, throw away the entire sequence 
+    if ( mpSequenceList )
+    {
+        for (USHORT i = 0; i < pAccel->GetItemCount(); ++i)
+        {
+            Accelerator* pSubAccel = pAccel->GetAccel(pAccel->GetItemId(i));
+            if ( mpSequenceList->GetPos( pSubAccel ) != LIST_ENTRY_NOTFOUND )
+            {
+                EndSequence( true );
+                break;
+            }
+        }
+    }
+
     // Raus damit
     mpAccelList->Remove( pAccel );
 }


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.2051
retrieving revision 1.2052
diff -u -p -r1.2051 -r1.2052
--- openoffice.org.spec	28 Oct 2009 13:56:40 -0000	1.2051
+++ openoffice.org.spec	29 Oct 2009 12:38:14 -0000	1.2052
@@ -1,6 +1,6 @@
 %define oootag OOO320
 %define ooomilestone 2
-%define rh_rpm_release 5
+%define rh_rpm_release 6
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -121,6 +121,7 @@ Patch47: openoffice.org-3.2.0.ooo106032.
 Patch48: workspace.impress178.patch
 Patch49: openoffice.org-3.1.1.ooo106130.svx.removedeletedshapes.patch
 Patch50: workspace.gsminhibit.patch
+Patch51: openoffice.org-3.2.0.ooo90599.accelsequence.crash.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1631,6 +1632,7 @@ cat %{PATCH10} >> svtools/source/dialogs
 %patch48 -p0 -b .workspace.impress178.patch
 %patch49 -p0 -b .ooo106130.svx.removedeletedshapes.patch
 %patch50 -p1 -b .workspace.gsminhibit.patch
+%patch51 -p1 -b .ooo90599.accelsequence.crash.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4131,6 +4133,10 @@ fi
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
+* Thu Oct 29 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.2.0-2.6.UNBUILT
+- Resolves: rhbz#531732 possible crash in about dialog with unfinished
+  accelerator sequence
+
 * Wed Oct 28 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.2.0-2.5
 - Resolves: ooo#103757 custom shape cut and paste (caolanm)
 - Resolves: rhbz#529746 crash on exit after loading .ppt (caolanm)