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

[Caolan McNamara]

commit 1447d1b7a76578b5bed1f6c8cc6bc13d2533d446
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Aug 4 19:13:58 2010 +0100

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

 openoffice.org.spec        |    5 ++++-
 workspace.cmcfixes77.patch |   24 ++++++++++++++++++++++++
 2 files changed, 28 insertions(+), 1 deletions(-)
---
diff --git a/openoffice.org.spec b/openoffice.org.spec
index 153fe3f..310e0c9 100644
--- a/openoffice.org.spec
+++ b/openoffice.org.spec
@@ -1,6 +1,6 @@
 %define oootag OOO330
 %define ooomilestone 2
-%define rh_rpm_release 3
+%define rh_rpm_release 4
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -3779,6 +3779,9 @@ unopkg remove --shared org.openoffice.legacy.ScriptProviderForPython.zip > /dev/
 %endif
 
 %changelog
+* Wed Aug 04 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.3.0-2.4
+- Resolves: rhbz#621248 32bit events in forms on 64bit
+
 * Tue Aug 03 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.3.0-2.3
 - remove openoffice.org-3.3.0.ooo74188.indiccursor.editeng.patch
 
diff --git a/workspace.cmcfixes77.patch b/workspace.cmcfixes77.patch
index ce4e1cb..b1ba433 100644
--- a/workspace.cmcfixes77.patch
+++ b/workspace.cmcfixes77.patch
@@ -1369,3 +1369,27 @@ diff -r a1a3b75faa8a vcl/util/makefile2.pmk
  #include "osl/conditn.hxx"
  #include "osl/diagnose.h"
  #include "rtl/ustring.h"
+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;