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 /sfx2 | |
| 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 'sfx2')
| -rw-r--r-- | sfx2/source/control/shell.cxx | 4 | ||||
| -rw-r--r-- | sfx2/source/dialog/backingwindow.cxx | 2 | ||||
| -rw-r--r-- | sfx2/source/menu/mnuitem.cxx | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/sfx2/source/control/shell.cxx b/sfx2/source/control/shell.cxx index 9a844cceea45..e6b40a6f4a1d 100644 --- a/sfx2/source/control/shell.cxx +++ b/sfx2/source/control/shell.cxx @@ -404,7 +404,7 @@ bool SfxShell::CanExecuteSlot_Impl( const SfxSlot &rSlot ) return aSet.GetItemState(nId) != SfxItemState::DISABLED; } -long ShellCall_Impl( void* pObj, void* pArg ) +sal_IntPtr ShellCall_Impl( void* pObj, void* pArg ) { ((SfxShell* )pObj)->ExecuteSlot( *(SfxRequest*)pArg, (SfxInterface*)0L ); return 0; @@ -665,7 +665,7 @@ bool SfxShell::HasUIFeature( sal_uInt32 ) return false; } -long DispatcherUpdate_Impl( void*, void* pArg ) +sal_IntPtr DispatcherUpdate_Impl( void*, void* pArg ) { ((SfxDispatcher*) pArg)->Update_Impl( true ); ((SfxDispatcher*) pArg)->GetBindings()->InvalidateAll(false); diff --git a/sfx2/source/dialog/backingwindow.cxx b/sfx2/source/dialog/backingwindow.cxx index 0e6a8bd935b2..c7dcd7e058c0 100644 --- a/sfx2/source/dialog/backingwindow.cxx +++ b/sfx2/source/dialog/backingwindow.cxx @@ -669,7 +669,7 @@ struct ImplDelayedDispatch ~ImplDelayedDispatch() {} }; -static long implDispatchDelayed( void*, void* pArg ) +static sal_IntPtr implDispatchDelayed( void*, void* pArg ) { struct ImplDelayedDispatch* pDispatch = reinterpret_cast<ImplDelayedDispatch*>(pArg); try diff --git a/sfx2/source/menu/mnuitem.cxx b/sfx2/source/menu/mnuitem.cxx index 32797e37757a..83de775acc6e 100644 --- a/sfx2/source/menu/mnuitem.cxx +++ b/sfx2/source/menu/mnuitem.cxx @@ -299,7 +299,7 @@ PopupMenu* SfxMenuControl::GetPopup () const return 0; } -long Select_Impl( void* pHdl, void* pVoid ); +sal_IntPtr Select_Impl( void* pHdl, void* pVoid ); SFX_IMPL_MENU_CONTROL( SfxAppMenuControl_Impl, SfxStringItem ); @@ -416,7 +416,7 @@ SfxUnoMenuControl::~SfxUnoMenuControl() pUnoCtrl->release(); } -long Select_Impl( void* /*pHdl*/, void* pVoid ) +sal_IntPtr Select_Impl( void* /*pHdl*/, void* pVoid ) { Menu* pMenu = (Menu*)pVoid; OUString aURL( pMenu->GetItemCommand( pMenu->GetCurItemId() ) ); |