[openoffice.org/f13/master] update patch for 3.2.1
David Tardon
dtardon at fedoraproject.org
Fri Aug 6 12:05:57 UTC 2010
commit cfb82fe306d5dc563c9f9531f840cf35b6c5c3ed
Author: David Tardon <dtardon at redhat.com>
Date: Fri Aug 6 14:05:14 2010 +0200
update patch for 3.2.1
workspace.cmcfixes77.patch | 20 +++++++++++---------
1 files changed, 11 insertions(+), 9 deletions(-)
---
diff --git a/workspace.cmcfixes77.patch b/workspace.cmcfixes77.patch
index 0bbbe68..4e45cb9 100644
--- a/workspace.cmcfixes77.patch
+++ b/workspace.cmcfixes77.patch
@@ -1,7 +1,9 @@
-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 @@
+import workspace.cmcfixes77.patch
+
+diff -r 80b81759fdb5 forms/source/component/Button.cxx
+--- a/forms/source/component/Button.cxx Fri Aug 06 13:44:46 2010 +0200
++++ b/forms/source/component/Button.cxx Fri Aug 06 14:01:57 2010 +0200
+@@ -442,7 +442,7 @@
void OButtonControl::actionPerformed(const ActionEvent& /*rEvent*/) throw ( ::com::sun::star::uno::RuntimeException)
{
// Asynchron fuer starutil::URL-Button
@@ -10,15 +12,15 @@ diff -r a4c016dc07ba forms/source/component/Button.cxx
{
::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 @@
+diff -r 80b81759fdb5 forms/source/component/Button.hxx
+--- a/forms/source/component/Button.hxx Fri Aug 06 13:44:46 2010 +0200
++++ b/forms/source/component/Button.hxx Fri Aug 06 14:01:57 2010 +0200
+@@ -130,7 +130,7 @@
,public OFormNavigationHelper
{
private:
- sal_uInt32 m_nClickEvent;
+ ULONG m_nClickEvent;
- sal_Int16 m_nTargetUrlFeatureId;
+ sal_Int32 m_nTargetUrlFeatureId;
/// caches the value of the "Enabled" property of our model
sal_Bool m_bEnabledByPropertyValue;
More information about the scm-commits
mailing list