rpms/openoffice.org/devel openoffice.org-3.0.0.ooo90697.sd.a11ycrash.patch, NONE, 1.1 openoffice.org.spec, 1.1535, 1.1536

[Caolan McNamara (caolanm)]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2583

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.0.0.ooo90697.sd.a11ycrash.patch 
Log Message:
Resolves: rhbz#450930 openoffice.org-3.0.0.ooo90697.sd.a11ycrash.patch

openoffice.org-3.0.0.ooo90697.sd.a11ycrash.patch:

--- NEW FILE openoffice.org-3.0.0.ooo90697.sd.a11ycrash.patch ---
Index: source/ui/slideshow/slideshowimpl.cxx
===================================================================
RCS file: /cvs/graphics/sd/source/ui/slideshow/slideshowimpl.cxx,v
retrieving revision 1.50
diff -u -r1.50 slideshowimpl.cxx
--- openoffice.org.orig/sd/source/ui/slideshow/slideshowimpl.cxx	7 Dec 2007 11:59:34 -0000	1.50
+++ openoffice.org/sd/source/ui/slideshow/slideshowimpl.cxx	13 Jun 2008 13:28:02 -0000
@@ -1165,11 +1169,7 @@
 	}
 	
 	if( mpShowWindow )
-	{
 		mpShowWindow->Hide();
-		delete mpShowWindow;
-		mpShowWindow = 0;
-	}
 
 	if ( mpViewShell )
 	{
@@ -1203,6 +1203,12 @@
 
 		mpViewShell->GetViewShellBase().UpdateBorder(true);
 	}
+
+	if( mpShowWindow )
+	{
+		delete mpShowWindow;
+		mpShowWindow = 0;
+	}
 }
 
 /** called only by the slideshow view when the first paint event occurs.


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1535
retrieving revision 1.1536
diff -u -r1.1535 -r1.1536
--- openoffice.org.spec	13 Jun 2008 12:05:23 -0000	1.1535
+++ openoffice.org.spec	13 Jun 2008 13:40:15 -0000	1.1536
@@ -135,6 +135,7 @@
 Patch59: openoffice.org-3.0.0.ooo90612.sd.insertpasswordedfile.patch
 Patch60: openoffice.org-3.0.0.ooo90306.sw.wrongprotection.patch
 Patch61: openoffice.org-3.0.0.ooo48400.svx.fixspelling.patch
+Patch62: openoffice.org-3.0.0.ooo90697.sd.a11ycrash.patch
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/openoffice.org
@@ -1273,6 +1274,7 @@
 %patch59 -p1 -b .ooo90612.sd.insertpasswordedfile.patch
 %patch60 -p1 -b .ooo90306.sw.wrongprotection.patch
 %patch61 -p1 -b .ooo48400.svx.fixspelling.patch
+%patch62 -p1 -b .ooo90697.sd.a11ycrash.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -3460,6 +3462,7 @@
 * Fri Jun 13 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.19-2
 - Resolves: rhbz#450661 openoffice.org-3.0.0.ooo90306.sw.wrongprotection.patch
 - Resolves: rhbz#448464 openoffice.org-3.0.0.ooo48400.svx.fixspelling.patch
+- Resolves: rhbz#450930 openoffice.org-3.0.0.ooo90697.sd.a11ycrash.patch
 
 * Wed Jun 11 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.19-1
 - next version