summaryrefslogtreecommitdiffstats
path: root/forms/source/component/Button.cxx
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-05-07 11:49:46 +0200
committerStephan Bergmann <sbergman@redhat.com>2014-05-07 11:49:46 +0200
commit93f5d5a9190e0e03bf4822663652a4b068c44f75 (patch)
tree9ac61601b056acad6a6c83d728c684661d3f3271 /forms/source/component/Button.cxx
parentBuild libgltf for Android, too (diff)
downloadcore-93f5d5a9190e0e03bf4822663652a4b068c44f75.tar.gz
core-93f5d5a9190e0e03bf4822663652a4b068c44f75.zip
The opaque PostUserEvent IDs are actually pointers
...so declare them as such. This avoids the recurring mistake of storing such IDs as sal_uInt32, truncating in 64 bit environments, causing RemoveUserEvent to potentially not remove the event, it thus firing "too late" and probably causing a crash. While at it, consolidate the trivially unnecessary overloads of both Application::PostUserEvent and Window::PostUserEvent. And in each of them, it looks like deleting the mpLink member was missing from the failure branch. Change-Id: Iab13afbb06e12ac15dec6a6b5b85a7e402a3c654
Diffstat (limited to 'forms/source/component/Button.cxx')
-rw-r--r--forms/source/component/Button.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/forms/source/component/Button.cxx b/forms/source/component/Button.cxx
index 550db56c32e3..9fb6e466dd1e 100644
--- a/forms/source/component/Button.cxx
+++ b/forms/source/component/Button.cxx
@@ -426,7 +426,7 @@ void SAL_CALL OButtonControl::disposing( const EventObject& _rSource ) throw( Ru
void OButtonControl::actionPerformed(const ActionEvent& /*rEvent*/) throw ( ::com::sun::star::uno::RuntimeException, std::exception)
{
// Asynchronous for starutil::URL-Button
- sal_uLong n = Application::PostUserEvent( LINK(this, OButtonControl,OnClick) );
+ ImplSVEvent * n = Application::PostUserEvent( LINK(this, OButtonControl,OnClick) );
{
::osl::MutexGuard aGuard( m_aMutex );
m_nClickEvent = n;