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 /include | |
| 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 'include')
| -rw-r--r-- | include/svx/gridctrl.hxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/svx/gridctrl.hxx b/include/svx/gridctrl.hxx index e3e59f1abd83..905b9cdadd78 100644 --- a/include/svx/gridctrl.hxx +++ b/include/svx/gridctrl.hxx @@ -233,7 +233,7 @@ private: m_xEmptyRow; // record set to insert - sal_uInt32 m_nAsynAdjustEvent; + sal_uLong m_nAsynAdjustEvent; // if we modify the row for the new record, we automatically insert a "new new row". // But if somebody else inserts a new record into the data source, we have to do the same. @@ -272,7 +272,7 @@ private: BrowserMode m_nMode; sal_Int32 m_nCurrentPos; // Current position; - sal_uInt32 m_nDeleteEvent; // EventId for asychronous deletion of rows + sal_uLong m_nDeleteEvent; // EventId for asychronous deletion of rows sal_uInt16 m_nOptions; // What is the able to do (Insert, Update, Delete) // default readonly sal_uInt16 m_nOptionMask; // the mask of options to be enabled in setDataSource |