rpms/openoffice.org/devel openoffice.org-3.0.0.ooo92026.sd.disposed_during_disposing.patch, NONE, 1.1 openoffice.org.spec, 1.1587, 1.1588

[Caolan McNamara (caolanm)]

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.0.0.ooo92026.sd.disposed_during_disposing.patch 
Log Message:
Resolves: rhbz#456292 openoffice.org-3.0.0.ooo92026.sd.disposed_during_disposing.patch

openoffice.org-3.0.0.ooo92026.sd.disposed_during_disposing.patch:

--- NEW FILE openoffice.org-3.0.0.ooo92026.sd.disposed_during_disposing.patch ---
Index: source/ui/framework/configuration/ConfigurationController.cxx
===================================================================
RCS file: /cvs/graphics/sd/source/ui/framework/configuration/ConfigurationController.cxx,v
retrieving revision 1.2.182.1
diff -u -r1.2.182.1 ConfigurationController.cxx
--- openoffice.org.orig/sd/source/ui/framework/configuration/ConfigurationController.cxx	18 Jan 2008 11:26:35 -0000	1.2.182.1
+++ openoffice.org/sd/source/ui/framework/configuration/ConfigurationController.cxx	23 Jul 2008 09:45:04 -0000
@@ -259,7 +259,9 @@
     throw (RuntimeException)
 {
     ::osl::MutexGuard aGuard (maMutex);
-    ThrowIfDisposed();
+
+    if (rBHelper.bDisposed )	//i.e. allow unlocking if disposing, but not disposed
+    	ThrowIfDisposed();
 
     OSL_ASSERT(mnLockCount>0);
     --mnLockCount;


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1587
retrieving revision 1.1588
diff -u -r1.1587 -r1.1588
--- openoffice.org.spec	22 Jul 2008 22:10:18 -0000	1.1587
+++ openoffice.org.spec	23 Jul 2008 09:51:27 -0000	1.1588
@@ -1,6 +1,6 @@
 %define oootag DEV300
 %define ooomilestone 26
-%define rh_rpm_release 1
+%define rh_rpm_release 2
 
 # undef to get english only and no-langpacks for a faster smoketest build
 %define langpacks 1
@@ -114,6 +114,7 @@
 Patch42: openoffice.org-3.0.0.ooo86142.serbiannumbering.patch
 Patch43: workspace.native172.patch
 Patch44: openoffice.org-3.0.0.ooo91977.sd.holdreference.patch
+Patch45: openoffice.org-3.0.0.ooo92026.sd.disposed_during_disposing.patch
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/openoffice.org
@@ -1271,6 +1272,7 @@
 %patch42 -p1 -b .ooo86142.serbiannumbering.patch
 %patch43 -p1 -b .workspace.native172.patch
 %patch44 -p1 -b .ooo91977.sd.holdreference.patch
+%patch45 -p1 -b .ooo92026.sd.disposed_during_disposing.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -3570,6 +3572,9 @@
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
+* Wed Jul 23 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.26-2
+- Resolves: rhbz#456292 openoffice.org-3.0.0.ooo92026.sd.disposed_during_disposing.patch
+
 * Tue Jul 22 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.26-1
 - next version
 - drop integrated openoffice.org-3.0.0.ooo90306.sw.wrongprotection.patch