[openoffice.org/f13/master] Resolves: rhbz#621248 32bit events in forms on 64bit

[Caolan McNamara]

commit 7560053b034fb4d1f7af04b0400a267824e184c1
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Aug 4 19:12:52 2010 +0100

    Resolves: rhbz#621248 32bit events in forms on 64bit

 openoffice.org.spec        |    7 ++++++-
 workspace.cmcfixes77.patch |   24 ++++++++++++++++++++++++
 2 files changed, 30 insertions(+), 1 deletions(-)
---
diff --git a/openoffice.org.spec b/openoffice.org.spec
index 33cfdf3..81dcef5 100644
--- a/openoffice.org.spec
+++ b/openoffice.org.spec
@@ -1,6 +1,6 @@
 %define oootag OOO320
 %define ooomilestone 12
-%define rh_rpm_release 27
+%define rh_rpm_release 28
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -167,6 +167,7 @@ Patch96: openoffice.org-3.3.0.ooo112567.vcl.embeddedbitmaps.patch
 Patch97: openoffice.org-3.3.0.ooo112657.sw.rtf.dont-crash-on-merged-cells-without-clmgf.patch
 Patch98: openoffice.org-3.3.0.ooo113117.extensions.broken.scanner.shutdown.patch
 Patch99: workspace.findbar01.patch
+Patch100: workspace.cmcfixes77.patch
 
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 %define instdir %{_libdir}
@@ -1764,6 +1765,7 @@ cp -p %{SOURCE5} external/unowinreg/unowinreg.dll
 %patch97 -p1 -b .ooo112657.sw.rtf.dont-crash-on-merged-cells-without-clmgf.patch
 %patch98 -p0 -b .ooo113117.extensions.broken.scanner.shutdown.patch
 %patch99 -p1 -b .workspace.findbar01.patch
+%patch100 -p1 -b .workspace.cmcfixes77.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4249,6 +4251,9 @@ fi
 %endif
 
 %changelog
+* Wed Aug 04 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.2.0-12.28-UNRELEASED
+- Resolves: rhbz#621248 32bit events in forms on 64bit
+
 * Wed Aug 04 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.2.0-12.27
 - Resolves: rhbz#608114 cppu-lifecycle issues (caolanm)
 - Resolves: rhbz#566831 [abrt] crash in GetFrmSize (dtardon)
diff --git a/workspace.cmcfixes77.patch b/workspace.cmcfixes77.patch
new file mode 100644
index 0000000..0bbbe68
--- /dev/null
+++ b/workspace.cmcfixes77.patch
@@ -0,0 +1,24 @@
+diff -r a4c016dc07ba forms/source/component/Button.cxx
+--- a/forms/source/component/Button.cxx	Tue Aug 03 12:19:44 2010 +0100
++++ b/forms/source/component/Button.cxx	Wed Aug 04 18:51:57 2010 +0100
+@@ -439,7 +439,7 @@
+ void OButtonControl::actionPerformed(const ActionEvent& /*rEvent*/) throw ( ::com::sun::star::uno::RuntimeException)
+ {
+ 	// Asynchron fuer starutil::URL-Button
+-	sal_uInt32 n = Application::PostUserEvent( LINK(this, OButtonControl,OnClick) );
++	ULONG n = Application::PostUserEvent( LINK(this, OButtonControl,OnClick) );
+ 	{
+ 		::osl::MutexGuard aGuard( m_aMutex );
+ 		m_nClickEvent = n;
+diff -r a4c016dc07ba forms/source/component/Button.hxx
+--- a/forms/source/component/Button.hxx	Tue Aug 03 12:19:44 2010 +0100
++++ b/forms/source/component/Button.hxx	Wed Aug 04 18:51:57 2010 +0100
+@@ -127,7 +127,7 @@
+                         ,public OFormNavigationHelper
+ {
+ private:
+-	sal_uInt32  m_nClickEvent;
++	ULONG m_nClickEvent;
+     sal_Int16   m_nTargetUrlFeatureId;
+     /// caches the value of the "Enabled" property of our model
+     sal_Bool    m_bEnabledByPropertyValue;