diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2014-05-06 18:14:30 +0200 |
---|---|---|
committer | Andras Timar <andras.timar@collabora.com> | 2014-05-09 14:48:30 +0200 |
commit | 02b469b3f7b5309a500a22236f4f5e0b907a1649 (patch) | |
tree | c6783515aa439c6cc5c4f9a0229f51095b0143f2 /fpicker | |
parent | 9de4b4a8d2796769ca03215a4490d820932faf82 (diff) |
Application::PostUserEvent returns a pointer dressed as sal_uLong
cherry picked from commit ce53796bfaf6df5c4415fda8f641cad8a3e144a6, plus more
cases from 93f5d5a9190e0e03bf4822663652a4b068c44f75: "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."
Change-Id: Ia5ca45e35766a7cebf0b53bcac1bd9dff29ad6ea
Reviewed-on: https://gerrit.libreoffice.org/9259
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'fpicker')
-rw-r--r-- | fpicker/source/office/commonpicker.hxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fpicker/source/office/commonpicker.hxx b/fpicker/source/office/commonpicker.hxx index 5008f68055cc..fb5bc56fbd06 100644 --- a/fpicker/source/office/commonpicker.hxx +++ b/fpicker/source/office/commonpicker.hxx @@ -65,7 +65,7 @@ namespace svt // </properties> SvtFileDialog* m_pDlg; - sal_uInt32 m_nCancelEvent; + sal_uLong m_nCancelEvent; sal_Bool m_bExecuting; ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > m_xDialogParent; |