rpms/openoffice.org/devel openoffice.org-2.3.0.ooo82966.svx.missing3d.patch, NONE, 1.1 openoffice.org.spec, 1.1329, 1.1330

Caolan McNamara (caolanm) fedora-extras-commits at redhat.com
Thu Oct 25 09:47:47 UTC 2007


Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-2.3.0.ooo82966.svx.missing3d.patch 
Log Message:
add openoffice.org-2.3.0.ooo82966.svx.missing3d.patch

openoffice.org-2.3.0.ooo82966.svx.missing3d.patch:

--- NEW FILE openoffice.org-2.3.0.ooo82966.svx.missing3d.patch ---
Index: source/engine3d/polysc3d.cxx
===================================================================
RCS file: /cvs/graphics/svx/source/engine3d/polysc3d.cxx,v
retrieving revision 1.16
diff -u -r1.16 polysc3d.cxx
--- openoffice.org.orig/svx/source/engine3d/polysc3d.cxx	27 Jun 2007 18:04:57 -0000	1.16
+++ openoffice.org/svx/source/engine3d/polysc3d.cxx	25 Oct 2007 09:40:50 -0000
@@ -197,6 +197,9 @@
 	Base3D *pBase3D = Base3D::Create(pOut, nShadeMode > 2);
 
 	DBG_ASSERT(pBase3D, "Habe keinen Base3D Kontext bekommen!!");
+	
+	if (!pBase3D) return FALSE;
+
 	pBase3D->SetDisplayQuality(GetDisplayQuality());
 
 	// #i71618#


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1329
retrieving revision 1.1330
diff -u -r1.1329 -r1.1330
--- openoffice.org.spec	24 Oct 2007 16:28:02 -0000	1.1329
+++ openoffice.org.spec	25 Oct 2007 09:47:14 -0000	1.1330
@@ -150,6 +150,7 @@
 Patch68: workspace.fpicker7.patch
 Patch69: openoffice.org.ooo82608.vcl.gtkbadfree.patch
 Patch70: openoffice.org-2.3.0.ooo76649.httpencoding.patch
+Patch71: openoffice.org-2.3.0.ooo82966.svx.missing3d.patch
 
 %define instdir %{_libdir}/openoffice.org
 
@@ -1095,6 +1096,7 @@
 %patch68 -p1 -b .workspace.fpicker7.patch
 %patch69 -p1 -b .ooo82608.vcl.gtkbadfree.patch
 %patch70 -p1 -b .ooo76649.httpencoding.patc
+%patch71 -p1 -b .ooo82966.svx.missing3d.patch
 
 %if %{linkopt}
 chmod a+x solenv/bin/mklinkscript.pl
@@ -2798,6 +2800,7 @@
 * Wed Oct 24 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.3.0-6.6
 - Resolves: rhbz#338701 fix openoffice.org.ooo82608.vcl.gtkbadfree.patch
 - Resolves: rhbz#213213 openoffice.org-2.3.0.ooo76649.httpencoding.patch
+- add openoffice.org-2.3.0.ooo82966.svx.missing3d.patch
 
 * Thu Oct 19 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.3.0-6.5
 - Resolves: rhbz#338701 fix openoffice.org.ooo82608.vcl.gtkbadfree.patch




More information about the scm-commits mailing list