2 files changed, 6 insertions, 6 deletions
diff --git a/sw/source/uibase/uiview/viewling.cxx b/sw/source/uibase/uiview/viewling.cxx
index 4980439b3641..896d240acbe9 100644
--- a/sw/source/uibase/uiview/viewling.cxx
+++ b/sw/source/uibase/uiview/viewling.cxx
@@ -604,11 +604,12 @@ struct ExecuteInfo
 class AsyncExecute
 {
 public:
-    DECL_STATIC_LINK( AsyncExecute, ExecuteHdl_Impl, ExecuteInfo* );
+    DECL_STATIC_LINK_TYPED( AsyncExecute, ExecuteHdl_Impl, void*, void );
 };
 
-IMPL_STATIC_LINK( AsyncExecute, ExecuteHdl_Impl, ExecuteInfo*, pExecuteInfo )
+IMPL_STATIC_LINK_TYPED( AsyncExecute, ExecuteHdl_Impl, void*, p, void )
 {
+    ExecuteInfo* pExecuteInfo = static_cast<ExecuteInfo*>(p);
     SolarMutexReleaser aReleaser;
     try
     {
@@ -622,7 +623,6 @@ IMPL_STATIC_LINK( AsyncExecute, ExecuteHdl_Impl, ExecuteInfo*, pExecuteInfo )
     }
 
     delete pExecuteInfo;
-    return 0;
 }
 //!! End of extra code for context menu modifying extensions
 
diff --git a/sw/source/uibase/uiview/viewmdi.cxx b/sw/source/uibase/uiview/viewmdi.cxx
index e27caff132e7..49424a6e864d 100644
--- a/sw/source/uibase/uiview/viewmdi.cxx
+++ b/sw/source/uibase/uiview/viewmdi.cxx
@@ -313,10 +313,11 @@ int SwView::_CreateScrollbar( bool bHori )
     return 1;
 }
 
-IMPL_LINK( SwView, MoveNavigationHdl, bool *, pbNext )
+IMPL_LINK_TYPED( SwView, MoveNavigationHdl, void*, p, void )
 {
+    bool* pbNext = static_cast<bool*>(p);
     if ( !pbNext )
-        return 0;
+        return;
     const bool bNext = *pbNext;
     SwWrtShell& rSh = GetWrtShell();
     switch( m_nMoveType )
@@ -462,7 +463,6 @@ IMPL_LINK( SwView, MoveNavigationHdl, bool *, pbNext )
     }
     m_pEditWin->GrabFocus();
     delete pbNext;
-    return 0;
 }
 
 int SwView::CreateTab()