11 files changed, 17 insertions, 17 deletions
diff --git a/include/svx/svxdlg.hxx b/include/svx/svxdlg.hxx
index 6ec31bef4251..5882adb9f4fd 100644
--- a/include/svx/svxdlg.hxx
+++ b/include/svx/svxdlg.hxx
@@ -90,7 +90,7 @@ class AbstractSpellDialog : public VclAbstractDialog
     virtual SfxBindings& GetBindings() = 0;
 };
 
-typedef long (*PLinkStub)( void*, void* );
+typedef sal_IntPtr (*PLinkStub)( void*, void* );
 
 class AbstractSearchProgress :public VclAbstractRefreshableDialog
 {
diff --git a/include/vcl/button.hxx b/include/vcl/button.hxx
index 5fb4e13270f8..ee9ea29d8aff 100644
--- a/include/vcl/button.hxx
+++ b/include/vcl/button.hxx
@@ -93,7 +93,7 @@ public:
 protected:
 
     /// Handler for click, in case we want the button to handle uno commands (.uno:Something).
-    static long         dispatchCommandHandler(void *, void *pCaller);
+    static sal_IntPtr   dispatchCommandHandler(void *, void *pCaller);
 };
 
 
diff --git a/sc/source/ui/view/cellsh2.cxx b/sc/source/ui/view/cellsh2.cxx
index b65677172bd0..29ddff4e69b2 100644
--- a/sc/source/ui/view/cellsh2.cxx
+++ b/sc/source/ui/view/cellsh2.cxx
@@ -187,7 +187,7 @@ static bool lcl_GetSortParam( const ScViewData* pData, ScSortParam& rSortParam )
 //after end execute from !IsModalInputMode, it is safer to delay deleting
 namespace
 {
-    long DelayDeleteAbstractDialog( void *pAbstractDialog, void * /*pArg*/ )
+    sal_IntPtr DelayDeleteAbstractDialog( void *pAbstractDialog, void * /*pArg*/ )
     {
         delete reinterpret_cast<SfxAbstractTabDialog*>( pAbstractDialog );
         return 0;
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() ) );
diff --git a/toolkit/source/awt/scrollabledialog.cxx b/toolkit/source/awt/scrollabledialog.cxx
index 2d98a0c2574f..30533923b08f 100644
--- a/toolkit/source/awt/scrollabledialog.cxx
+++ b/toolkit/source/awt/scrollabledialog.cxx
@@ -104,13 +104,13 @@ void ScrollableWrapper<T>::lcl_Scroll( long nX, long nY )
 //IMPL_LINK( ScrollableWrapper, ScrollBarHdl, ScrollBar*, pSB )
 
 template< class T>
-long ScrollableWrapper<T>::LinkStubScrollBarHdl( void* pThis, void* pCaller)
+sal_IntPtr ScrollableWrapper<T>::LinkStubScrollBarHdl( void* pThis, void* pCaller)
 {
     return ((ScrollableWrapper<T>*)pThis )->ScrollBarHdl( (ScrollBar*)pCaller );
 }
 
 template< class T>
-long ScrollableWrapper<T>::ScrollBarHdl( ScrollBar* pSB )
+sal_IntPtr ScrollableWrapper<T>::ScrollBarHdl( ScrollBar* pSB )
 {
     sal_uInt16 nPos = (sal_uInt16) pSB->GetThumbPos();
     if( pSB == &maVScrollBar )
diff --git a/uui/source/iahndl.cxx b/uui/source/iahndl.cxx
index cae3bf9f732e..afbc211160aa 100644
--- a/uui/source/iahndl.cxx
+++ b/uui/source/iahndl.cxx
@@ -146,7 +146,7 @@ UUIInteractionHelper::~UUIInteractionHelper()
 {
 }
 
-long
+sal_IntPtr
 UUIInteractionHelper::handlerequest(
     void* pHandleData, void* pInteractionHelper)
 {
@@ -191,7 +191,7 @@ UUIInteractionHelper::handleRequest(
     }
 }
 
-long
+sal_IntPtr
 UUIInteractionHelper::getstringfromrequest(
     void* pHandleData,void* pInteractionHelper)
 {
diff --git a/uui/source/iahndl.hxx b/uui/source/iahndl.hxx
index 789fcb77e6ab..5b0c262c7695 100644
--- a/uui/source/iahndl.hxx
+++ b/uui/source/iahndl.hxx
@@ -131,7 +131,7 @@ private:
         bool & bHasErrorString,
         OUString & rErrorString);
 
-    static long
+    static sal_IntPtr
     handlerequest(void* pHandleData, void* pInteractionHandler);
 
     com::sun::star::beans::Optional< OUString >
@@ -139,7 +139,7 @@ private:
         com::sun::star::uno::Reference<
             com::sun::star::task::XInteractionRequest > const & rRequest);
 
-    static long
+    static sal_IntPtr
     getstringfromrequest(void* pHandleData, void* pInteractionHandler);
 
     vcl::Window *
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;