rpms/openoffice.org/FC-5 openoffice.org-2.0.4.ooo69236.slideshow.esccrash.patch, NONE, 1.1 openoffice.org.spec, 1.680, 1.681

[fedora-cvs-commits redhat com]

Author: caolanm

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

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/FC-5/openoffice.org.spec,v
retrieving revision 1.680
retrieving revision 1.681
diff -u -r1.680 -r1.681
--- openoffice.org.spec	6 Sep 2006 08:03:10 -0000	1.680
+++ openoffice.org.spec	27 Sep 2006 08:28:29 -0000	1.681
@@ -1,6 +1,6 @@
 %define oootag OOB680
 %define ooomilestone 5
-%define rh_rpm_release 18
+%define rh_rpm_release 19
 
 %define build_fc5 1
 
@@ -184,6 +184,7 @@
 Patch56: openoffice.org.2.0.3.gcc28370.statics.patch
 Patch57: openoffice.org-2.0.3.ooo67740.xmlhelp.doublefree.patch
 Patch58: openoffice.org-2.0.4.ooo69213.xmlhelp.db4.patch
+Patch59: openoffice.org-2.0.4.ooo69236.slideshow.esccrash.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -851,6 +852,7 @@
 %patch56 -p1 -b .gcc28370.statics.patch
 %patch57 -p1 -b .ooo67740.xmlhelp.doublefree.patch
 %patch58 -p1 -b .ooo69213.xmlhelp.db4.patch
+%patch59 -p1 -b .ooo69236.slideshow.esccrash.patch
 
 %if %{includingexternals}
 #start ludicrous workaround
@@ -3296,6 +3298,9 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
+- Wed Sep 27 2006 Caolan McNamara <caolanm redhat com> - 1:2.0.2-5.19
+- add openoffice.org-2.0.4.ooo69236.slideshow.esccrash.patch for rh#206177#
+
 * Tue Sep 05 2006 Caolan McNamara <caolanm redhat com> - 1:2.0.2-5.18
 - add openoffice.org-2.0.3.ooo67740.xmlhelp.doublefree.patch
 - add openoffice.org-2.0.4.ooo69213.xmlhelp.db4.patch