diff options
| author | David Ostrovsky <david@ostrovsky.org> | 2015-01-10 12:36:22 +0100 |
|---|---|---|
| committer | David Ostrovsky <david@ostrovsky.org> | 2015-01-10 21:37:08 +0000 |
| commit | 2ce00302275f8676decbdfe919590bb215b1c134 (patch) | |
| tree | dd943126e52dc268a38e5766bd7f9427feb8e65a /vcl | |
| parent | 28deec717c40e04c41f66b094fe2c1e969241525 (diff) | |
Fix long/sal_IntPtr mismatch on x86_64 platform on windows
25e291438231611823dadc195fd26d26a1b8ece4 changed Link class to
use sal_IntPtr instead of long, but missed to adjust number of
occurrences.
Change-Id: I966185083a41b41c7385947a03369a8ce65c61b8
Reviewed-on: https://gerrit.libreoffice.org/13852
Reviewed-by: David Ostrovsky <david@ostrovsky.org>
Tested-by: David Ostrovsky <david@ostrovsky.org>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/control/button.cxx | 2 | ||||
| -rw-r--r-- | vcl/source/window/winproc.cxx | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx index d3c56f3d1df1..4978659b67eb 100644 --- a/vcl/source/control/button.cxx +++ b/vcl/source/control/button.cxx @@ -599,7 +599,7 @@ bool Button::set_property(const OString &rKey, const OString &rValue) return true; } -long Button::dispatchCommandHandler(void *, void *pCaller) +sal_IntPtr Button::dispatchCommandHandler(void *, void *pCaller) { const Button *pButton = reinterpret_cast<Button*>(pCaller); if (pButton == NULL) diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx index 662b11588635..548ce814f5a8 100644 --- a/vcl/source/window/winproc.cxx +++ b/vcl/source/window/winproc.cxx @@ -253,7 +253,7 @@ struct ContextMenuEvent Point aChildPos; }; -static long ContextMenuEventLink( void* pCEvent, void* ) +static sal_IntPtr ContextMenuEventLink( void* pCEvent, void* ) { ContextMenuEvent* pEv = (ContextMenuEvent*)pCEvent; @@ -1833,7 +1833,7 @@ struct DelayedCloseEvent ImplDelData aDelData; }; -static long DelayedCloseEventLink( void* pCEvent, void* ) +static sal_IntPtr DelayedCloseEventLink( void* pCEvent, void* ) { DelayedCloseEvent* pEv = (DelayedCloseEvent*)pCEvent; |