diff options
author | Frank Schoenheit [fs] <frank.schoenheit@oracle.com> | 2010-08-30 14:19:36 +0200 |
---|---|---|
committer | Frank Schoenheit [fs] <frank.schoenheit@oracle.com> | 2010-08-30 14:19:36 +0200 |
commit | 00703ec61544118bf6419620894bb54b7f41b9c6 (patch) | |
tree | 1efb8b7d2e3a3bbbf5a3574683bdc89c0fd2f0ed /forms | |
parent | 6c3b530fb1b62e35ee53665c86e78cb0a4da26d4 (diff) | |
parent | ec38ffb43215161d6f0f8769f870e76850c8161c (diff) |
dba33h: merge after pulling DEV300.m87
Diffstat (limited to 'forms')
-rw-r--r-- | forms/source/component/Button.cxx | 2 | ||||
-rw-r--r-- | forms/source/component/Button.hxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/forms/source/component/Button.cxx b/forms/source/component/Button.cxx index 6a326f749bdc..fcc4693fec22 100644 --- a/forms/source/component/Button.cxx +++ b/forms/source/component/Button.cxx @@ -439,7 +439,7 @@ void SAL_CALL OButtonControl::disposing( const EventObject& _rSource ) throw( Ru 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 --git a/forms/source/component/Button.hxx b/forms/source/component/Button.hxx index c3528f9f86d2..72d53e6a1b0c 100644 --- a/forms/source/component/Button.hxx +++ b/forms/source/component/Button.hxx @@ -127,7 +127,7 @@ class OButtonControl :public OButtonControl_BASE ,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; |