rpms/openoffice.org/devel openoffice.org-3.1.0.ooo101074.sd.bad.nothrow.patch, NONE, 1.1 openoffice.org.spec, 1.1875, 1.1876

[Caolan McNamara]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17410

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.1.0.ooo101074.sd.bad.nothrow.patch 
Log Message:
Resolves: rhbz#495609 openoffice.org-3.1.0.ooo101074.sd.bad.nothrow.patch

openoffice.org-3.1.0.ooo101074.sd.bad.nothrow.patch:

--- NEW FILE openoffice.org-3.1.0.ooo101074.sd.bad.nothrow.patch ---
diff -ru sd.orig/source/ui/unoidl/unopback.cxx sd/source/ui/unoidl/unopback.cxx
--- openoffice.org.orig/sd/source/ui/unoidl/unopback.cxx	2009-04-14 11:28:37.000000000 +0100
+++ openoffice.org/sd/source/ui/unoidl/unopback.cxx	2009-04-14 11:30:56.000000000 +0100
@@ -119,7 +119,7 @@
 
 }
 
-void SdUnoPageBackground::fillItemSet( SdDrawDocument* pDoc, SfxItemSet& rSet ) throw()
+void SdUnoPageBackground::fillItemSet( SdDrawDocument* pDoc, SfxItemSet& rSet )
 {
 	rSet.ClearItem();
 
diff -ru sd.orig/source/ui/unoidl/unopback.hxx sd/source/ui/unoidl/unopback.hxx
--- openoffice.org.orig/sd/source/ui/unoidl/unopback.hxx	2009-04-14 11:28:37.000000000 +0100
+++ openoffice.org/sd/source/ui/unoidl/unopback.hxx	2009-04-14 11:30:41.000000000 +0100
@@ -67,7 +67,7 @@
 	~SdUnoPageBackground() throw();
 
 	// internal
-	void fillItemSet( SdDrawDocument* pDoc, SfxItemSet& rSet ) throw();
+	void fillItemSet( SdDrawDocument* pDoc, SfxItemSet& rSet );
 	virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
 
 	// uno helper


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1875
retrieving revision 1.1876
diff -u -r1.1875 -r1.1876
--- openoffice.org.spec	9 Apr 2009 14:52:54 -0000	1.1875
+++ openoffice.org.spec	14 Apr 2009 10:45:22 -0000	1.1876
@@ -1,6 +1,6 @@
 %define oootag OOO310
 %define ooomilestone 9
-%define rh_rpm_release 2
+%define rh_rpm_release 3
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -134,6 +134,7 @@
 Patch59: openoffice.org-3.1.0.ooo100942.svtools.oversafeemf.patch
 Patch60: openoffice.org-3.1.0.ooo61927.sw.ww6.unicodefontencoding.patch
 Patch61: openoffice.org-3.1.0.ooo100991.pyuno-fix.patch
+Patch62: openoffice.org-3.1.0.ooo101074.sd.bad.nothrow.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1626,6 +1627,7 @@
 %patch59 -p1 -b .ooo100942.svtools.oversafeemf.patch
 %patch60 -p1 -b .ooo61927.sw.ww6.unicodefontencoding.patch
 %patch61 -p1 -b .ooo100991.pyuno-fix.patch
+%patch62 -p1 -b .ooo101074.sd.bad.nothrow.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4113,6 +4115,9 @@
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
+* Tue Apr 14 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.0-9.3
+- Resolves: rhbz#495609 openoffice.org-3.1.0.ooo101074.sd.bad.nothrow.patch
+
 * Thu Apr 09 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.0-9.2
 - Require hyphen-bn, hyphen-te, hyphen-ta, hyphen-pa, hyphen-or, 
   hyphen-ml, hyphen-kn, hyphen-gu, hyphen-hi