rpms/openoffice.org/devel openoffice.org-2.0.4.ooo69236.slideshow.esccrash.patch, NONE, 1.1 openoffice.org.spec, 1.881, 1.882

[fedora-cvs-commits at redhat.com]

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21338

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-2.0.4.ooo69236.slideshow.esccrash.patch 
Log Message:
esc crash on presentation

openoffice.org-2.0.4.ooo69236.slideshow.esccrash.patch:
 slideshow/source/engine/userpaintoverlay.cxx |    7 ++++---
 source/engine/userpaintoverlay.cxx           |    0 
 2 files changed, 4 insertions(+), 3 deletions(-)

--- NEW FILE openoffice.org-2.0.4.ooo69236.slideshow.esccrash.patch ---
Index: source/engine/userpaintoverlay.cxx
===================================================================
RCS file: /cvs/graphics/slideshow/source/engine/userpaintoverlay.cxx,v
retrieving revision 1.6
diff -u -p -r1.6 userpaintoverlay.cxx
--- openoffice.org.orig/slideshow/source/engine/userpaintoverlay.cxx	11 Oct 2005 08:37:00 -0000	1.6
+++ openoffice.org/slideshow/source/engine/userpaintoverlay.cxx	19 Sep 2006 16:15:22 -0000
@@ -125,9 +125,10 @@ namespace presentation
 
                 ::osl::MutexGuard aGuard( maMutex );
 
-                maViews.erase( ::std::remove( maViews.begin(),
-                                              maViews.end(),
-                                              rView ) );
+                maViews.erase( std::remove( maViews.begin(),
+                                            maViews.end(),
+                                            rView ),
+                               maViews.end() );
 
                 return true;
             }


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.881
retrieving revision 1.882
diff -u -r1.881 -r1.882
--- openoffice.org.spec	25 Sep 2006 14:23:30 -0000	1.881
+++ openoffice.org.spec	27 Sep 2006 08:26:28 -0000	1.882
@@ -129,6 +129,7 @@
 Patch61: openoffice.org-2.0.4.rhXXXXXX.padmin.nospadmin.patch
 Patch62: openoffice.org-2.0.4.ooo69530.sd.crash.patch
 Patch63: openoffice.org-2.0.4.ooo69841.x86_64.pptimport.patch
+Patch64: openoffice.org-2.0.4.ooo69236.slideshow.esccrash.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -992,6 +993,7 @@
 %patch61 -p1 -b .rhXXXXXX.padmin.nospadmin.patch
 %patch62 -p1 -b .ooo69530.sd.crash.patch
 %patch63 -p1 -b .ooo69841.x86_64.pptimport.patch
+%patch64 -p1 -b .ooo69236.slideshow.esccrash.patch
 
 tar xzf %{SOURCE1}
 
@@ -2523,6 +2525,7 @@
   impress wizard
 - rh#206615# supporting trailing ZWJ in fallback blocks
 - rh#207856# .ppt import line spacing fix ooo#69841#
+- rh#206177# cancelling slideshow transistion crash ooo#69236#
 
 * Tue Sep 19 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.4-4.2
 - add openoffice.org-2.0.4.gccXXXXX.svtools.fsstorage.patch to work