rpms/openoffice.org/F-8 openoffice.org-2.3.0.ooo82966.svx.missing3d.patch, NONE, 1.1 openoffice.org.spec, 1.1328, 1.1329

[Caolan McNamara (caolanm)]

Author: caolanm

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

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/F-8/openoffice.org.spec,v
retrieving revision 1.1328
retrieving revision 1.1329
diff -u -r1.1328 -r1.1329
--- openoffice.org.spec	24 Oct 2007 08:10:45 -0000	1.1328
+++ openoffice.org.spec	25 Oct 2007 09:49:32 -0000	1.1329
@@ -1,6 +1,6 @@
 %define oootag OOG680
 %define ooomilestone 6
-%define rh_rpm_release 6
+%define rh_rpm_release 7
 
 # undef to get english only and no-langpacks for a faster smoketest build
 %define langpacks 1
@@ -149,6 +149,7 @@
 Patch67: openoffice.org-2.3.0.ooo53885.raiseannotationpriority.sw.patch
 Patch68: workspace.fpicker7.patch
 Patch69: openoffice.org.ooo82608.vcl.gtkbadfree.patch
+Patch70: openoffice.org-2.3.0.ooo82966.svx.missing3d.patch
 
 %define instdir %{_libdir}/openoffice.org
 
@@ -1093,6 +1094,7 @@
 %patch67 -p1 -b .ooo53885.raiseannotationpriority.sw.patch
 %patch68 -p1 -b .workspace.fpicker7.patch
 %patch69 -p1 -b .ooo82608.vcl.gtkbadfree.patch
+%patch70 -p1 -b .ooo82966.svx.missing3d.patch
 
 %if %{linkopt}
 chmod a+x solenv/bin/mklinkscript.pl
@@ -2793,6 +2795,9 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
+* Thu Oct 25 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.3.0-6.7.unreleased
+- add openoffice.org-2.3.0.ooo82966.svx.missing3d.patch
+
 * 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