rpms/openoffice.org/FC-6 openoffice.org-2.0.4.ooo71562.svx.64bitcrash.patch, NONE, 1.1 openoffice.org.spec, 1.905, 1.906

[fedora-cvs-commits at redhat.com]

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv28756

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-2.0.4.ooo71562.svx.64bitcrash.patch 
Log Message:
openoffice.org-2.0.4.ooo71562.svx.64bitcrash.patch

openoffice.org-2.0.4.ooo71562.svx.64bitcrash.patch:
 source/inc/fmshimp.hxx     |    0 
 svx/source/inc/fmshimp.hxx |    6 +++---
 2 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE openoffice.org-2.0.4.ooo71562.svx.64bitcrash.patch ---
Index: source/inc/fmshimp.hxx
===================================================================
RCS file: /cvs/graphics/svx/source/inc/fmshimp.hxx,v
retrieving revision 1.29
diff -u -r1.29 fmshimp.hxx
--- openoffice.org.orig/svx/source/inc/fmshimp.hxx	19 Jun 2006 16:06:24 -0000	1.29
+++ openoffice.org/svx/source/inc/fmshimp.hxx	15 Nov 2006 13:12:04 -0000
@@ -221,7 +221,7 @@
 struct SAL_DLLPRIVATE CursorActionDescription
 {
 	FmCursorActionThread*	pThread;
-	sal_uInt32					nFinishedEvent;
+	ULONG						nFinishedEvent;
 		// we want to do the cleanup of the thread in the main thread so we post an event to ourself
 	sal_Bool					bCanceling;
 		// this thread is being canceled
@@ -234,11 +234,11 @@
 struct SAL_DLLPRIVATE FmLoadAction
 {
 	FmFormPage*	pPage;
-	sal_uInt32	nEventId;
+	ULONG		nEventId;
 	sal_uInt16	nFlags;
 
 	FmLoadAction( ) : pPage( NULL ), nEventId( 0 ), nFlags( 0 ) { }
-	FmLoadAction( FmFormPage* _pPage, sal_uInt16 _nFlags, sal_uInt32 _nEventId )
+	FmLoadAction( FmFormPage* _pPage, sal_uInt16 _nFlags, ULONG _nEventId )
 		:pPage( _pPage ), nEventId( _nEventId ), nFlags( _nFlags )
 	{
 	}


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-6/openoffice.org.spec,v
retrieving revision 1.905
retrieving revision 1.906
diff -u -r1.905 -r1.906
--- openoffice.org.spec	10 Nov 2006 13:24:51 -0000	1.905
+++ openoffice.org.spec	15 Nov 2006 13:17:44 -0000	1.906
@@ -1,6 +1,6 @@
 %define oootag OOD680
 %define ooomilestone 5
-%define rh_rpm_release 5.3
+%define rh_rpm_release 5.4
 
 # gcc#19664#
 %define stlvisibilityfcked 1
@@ -143,6 +143,7 @@
 Patch75: openoffice.org-2.1.0.ooo65491.psprint.enablenups.patch
 Patch76: openoffice.org-2.1.0.ooo71379.psprint.endfeatureonnewline.patch
 Patch77: openoffice.org-2.1.0.ooo61812.svx.a11ycrash.patch
+Patch78: openoffice.org-2.0.4.ooo71562.svx.64bitcrash.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -1020,6 +1021,7 @@
 %patch75 -p1 -b .ooo65491.psprint.enablenups.patch
 %patch76 -p1 -b .ooo71379.psprint.endfeatureonnewline.patch
 %patch77 -p1 -b .ooo61812.svx.a11ycrash.patch
+%patch78 -p1 -b .ooo71562.svx.64bitcrash.patch
 
 tar xzf %{SOURCE1}
 
@@ -2545,6 +2547,9 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
+* Wed Nov 15 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.4-5.5.4
+- Resolves: rhbz#215694 add openoffice.org-2.0.4.ooo71562.svx.64bitcrash.patch
+
 * Fri Nov 10 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.4-5.5.3
 - rhbz#214973 collate print setting