rpms/openoffice.org/F-10 openoffice.org-3.0.1.oooXXXXX.sfx2.badexception.patch, NONE, 1.1 openoffice.org.spec, 1.1725, 1.1726

[Caolan McNamara]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20741

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.0.1.oooXXXXX.sfx2.badexception.patch 
Log Message:
Resolves: rhbz#496315 openoffice.org-3.0.1.oooXXXXX.sfx2.badexception.patch

openoffice.org-3.0.1.oooXXXXX.sfx2.badexception.patch:

--- NEW FILE openoffice.org-3.0.1.oooXXXXX.sfx2.badexception.patch ---
Index: source/doc/objxtor.cxx
===================================================================
RCS file: /cvs/framework/sfx2/source/doc/objxtor.cxx,v
retrieving revision 1.85
diff -u -r1.85 objxtor.cxx
--- openoffice.org.orig/sfx2/source/doc/objxtor.cxx	17 Jul 2008 12:46:35 -0000	1.85
+++ openoffice.org/sfx2/source/doc/objxtor.cxx	21 Apr 2009 08:04:21 -0000
@@ -418,8 +418,14 @@
         delete pImp->mpObjectContainer;
     }
 
+	try
+	{
     if ( pImp->bOwnsStorage && pImp->m_xDocStorage.is() )
     	pImp->m_xDocStorage->dispose();
+	}
+	catch (lang::DisposedException &)
+	{
+    }
 
 	if ( pMedium )
 	{


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-10/openoffice.org.spec,v
retrieving revision 1.1725
retrieving revision 1.1726
diff -u -r1.1725 -r1.1726
--- openoffice.org.spec	16 Apr 2009 19:46:43 -0000	1.1725
+++ openoffice.org.spec	21 Apr 2009 08:08:05 -0000	1.1726
@@ -146,6 +146,7 @@
 Patch73: openoffice.org-3.1.0.ooo99541.sw.reopen.flat.addrbooks.patch
 Patch74: openoffice.org-3.1.0.ooo100942.svtools.oversafeemf.patch
 Patch75: openoffice.org-3.1.0.ooo101145.vcl.safe.dpi.patch
+Patch76: openoffice.org-3.0.1.oooXXXXX.sfx2.badexception.patch
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/openoffice.org
@@ -1415,7 +1416,7 @@
 %patch72 -p0 -b .ooo99529.sw.notrailingnewline.patch
 %patch73 -p0 -b .ooo99541.sw.reopen.flat.addrbooks.patch
 %patch74 -p1 -b .ooo100942.svtools.oversafeemf.patch
-%patch75 -p1 -b .ooo101145.vcl.safe.dpi.patch
+%patch76 -p1 -b .oooXXXXX.sfx2.badexception.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -3782,9 +3783,10 @@
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
-* Wed Apr 08 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.0.1-15.4-UNRELEASED
+* Tue Apr 21 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.0.1-15.4-UNRELEASED
 - Resolves: rhbz#494643 EMF polypolygons issue
 - Resolves: rhbz#495840 openoffice.org-3.1.0.ooo101145.vcl.safe.dpi.patch
+- Resolves: rhbz#496315 openoffice.org-3.0.1.oooXXXXX.sfx2.badexception.patch
 
 * Mon Mar 09 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.0.1-15.3
 - Resolves: rhbz#483223 openoffice.org-3.0.1.ooo98649.svtools.missingUI.patch