summaryrefslogtreecommitdiff
path: root/fpicker
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 /fpicker
parentc6fdd34c16f415629222348631141c3e13af6d4a (diff)
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 'fpicker')
-rw-r--r--fpicker/source/office/commonpicker.hxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/fpicker/source/office/commonpicker.hxx b/fpicker/source/office/commonpicker.hxx
index 9df6be2d33a4..c103a91f8bc2 100644
--- a/fpicker/source/office/commonpicker.hxx
+++ b/fpicker/source/office/commonpicker.hxx
@@ -36,7 +36,7 @@
class SvtFileDialog;
class Window;
-
+struct ImplSVEvent;
namespace svt
{
@@ -65,7 +65,7 @@ namespace svt
// </properties>
SvtFileDialog* m_pDlg;
- sal_uInt32 m_nCancelEvent;
+ ImplSVEvent * m_nCancelEvent;
bool m_bExecuting;
::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > m_xDialogParent;