rpms/openoffice.org/F-9 openoffice.org-3.0.0.ooo92026.sd.disposed_during_disposing.patch, NONE, 1.1 openoffice.org.spec, 1.1500, 1.1501

[Caolan McNamara (caolanm)]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14681

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/F-9/openoffice.org.spec,v
retrieving revision 1.1500
retrieving revision 1.1501
diff -u -r1.1500 -r1.1501
--- openoffice.org.spec	9 Jul 2008 12:37:10 -0000	1.1500
+++ openoffice.org.spec	23 Jul 2008 09:52:59 -0000	1.1501
@@ -165,6 +165,7 @@
 Patch90: openoffice.org-3.0.0.ooo90697.sd.a11ycrash.patch
 Patch91: workspace.locdat30.patch
 Patch92: openoffice.org-3.0.0.ooo86142.serbiannumbering.patch
+Patch93: openoffice.org-3.0.0.ooo92026.sd.disposed_during_disposing.patch
 
 %define instdir %{_libdir}/openoffice.org
 
@@ -820,6 +821,7 @@
 Summary: Serbian language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
+Requires: hunspell-sr
 Obsoletes: openoffice.org2-langpack-sr_CS
 Obsoletes: openoffice.org-langpack-sr_CS
 
@@ -1143,6 +1145,7 @@
 %patch90 -p1 -b .ooo90697.sd.a11ycrash.patch
 %patch91 -p1 -b .workspace.locdat30.patch
 %patch92 -p1 -b .ooo86142.serbiannumbering.patch
+%patch93 -p1 -b .ooo92026.sd.disposed_during_disposing.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -2938,12 +2941,13 @@
 
 
 %changelog
-* Mon Jul 07 2008 Caolan McNamara <caolanm at redhat.com> - 1:2.4.1-17.5-UNRELEASED
+* Wed Jul 23 2008 Caolan McNamara <caolanm at redhat.com> - 1:2.4.1-17.5-UNRELEASED
 - Resolves: rhbz#452376 backport workspace.locdat30.patch for Serbian
 - Resolves: rhbz#452376 update Serbian translations
 - Resolves: rhbz#452379 extend Serbian translations
 - Resolves: rhbz#452374 add openoffice.org-3.0.0.ooo86142.serbiannumbering.patch
 - Resolves: rhbz#452385 add postgress-jdbc to default classpath
+- Resolves: rhbz#456292 openoffice.org-3.0.0.ooo92026.sd.disposed_during_disposing.patch
 
 * Fri Jun 13 2008 Caolan McNamara <caolanm at redhat.com> - 1:2.4.1-17.4
 - Resolves: rhbz#451485 fix vertical glyphs