rpms/openoffice.org/F-8 openoffice.org-2.3.1.ooo84770.svx.eventsmismatch.patch, NONE, 1.1 openoffice.org.spec, 1.1337, 1.1338

[Caolan McNamara (caolanm)]

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-2.3.1.ooo84770.svx.eventsmismatch.patch 
Log Message:
add openoffice.org-2.3.1.ooo84770.svx.eventsmismatch.patch

openoffice.org-2.3.1.ooo84770.svx.eventsmismatch.patch:

--- NEW FILE openoffice.org-2.3.1.ooo84770.svx.eventsmismatch.patch ---
Index: source/inc/fmctrler.hxx
===================================================================
RCS file: /cvs/graphics/svx/source/inc/fmctrler.hxx,v
retrieving revision 1.19
diff -u -r1.19 fmctrler.hxx
--- openoffice.org.orig/svx/source/inc/fmctrler.hxx	14 Nov 2006 13:27:07 -0000	1.19
+++ openoffice.org/svx/source/inc/fmctrler.hxx	20 Dec 2007 10:19:48 -0000
@@ -353,8 +353,8 @@
 
 	::rtl::OUString				m_aMode;
 
-	sal_uInt32 					m_nLoadEvent;
-	sal_uInt32					m_nToggleEvent;
+	ULONG 						m_nLoadEvent;
+	ULONG						m_nToggleEvent;
 
 	sal_Int32					m_nCurrentFilterPosition;	// current level for filtering (or-criteria)
 
Index: source/inc/fmexpl.hxx
===================================================================
RCS file: /cvs/graphics/svx/source/inc/fmexpl.hxx,v
retrieving revision 1.16
diff -u -r1.16 fmexpl.hxx
--- openoffice.org.orig/svx/source/inc/fmexpl.hxx	21 Nov 2007 15:27:09 -0000	1.16
+++ openoffice.org/svx/source/inc/fmexpl.hxx	20 Dec 2007 10:19:51 -0000
@@ -507,7 +507,7 @@
 		SvLBoxEntry*        m_pRootEntry;
 		SvLBoxEntry*        m_pEditEntry;
 
-		sal_uInt32          nEditEvent;
+		ULONG               nEditEvent;
 
 		SELDATA_ITEMS       m_sdiState;
 		Point               m_aTimerTriggered;      // die Position, an der der DropTimer angeschaltet wurde
Index: source/inc/fmobj.hxx
===================================================================
RCS file: /cvs/graphics/svx/source/inc/fmobj.hxx,v
retrieving revision 1.9
diff -u -r1.9 fmobj.hxx
--- openoffice.org.orig/svx/source/inc/fmobj.hxx	27 Jun 2007 18:22:36 -0000	1.9
+++ openoffice.org/svx/source/inc/fmobj.hxx	20 Dec 2007 10:19:51 -0000
@@ -68,7 +68,7 @@
 				// m_pEnvironmentHistory was created
 
 	FmFormView*     m_pControlCreationView;
-	sal_uInt32		m_nControlCreationEvent;
+	ULONG		m_nControlCreationEvent;
 
 	// Informationen fuer die Controlumgebung
 	// werden nur vorgehalten, wenn ein Object sich nicht in einer Objectliste befindet


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-8/openoffice.org.spec,v
retrieving revision 1.1337
retrieving revision 1.1338
diff -u -r1.1337 -r1.1338
--- openoffice.org.spec	18 Dec 2007 13:45:49 -0000	1.1337
+++ openoffice.org.spec	20 Dec 2007 10:55:04 -0000	1.1338
@@ -1,6 +1,6 @@
 %define oootag OOG680
 %define ooomilestone 6
-%define rh_rpm_release 8
+%define rh_rpm_release 9
 
 # undef to get english only and no-langpacks for a faster smoketest build
 %define langpacks 1
@@ -158,6 +158,7 @@
 Patch76: workspace.locales24.patch
 Patch77: openoffice.org-2.3.1.ooo84621.sw.insertexcel.patch
 Patch78: openoffice.org-2.3.1.ooo84676.ucb.davprotocol.patch
+Patch79: openoffice.org-2.3.1.ooo84770.svx.eventsmismatch.patch
 
 %define instdir %{_libdir}/openoffice.org
 
@@ -1111,6 +1112,7 @@
 %patch76 -p1 -b .workspace.locales24.patch
 %patch77 -p1 -b .ooo84621.sw.insertexcel.patch
 %patch78 -p1 -b .ooo84676.ucb.davprotocol.patch
+%patch79 -p1 -b .ooo84770.svx.eventsmismatch.patch
 
 %if %{linkopt}
 chmod a+x solenv/bin/mklinkscript.pl
@@ -2811,6 +2813,9 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
+* Thu Dec 20 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.3.0-6.9
+- add openoffice.org-2.3.1.ooo84770.svx.eventsmismatch.patch
+
 * Tue Dec 18 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.3.0-6.8
 - Resolves: rhbz#425701 add workspace.locales24.patch
 - Resolves: rhbz#423371 openoffice.org-2.3.1.ooo84621.sw.insertexcel.patch