convert Link<> to typed

Change-Id: I38f2c15b4f8bb1d7187b019d26a2644b087898c1
Reviewed-on: https://gerrit.libreoffice.org/18357
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>

62 files changed, 174 insertions, 174 deletions

diff --git a/framework/inc/classes/menumanager.hxx b/framework/inc/classes/menumanager.hxx
index ea97658ec1a0..44e4a7895f80 100644
--- a/framework/inc/classes/menumanager.hxx
+++ b/framework/inc/classes/menumanager.hxx
@@ -61,7 +61,7 @@ class MenuManager : public ::cppu::WeakImplHelper< css::frame::XStatusListener >
         // XEventListener
         virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
 
-        DECL_LINK( Select, Menu * );
+        DECL_LINK_TYPED( Select, Menu *, bool );
 
         Menu*   GetMenu() const { return m_pVCLMenu; }
 
diff --git a/framework/inc/uielement/menubarmanager.hxx b/framework/inc/uielement/menubarmanager.hxx
index d62aaae7defc..ac4b9d43c086 100644
--- a/framework/inc/uielement/menubarmanager.hxx
+++ b/framework/inc/uielement/menubarmanager.hxx
@@ -126,7 +126,7 @@ class MenuBarManager : public com::sun::star::frame::XStatusListener
         // XSystemDependentMenuPeer
         virtual ::com::sun::star::uno::Any SAL_CALL getMenuHandle( const ::com::sun::star::uno::Sequence< sal_Int8 >& ProcessId, sal_Int16 SystemType ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
-        DECL_LINK( Select, Menu * );
+        DECL_LINK_TYPED( Select, Menu *, bool );
 
         Menu*   GetMenuBar() const { return m_pVCLMenu; }
 
diff --git a/framework/inc/uielement/togglebuttontoolbarcontroller.hxx b/framework/inc/uielement/togglebuttontoolbarcontroller.hxx
index 19da55594006..f5366b02a43d 100644
--- a/framework/inc/uielement/togglebuttontoolbarcontroller.hxx
+++ b/framework/inc/uielement/togglebuttontoolbarcontroller.hxx
@@ -63,7 +63,7 @@ class ToggleButtonToolbarController : public ComplexToolbarController
         virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue> getExecuteArgs(sal_Int16 KeyModifier) const SAL_OVERRIDE;
 
     private:
-        DECL_LINK( MenuSelectHdl, Menu *);
+        DECL_LINK_TYPED( MenuSelectHdl, Menu *, bool);
 
         Style                        m_eStyle;
         OUString                m_aCurrentSelection;
diff --git a/framework/inc/uielement/toolbarmanager.hxx b/framework/inc/uielement/toolbarmanager.hxx
index 5cf00f7290fe..f4431778c95c 100644
--- a/framework/inc/uielement/toolbarmanager.hxx
+++ b/framework/inc/uielement/toolbarmanager.hxx
@@ -137,7 +137,7 @@ class ToolBarManager : public ToolbarManager_Base
         DECL_LINK( MiscOptionsChanged, void* );
 
         DECL_LINK_TYPED( MenuButton, ToolBox *, void );
-        DECL_LINK( MenuSelect, Menu * );
+        DECL_LINK_TYPED( MenuSelect, Menu *, bool );
         DECL_LINK_TYPED( MenuDeactivate, Menu *, bool );
         DECL_LINK_TYPED(AsyncUpdateControllersHdl, Timer *, void);
         DECL_STATIC_LINK_TYPED( ToolBarManager, ExecuteHdl_Impl, void*, void );
diff --git a/framework/source/classes/menumanager.cxx b/framework/source/classes/menumanager.cxx
index 039871da550d..5e72a344222d 100644
--- a/framework/source/classes/menumanager.cxx
+++ b/framework/source/classes/menumanager.cxx
@@ -813,7 +813,7 @@ IMPL_LINK_TYPED( MenuManager, Deactivate, Menu *, pMenu, bool )
     return true;
 }
 
-IMPL_LINK( MenuManager, Select, Menu *, pMenu )
+IMPL_LINK_TYPED( MenuManager, Select, Menu *, pMenu, bool )
 {
     URL                     aTargetURL;
     Sequence<PropertyValue> aArgs;
@@ -883,7 +883,7 @@ IMPL_LINK( MenuManager, Select, Menu *, pMenu )
     if ( xDispatch.is() )
         xDispatch->dispatch( aTargetURL, aArgs );
 
-    return 1;
+    return true;
 }
 
 IMPL_LINK_NOARG_TYPED(MenuManager, Highlight, Menu *, bool)
diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx
index 0d951c08fefa..3a3c5124cd2e 100644
--- a/framework/source/uielement/menubarmanager.cxx
+++ b/framework/source/uielement/menubarmanager.cxx
@@ -954,7 +954,7 @@ IMPL_LINK_NOARG_TYPED( MenuBarManager, AsyncSettingsHdl, Timer*, void)
     }
 }
 
-IMPL_LINK( MenuBarManager, Select, Menu *, pMenu )
+IMPL_LINK_TYPED( MenuBarManager, Select, Menu *, pMenu, bool )
 {
     URL                     aTargetURL;
     Sequence<PropertyValue> aArgs;
@@ -1021,7 +1021,7 @@ IMPL_LINK( MenuBarManager, Select, Menu *, pMenu )
         xDispatch->dispatch( aTargetURL, aArgs );
     }
 
-    return 1;
+    return true;
 }
 
 IMPL_LINK_NOARG_TYPED(MenuBarManager, Highlight, Menu *, bool)
diff --git a/framework/source/uielement/togglebuttontoolbarcontroller.cxx b/framework/source/uielement/togglebuttontoolbarcontroller.cxx
index 48f9e1ccc8ef..0ea0cbf90375 100644
--- a/framework/source/uielement/togglebuttontoolbarcontroller.cxx
+++ b/framework/source/uielement/togglebuttontoolbarcontroller.cxx
@@ -263,7 +263,7 @@ void ToggleButtonToolbarController::executeControlCommand( const ::com::sun::sta
     }
 }
 
-IMPL_LINK( ToggleButtonToolbarController, MenuSelectHdl, Menu *, pMenu )
+IMPL_LINK_TYPED( ToggleButtonToolbarController, MenuSelectHdl, Menu *, pMenu, bool )
 {
     SolarMutexGuard aGuard;
 
@@ -274,7 +274,7 @@ IMPL_LINK( ToggleButtonToolbarController, MenuSelectHdl, Menu *, pMenu )
 
         execute( 0 );
     }
-    return 0;
+    return false;
 }
 
 } // namespace
diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx
index 2224e5cbcf3c..f19c611c2e50 100644
--- a/framework/source/uielement/toolbarmanager.cxx
+++ b/framework/source/uielement/toolbarmanager.cxx
@@ -1831,7 +1831,7 @@ IMPL_LINK_TYPED( ToolBarManager, Command, CommandEvent const *, pCmdEvt, void )
         if (pManagerMenu)
         {
             // Unlink our listeners again -- see above for why.
-            pManagerMenu->SetSelectHdl( Link<>() );
+            pManagerMenu->SetSelectHdl( Link<Menu*, bool>() );
             pManagerMenu->SetDeactivateHdl( Link<Menu *, bool>() );
         }
     }
@@ -1849,7 +1849,7 @@ IMPL_LINK_TYPED( ToolBarManager, MenuButton, ToolBox*, pToolBar, void )
     ImplClearPopupMenu( pToolBar );
  }
 
-IMPL_LINK( ToolBarManager, MenuSelect, Menu*, pMenu )
+IMPL_LINK_TYPED( ToolBarManager, MenuSelect, Menu*, pMenu, bool )
 {
     // We have to hold a reference to ourself as it is possible that we will be disposed and
     // our refcount could be zero (destruction) otherwise.
@@ -1861,7 +1861,7 @@ IMPL_LINK( ToolBarManager, MenuSelect, Menu*, pMenu )
         SolarMutexGuard g;
 
         if ( m_bDisposed )
-            return 1;
+            return true;
 
         switch ( pMenu->GetCurItemId() )
         {
@@ -2026,7 +2026,7 @@ IMPL_LINK( ToolBarManager, MenuSelect, Menu*, pMenu )
         ImplClearPopupMenu( m_pToolBar );
     }
 
-    return 1;
+    return true;
 }
 
 IMPL_LINK_NOARG_TYPED(ToolBarManager, Select, ToolBox *, void)
diff --git a/include/sfx2/mnumgr.hxx b/include/sfx2/mnumgr.hxx
index 786b477b6cc1..ab0292ccf00e 100644
--- a/include/sfx2/mnumgr.hxx
+++ b/include/sfx2/mnumgr.hxx
@@ -57,7 +57,7 @@ protected:
                             ~SfxMenuManager();
 public:
 
-    DECL_LINK( Select, Menu* );
+    DECL_LINK_TYPED( Select, Menu*, bool );
 
     SfxVirtualMenu*         GetMenu() const
                             { return pMenu; }
diff --git a/include/sfx2/sidebar/SidebarController.hxx b/include/sfx2/sidebar/SidebarController.hxx
index d3aabbc8c2ba..bf363edf415e 100644
--- a/include/sfx2/sidebar/SidebarController.hxx
+++ b/include/sfx2/sidebar/SidebarController.hxx
@@ -231,7 +231,7 @@ private:
         const ::std::vector<TabBar::DeckMenuData>& rMenuData) const;
     ::boost::shared_ptr<PopupMenu> CreatePopupMenu (
         const ::std::vector<TabBar::DeckMenuData>& rMenuData) const;
-    DECL_LINK(OnMenuItemSelected, Menu*);
+    DECL_LINK_TYPED(OnMenuItemSelected, Menu*, bool);
     void BroadcastPropertyChange();
 
     /** The close of the deck changes the width of the child window.
diff --git a/include/sfx2/templatedlg.hxx b/include/sfx2/templatedlg.hxx
index ceb96c211106..e2192cff44ce 100644
--- a/include/sfx2/templatedlg.hxx
+++ b/include/sfx2/templatedlg.hxx
@@ -72,10 +72,10 @@ private:
 
     DECL_LINK_TYPED(TVItemStateHdl, const ThumbnailViewItem*, void);
 
-    DECL_LINK(MenuSelectHdl, Menu*);
-    DECL_LINK(MoveMenuSelectHdl, Menu*);
-    DECL_LINK(RepositoryMenuSelectHdl, Menu*);
-    DECL_LINK(DefaultTemplateMenuSelectHdl, Menu*);
+    DECL_LINK_TYPED(MenuSelectHdl, Menu*, bool);
+    DECL_LINK_TYPED(MoveMenuSelectHdl, Menu*, bool);
+    DECL_LINK_TYPED(RepositoryMenuSelectHdl, Menu*, bool);
+    DECL_LINK_TYPED(DefaultTemplateMenuSelectHdl, Menu*, bool);
 
     DECL_LINK_TYPED(OpenRegionHdl, void*, void);
     DECL_LINK_TYPED(OpenTemplateHdl, ThumbnailViewItem*, void);
diff --git a/include/svx/SmartTagCtl.hxx b/include/svx/SmartTagCtl.hxx
index aadd8bb3ce84..ba618a785998 100644
--- a/include/svx/SmartTagCtl.hxx
+++ b/include/svx/SmartTagCtl.hxx
@@ -61,7 +61,7 @@ private:
     std::vector< InvokeAction > maInvokeActions;
 
     void            FillMenu();
-    DECL_LINK( MenuSelect, PopupMenu * );
+    DECL_LINK_TYPED( MenuSelect, Menu *, bool);
     virtual void    StateChanged( sal_uInt16 nSID, SfxItemState eState,
                                   const SfxPoolItem* pState ) SAL_OVERRIDE;
 
diff --git a/include/svx/ruler.hxx b/include/svx/ruler.hxx
index c4bec963cb9b..96432c60a3c5 100644
--- a/include/svx/ruler.hxx
+++ b/include/svx/ruler.hxx
@@ -214,8 +214,8 @@ class SVX_DLLPUBLIC SvxRuler: public Ruler, public SfxListener
     long GetLeftMin() const;
     long GetRightMax() const;
 
-    DECL_LINK( TabMenuSelect, Menu * );
-    DECL_LINK( MenuSelect, Menu * );
+    DECL_LINK_TYPED( TabMenuSelect, Menu *, bool );
+    DECL_LINK_TYPED( MenuSelect, Menu *, bool );
     void PrepareProportional_Impl(RulerType);
 
     enum UpdateType
diff --git a/include/vcl/menu.hxx b/include/vcl/menu.hxx
index 2c77726ad0bc..1d22bdc22eb6 100644
--- a/include/vcl/menu.hxx
+++ b/include/vcl/menu.hxx
@@ -139,7 +139,7 @@ private:
     Link<Menu*, bool> aActivateHdl;       // Active-Handler
     Link<Menu*, bool> aDeactivateHdl;     // Deactivate-Handler
     Link<Menu*, bool> aHighlightHdl;      // Highlight-Handler
-    Link<> aSelectHdl; // Highlight-Handler
+    Link<Menu*, bool> aSelectHdl;         // Highlight-Handler
 
     VclEventListeners   maEventListeners;
     VclEventListeners   maChildEventListeners;
@@ -347,7 +347,7 @@ public:
         aHighlightHdl = rLink;
     }
 
-    void  SetSelectHdl( const Link<>& rLink )
+    void  SetSelectHdl( const Link<Menu*,bool>& rLink )
     {
         aSelectHdl = rLink;
     }
diff --git a/sd/source/ui/dlg/navigatr.cxx b/sd/source/ui/dlg/navigatr.cxx
index e0ae7d049e15..803f8e9bbe0e 100644
--- a/sd/source/ui/dlg/navigatr.cxx
+++ b/sd/source/ui/dlg/navigatr.cxx
@@ -473,7 +473,7 @@ IMPL_LINK_NOARG(SdNavigatorWin, SelectDocumentHdl)
  * Set DrageType and set image accordingly to it.
  * If the handler is called with NULL, the default (URL) is set.
  */
-IMPL_LINK( SdNavigatorWin, MenuSelectHdl, Menu *, pMenu )
+IMPL_LINK_TYPED( SdNavigatorWin, MenuSelectHdl, Menu *, pMenu, bool )
 {
     sal_uInt16 nMenuId;
     if( pMenu )
@@ -501,10 +501,10 @@ IMPL_LINK( SdNavigatorWin, MenuSelectHdl, Menu *, pMenu )
                 maTlbObjects->SetSelectionMode( MULTIPLE_SELECTION );
         }
     }
-    return 0;
+    return false;
 }
 
-IMPL_LINK( SdNavigatorWin, ShapeFilterCallback, Menu *, pMenu )
+IMPL_LINK_TYPED( SdNavigatorWin, ShapeFilterCallback, Menu *, pMenu, bool )
 {
     if (pMenu != NULL)
     {
@@ -548,7 +548,7 @@ IMPL_LINK( SdNavigatorWin, ShapeFilterCallback, Menu *, pMenu )
         }
     }
 
-    return 0;
+    return false;
 }
 
 void SdNavigatorWin::Resize()
diff --git a/sd/source/ui/inc/navigatr.hxx b/sd/source/ui/inc/navigatr.hxx
index 33fd9593b59c..bdfbed19477a 100644
--- a/sd/source/ui/inc/navigatr.hxx
+++ b/sd/source/ui/inc/navigatr.hxx
@@ -148,8 +148,8 @@ private:
                                 DECL_LINK( ClickPageHdl, void * );
                                 DECL_LINK( ClickObjectHdl, void * );
                                 DECL_LINK( SelectDocumentHdl, void * );
-                                DECL_LINK( MenuSelectHdl, Menu * );
-                                DECL_LINK( ShapeFilterCallback, Menu * );
+                                DECL_LINK_TYPED( MenuSelectHdl, Menu *, bool );
+                                DECL_LINK_TYPED( ShapeFilterCallback, Menu *, bool );
 
     virtual void                DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE;
     void                        SetDragImage();
diff --git a/sd/source/ui/sidebar/LayoutMenu.cxx b/sd/source/ui/sidebar/LayoutMenu.cxx
index 0d731a5458ed..0494f47a3b17 100644
--- a/sd/source/ui/sidebar/LayoutMenu.cxx
+++ b/sd/source/ui/sidebar/LayoutMenu.cxx
@@ -642,12 +642,12 @@ IMPL_LINK_NOARG(LayoutMenu, StateChangeHandler)
     return 0;
 }
 
-IMPL_LINK(LayoutMenu, OnMenuItemSelected, Menu*, pMenu)
+IMPL_LINK_TYPED(LayoutMenu, OnMenuItemSelected, Menu*, pMenu, bool)
 {
     if (pMenu == NULL)
     {
         OSL_ENSURE(pMenu!=NULL, "LayoutMenu::OnMenuItemSelected: illegal menu!");
-        return 0;
+        return false;
     }
 
     pMenu->Deactivate();
@@ -664,7 +664,7 @@ IMPL_LINK(LayoutMenu, OnMenuItemSelected, Menu*, pMenu)
         InsertPageWithLayout(GetSelectedAutoLayout());
     }
 
-    return 0;
+    return false;
 }
 
 void LayoutMenu::UpdateSelection()
diff --git a/sd/source/ui/sidebar/LayoutMenu.hxx b/sd/source/ui/sidebar/LayoutMenu.hxx
index c5ef058f6588..917c5541b4bc 100644
--- a/sd/source/ui/sidebar/LayoutMenu.hxx
+++ b/sd/source/ui/sidebar/LayoutMenu.hxx
@@ -193,7 +193,7 @@ private:
     DECL_LINK(StateChangeHandler, void *);
     DECL_LINK(EventMultiplexerListener, ::sd::tools::EventMultiplexerEvent*);
     DECL_LINK(WindowEventHandler, VclWindowEvent*);
-    DECL_LINK(OnMenuItemSelected, Menu*);
+    DECL_LINK_TYPED(OnMenuItemSelected, Menu*, bool);
 };
 
 } } // end of namespace ::sd::toolpanel
diff --git a/sd/source/ui/sidebar/MasterPagesSelector.cxx b/sd/source/ui/sidebar/MasterPagesSelector.cxx
index 2dcf5c278d86..014787244fd0 100644
--- a/sd/source/ui/sidebar/MasterPagesSelector.cxx
+++ b/sd/source/ui/sidebar/MasterPagesSelector.cxx
@@ -252,17 +252,17 @@ void MasterPagesSelector::ProcessPopupMenu (Menu& rMenu)
         rMenu.EnableItem(SID_TP_SHOW_LARGE_PREVIEW, false);
 }
 
-IMPL_LINK(MasterPagesSelector, OnMenuItemSelected, Menu*, pMenu)
+IMPL_LINK_TYPED(MasterPagesSelector, OnMenuItemSelected, Menu*, pMenu, bool)
 {
     if (pMenu == NULL)
     {
         OSL_ENSURE(pMenu!=NULL, "MasterPagesSelector::OnMenuItemSelected: illegal menu!");
-        return 0;
+        return false;
     }
 
     pMenu->Deactivate();
     ExecuteCommand(pMenu->GetCurItemId());
-    return 0;
+    return false;
 }
 
 void MasterPagesSelector::ExecuteCommand (const sal_Int32 nCommandId)
diff --git a/sd/source/ui/sidebar/MasterPagesSelector.hxx b/sd/source/ui/sidebar/MasterPagesSelector.hxx
index 801254b0ead5..5f6819a522f2 100644
--- a/sd/source/ui/sidebar/MasterPagesSelector.hxx
+++ b/sd/source/ui/sidebar/MasterPagesSelector.hxx
@@ -195,7 +195,7 @@ private:
     DECL_LINK(RightClickHandler, MouseEvent*);
     DECL_LINK(ContextMenuCallback, CommandEvent*);
     DECL_LINK(ContainerChangeListener, MasterPageContainerChangeEvent*);
-    DECL_LINK(OnMenuItemSelected, Menu*);
+    DECL_LINK_TYPED(OnMenuItemSelected, Menu*, bool);
 
     void SetItem (
         sal_uInt16 nIndex,
diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx
index 59cae0341c12..d36cd09a2e6c 100644
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -2224,7 +2224,7 @@ IMPL_LINK_NOARG_TYPED(SlideshowImpl, ContextMenuHdl, void*, void)
         resume();
 }
 
-IMPL_LINK( SlideshowImpl, ContextMenuSelectHdl, Menu *, pMenu )
+IMPL_LINK_TYPED( SlideshowImpl, ContextMenuSelectHdl, Menu *, pMenu, bool )
 {
     if( pMenu )
     {
@@ -2375,7 +2375,7 @@ IMPL_LINK( SlideshowImpl, ContextMenuSelectHdl, Menu *, pMenu )
         }
     }
 
-    return 0;
+    return false;
 }
 
 Reference< XSlideShow > SlideshowImpl::createSlideShow()
diff --git a/sd/source/ui/slideshow/slideshowimpl.hxx b/sd/source/ui/slideshow/slideshowimpl.hxx
index 4085a4ec71ca..a7af2838e268 100644
--- a/sd/source/ui/slideshow/slideshowimpl.hxx
+++ b/sd/source/ui/slideshow/slideshowimpl.hxx
@@ -278,7 +278,7 @@ private:
     DECL_LINK( PostYieldListener, void* );
     DECL_LINK_TYPED(ReadyForNextInputHdl, Timer *, void);
     DECL_LINK_TYPED( endPresentationHdl, void*, void );
-    DECL_LINK( ContextMenuSelectHdl, Menu * );
+    DECL_LINK_TYPED( ContextMenuSelectHdl, Menu *, bool );
     DECL_LINK_TYPED( ContextMenuHdl, void*, void );
     DECL_LINK_TYPED(deactivateHdl, Timer *, void);
     DECL_LINK( EventListenerHdl, VclSimpleEvent* );
diff --git a/sfx2/source/dialog/taskpane.cxx b/sfx2/source/dialog/taskpane.cxx
index 52e9e02eb518..ce878f3d07d0 100644
--- a/sfx2/source/dialog/taskpane.cxx
+++ b/sfx2/source/dialog/taskpane.cxx
@@ -840,7 +840,7 @@ namespace sfx2
 
     private:
         DECL_LINK_TYPED( OnToolboxClicked, ToolBox*, void );
-        DECL_LINK( OnMenuItemSelected, Menu* );
+        DECL_LINK_TYPED( OnMenuItemSelected, Menu*, bool );
         DECL_LINK_TYPED( DockingChanged, TitledDockingWindow*, void );
         ::std::unique_ptr< PopupMenu > impl_createPopupMenu() const;
 
@@ -979,7 +979,7 @@ namespace sfx2
     }
 
 
-    IMPL_LINK( TaskPaneController_Impl, OnMenuItemSelected, Menu*, i_pMenu )
+    IMPL_LINK_TYPED( TaskPaneController_Impl, OnMenuItemSelected, Menu*, i_pMenu, bool )
     {
         ENSURE_OR_RETURN( i_pMenu, "TaskPaneController_Impl::OnMenuItemSelected: illegal menu!", 0L );
 
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index f9a313df50a5..e931b0fcc531 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -2150,7 +2150,7 @@ IMPL_LINK( SfxCommonTemplateDialog_Impl, FmtSelectHdl, SvTreeListBox *, pListBox
     return 0;
 }
 
-IMPL_LINK( SfxCommonTemplateDialog_Impl, MenuSelectHdl, Menu*, pMenu )
+IMPL_LINK_TYPED( SfxCommonTemplateDialog_Impl, MenuSelectHdl, Menu*, pMenu, bool )
 {
     nLastItemId = pMenu->GetCurItemId();
     Application::PostUserEvent(
@@ -2528,11 +2528,11 @@ IMPL_LINK_TYPED( SfxTemplateDialog_Impl, ToolBoxRClick, ToolBox *, pBox, void )
     }
 }
 
-IMPL_LINK( SfxTemplateDialog_Impl, MenuSelectHdl, Menu*, pMenu)
+IMPL_LINK_TYPED( SfxTemplateDialog_Impl, MenuSelectHdl, Menu*, pMenu, bool)
 {
     sal_uInt16 nMenuId = pMenu->GetCurItemId();
     ActionSelect(nMenuId);
-    return 0;
+    return false;
 }
 
 void SfxCommonTemplateDialog_Impl::SetFamily( sal_uInt16 nId )
diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index 94b6bd706db2..c37554d5b9a3 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -561,7 +561,7 @@ IMPL_LINK_TYPED(SfxTemplateManagerDlg, TVItemStateHdl, const ThumbnailViewItem*,
         OnTemplateState(pItem);
 }
 
-IMPL_LINK(SfxTemplateManagerDlg, MenuSelectHdl, Menu*, pMenu)
+IMPL_LINK_TYPED(SfxTemplateManagerDlg, MenuSelectHdl, Menu*, pMenu, bool)
 {
     sal_uInt16 nMenuId = pMenu->GetCurItemId();
 
@@ -577,10 +577,10 @@ IMPL_LINK(SfxTemplateManagerDlg, MenuSelectHdl, Menu*, pMenu)
         break;
     }
 
-    return 0;
+    return false;
 }
 
-IMPL_LINK(SfxTemplateManagerDlg, MoveMenuSelectHdl, Menu*, pMenu)
+IMPL_LINK_TYPED(SfxTemplateManagerDlg, MoveMenuSelectHdl, Menu*, pMenu, bool)
 {
     sal_uInt16 nMenuId = pMenu->GetCurItemId();
 
@@ -599,10 +599,10 @@ IMPL_LINK(SfxTemplateManagerDlg, MoveMenuSelectHdl, Menu*, pMenu)
             remoteMoveTo(nMenuId);
     }
 
-    return 0;
+    return false;
 }
 
-IMPL_LINK(SfxTemplateManagerDlg, RepositoryMenuSelectHdl, Menu*, pMenu)
+IMPL_LINK_TYPED(SfxTemplateManagerDlg, RepositoryMenuSelectHdl, Menu*, pMenu, bool)
 {
     sal_uInt16 nMenuId = pMenu->GetCurItemId();
 
@@ -650,10 +650,10 @@ IMPL_LINK(SfxTemplateManagerDlg, RepositoryMenuSelectHdl, Menu*, pMenu)
             switchMainView(false);
     }
 
-    return 0;
+    return false;
 }
 
-IMPL_LINK(SfxTemplateManagerDlg, DefaultTemplateMenuSelectHdl, Menu*, pMenu)
+IMPL_LINK_TYPED(SfxTemplateManagerDlg, DefaultTemplateMenuSelectHdl, Menu*, pMenu, bool)
 {
     sal_uInt16 nId = pMenu->GetCurItemId();
 
@@ -662,7 +662,7 @@ IMPL_LINK(SfxTemplateManagerDlg, DefaultTemplateMenuSelectHdl, Menu*, pMenu)
 
     createDefaultTemplateMenu();
 
-    return 0;
+    return false;
 }
 
 IMPL_LINK_NOARG_TYPED(SfxTemplateManagerDlg, OpenRegionHdl, void*, void)
diff --git a/sfx2/source/inc/templdgi.hxx b/sfx2/source/inc/templdgi.hxx
index 8a79c49f5e91..ddb4a6f61ebb 100644
--- a/sfx2/source/inc/templdgi.hxx
+++ b/sfx2/source/inc/templdgi.hxx
@@ -291,7 +291,7 @@ public:
     SfxCommonTemplateDialog_Impl( SfxBindings* pB, vcl::Window*, bool );
     virtual ~SfxCommonTemplateDialog_Impl();
 
-    DECL_LINK( MenuSelectHdl, Menu * );
+    DECL_LINK_TYPED( MenuSelectHdl, Menu*, bool );
     DECL_LINK_TYPED( MenuSelectAsyncHdl, void*, void );
 
     virtual void EnableEdit( bool b = true )
@@ -359,7 +359,7 @@ private:
     DECL_LINK_TYPED( ToolBoxLSelect, ToolBox*, void );
     DECL_LINK_TYPED( ToolBoxRSelect, ToolBox*, void );
     DECL_LINK_TYPED( ToolBoxRClick, ToolBox*, void );
-    DECL_LINK( MenuSelectHdl, Menu* );
+    DECL_LINK_TYPED( MenuSelectHdl, Menu*, bool );
 
 protected:
     virtual void EnableEdit( bool = true ) SAL_OVERRIDE;
diff --git a/sfx2/source/inc/virtmenu.hxx b/sfx2/source/inc/virtmenu.hxx
index 079eaf1c65ae..370e24f1b956 100644
--- a/sfx2/source/inc/virtmenu.hxx
+++ b/sfx2/source/inc/virtmenu.hxx
@@ -94,7 +94,7 @@ public:
     void            InitPopup(sal_uInt16 nPos, bool bOLE = true);
     void            InitializeHelp();
 
-    DECL_LINK( Select, Menu * );
+    DECL_LINK_TYPED( Select, Menu*, bool );
 };
 
 
diff --git a/sfx2/source/menu/mnumgr.cxx b/sfx2/source/menu/mnumgr.cxx
index 9fefbe5b2edd..a8460511ca13 100644
--- a/sfx2/source/menu/mnumgr.cxx
+++ b/sfx2/source/menu/mnumgr.cxx
@@ -206,7 +206,7 @@ PopupMenu* InsertThesaurusSubmenu_Impl( SfxBindings* pBindings, Menu* pSVMenu )
 
 
 // executes the function for the selected item
-IMPL_LINK( SfxMenuManager, Select, Menu *, pSelMenu )
+IMPL_LINK_TYPED( SfxMenuManager, Select, Menu *, pSelMenu, bool )
 {
     sal_uInt16 nId = (sal_uInt16) pSelMenu->GetCurItemId();
     OUString aCommand = pSelMenu->GetItemCommand( nId );
@@ -235,7 +235,7 @@ IMPL_LINK( SfxMenuManager, Select, Menu *, pSelMenu )
         // special menu function
         pBindings->GetDispatcher_Impl()->Execute( nId );
 
-    return sal_IntPtr(true);
+    return true;
 }
 
 SfxPopupMenuManager::~SfxPopupMenuManager()
diff --git a/sfx2/source/menu/virtmenu.cxx b/sfx2/source/menu/virtmenu.cxx
index 6588f4961122..5bbda1cd4a3e 100644
--- a/sfx2/source/menu/virtmenu.cxx
+++ b/sfx2/source/menu/virtmenu.cxx
@@ -930,7 +930,7 @@ IMPL_LINK_TYPED( SfxVirtualMenu, Deactivate, Menu *, pMenu, bool )
 
 // called on activation of the SV-Menu
 
-IMPL_LINK( SfxVirtualMenu, Select, Menu *, pMenu )
+IMPL_LINK_TYPED( SfxVirtualMenu, Select, Menu *, pMenu, bool )
 {
     sal_uInt16 nSlotId = (sal_uInt16) pMenu->GetCurItemId();
     SAL_INFO(
@@ -960,12 +960,12 @@ IMPL_LINK( SfxVirtualMenu, Select, Menu *, pMenu )
             nTaskId++;
         }
 
-        return sal_IntPtr(true);
+        return true;
     }
     else if ( nSlotId >= START_ITEMID_PICKLIST && nSlotId <= END_ITEMID_PICKLIST )
     {
         SfxPickList::ExecuteMenuEntry( nSlotId );
-        return sal_IntPtr(true);
+        return true;
     }
 
     OUString sCommand = pMenu->GetItemCommand(nSlotId);
@@ -974,7 +974,7 @@ IMPL_LINK( SfxVirtualMenu, Select, Menu *, pMenu )
     else
         pBindings->Execute(nSlotId);
 
-    return sal_IntPtr(true);
+    return true;
 }
 
 
diff --git a/sfx2/source/sidebar/SidebarController.cxx b/sfx2/source/sidebar/SidebarController.cxx
index 969f08ee7c59..ac9853f859bb 100644
--- a/sfx2/source/sidebar/SidebarController.cxx
+++ b/sfx2/source/sidebar/SidebarController.cxx
@@ -958,12 +958,12 @@ void SidebarController::ShowPopupMenu (
     return pMenu;
 }
 
-IMPL_LINK(SidebarController, OnMenuItemSelected, Menu*, pMenu)
+IMPL_LINK_TYPED(SidebarController, OnMenuItemSelected, Menu*, pMenu, bool)
 {
     if (pMenu == NULL)
     {
         OSL_ENSURE(pMenu!=NULL, "sfx2::sidebar::SidebarController::OnMenuItemSelected: illegal menu!");
-        return 0;
+        return false;
     }
 
     pMenu->Deactivate();
diff --git a/starmath/inc/dialog.hxx b/starmath/inc/dialog.hxx
index 70b627368501..7ac0f97ce6b0 100644
--- a/starmath/inc/dialog.hxx
+++ b/starmath/inc/dialog.hxx
@@ -159,7 +159,7 @@ class SmFontTypeDialog : public ModalDialog
 
     VclPtr<OutputDevice> pFontListDev;
 
-    DECL_LINK(MenuSelectHdl, Menu *);
+    DECL_LINK_TYPED(MenuSelectHdl, Menu *, bool);
     DECL_LINK_TYPED(DefaultButtonClickHdl, Button *, void);
 
 public:
@@ -223,7 +223,7 @@ class SmDistanceDialog : public ModalDialog
     bool            bScaleAllBrackets;
 
     DECL_LINK(GetFocusHdl, Control *);
-    DECL_LINK(MenuSelectHdl, Menu *);
+    DECL_LINK_TYPED(MenuSelectHdl, Menu *, bool);
     DECL_LINK_TYPED(DefaultButtonClickHdl, Button *, void);
     DECL_LINK_TYPED(CheckBoxClickHdl, Button *, void);
 
diff --git a/starmath/inc/edit.hxx b/starmath/inc/edit.hxx
index b69d90af9d83..b277bcdd3ba0 100644
--- a/starmath/inc/edit.hxx
+++ b/starmath/inc/edit.hxx
@@ -58,7 +58,7 @@ class SmEditWindow : public vcl::Window, public DropTargetHelper
     virtual void KeyInput(const KeyEvent& rKEvt) SAL_OVERRIDE;
     virtual void Command(const CommandEvent& rCEvt) SAL_OVERRIDE;
 
-    DECL_LINK(MenuSelectHdl, Menu *);
+    DECL_LINK_TYPED(MenuSelectHdl, Menu *, bool);
     DECL_LINK_TYPED(ModifyTimerHdl, Idle *, void);
     DECL_LINK_TYPED(CursorMoveTimerHdl, Idle *, void);
 
diff --git a/starmath/inc/view.hxx b/starmath/inc/view.hxx
index 2cb968eddff7..edde0168903b 100644
--- a/starmath/inc/view.hxx
+++ b/starmath/inc/view.hxx
@@ -92,7 +92,7 @@ protected:
     virtual void KeyInput(const KeyEvent& rKEvt) SAL_OVERRIDE;
     virtual void Command(const CommandEvent& rCEvt) SAL_OVERRIDE;
     virtual void StateChanged( StateChangedType eChanged ) SAL_OVERRIDE;
-    DECL_LINK(MenuSelectHdl, Menu*);
+    DECL_LINK_TYPED(MenuSelectHdl, Menu*, bool);
 
 private:
     void RepaintViewShellDoc();
diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx
index d47bd1229b2d..e572bbb1c7df 100644
--- a/starmath/source/dialog.cxx
+++ b/starmath/source/dialog.cxx
@@ -492,7 +492,7 @@ void SmFontSizeDialog::WriteTo(SmFormat &rFormat) const
     rFormat.RequestApplyChanges();
 }
 
-IMPL_LINK( SmFontTypeDialog, MenuSelectHdl, Menu *, pMenu )
+IMPL_LINK_TYPED( SmFontTypeDialog, MenuSelectHdl, Menu *, pMenu, bool )
 {
     SmFontPickListBox *pActiveListBox;
 
@@ -517,7 +517,7 @@ IMPL_LINK( SmFontTypeDialog, MenuSelectHdl, Menu *, pMenu )
         if (pFontDialog->Execute() == RET_OK)
             pActiveListBox->ReadFrom(*pFontDialog);
     }
-    return 0;
+    return false;
 }
 
 
@@ -710,10 +710,10 @@ IMPL_LINK( SmDistanceDialog, GetFocusHdl, Control *, pControl )
     return 0;
 }
 
-IMPL_LINK( SmDistanceDialog, MenuSelectHdl, Menu *, pMenu )
+IMPL_LINK_TYPED( SmDistanceDialog, MenuSelectHdl, Menu *, pMenu, bool )
 {
     SetCategory(pMenu->GetCurItemId() - 1);
-    return 0;
+    return false;
 }
 
 
diff --git a/starmath/source/edit.cxx b/starmath/source/edit.cxx
index 983ab9a3d70d..4996e44579b3 100644
--- a/starmath/source/edit.cxx
+++ b/starmath/source/edit.cxx
@@ -398,14 +398,14 @@ bool SmEditWindow::HandleWheelCommands( const CommandEvent &rCEvt )
 }
 
 
-IMPL_LINK( SmEditWindow, MenuSelectHdl, Menu *, pMenu )
+IMPL_LINK_TYPED( SmEditWindow, MenuSelectHdl, Menu *, pMenu, bool )
 {
     SmViewShell *pViewSh = rCmdBox.GetView();
     if (pViewSh)
         pViewSh->GetViewFrame()->GetDispatcher()->Execute(
                 SID_INSERTCOMMAND, SfxCallMode::RECORD,
                 new SfxInt16Item(SID_INSERTCOMMAND, pMenu->GetCurItemId()), 0L);
-    return 0;
+    return false;
 }
 
 void SmEditWindow::KeyInput(const KeyEvent& rKEvt)
diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx
index 93c49dc73935..d3d093be3288 100644
--- a/starmath/source/view.cxx
+++ b/starmath/source/view.cxx
@@ -601,12 +601,12 @@ void SmGraphicWindow::Command(const CommandEvent& rCEvt)
 }
 
 
-IMPL_LINK( SmGraphicWindow, MenuSelectHdl, Menu *, pMenu )
+IMPL_LINK_TYPED( SmGraphicWindow, MenuSelectHdl, Menu *, pMenu, bool )
 {
     SmViewShell *pViewSh = GetView();
     if (pViewSh)
         pViewSh->GetViewFrame()->GetDispatcher()->Execute( pMenu->GetCurItemId() );
-    return 0;
+    return false;
 }
 
 void SmGraphicWindow::SetZoom(sal_uInt16 Factor)
diff --git a/svx/source/dialog/imapwnd.cxx b/svx/source/dialog/imapwnd.cxx
index 464200d2e140..5525ebe2543e 100644
--- a/svx/source/dialog/imapwnd.cxx
+++ b/svx/source/dialog/imapwnd.cxx
@@ -709,61 +709,61 @@ void IMapWindow::DoPropertyDialog()
     }
 }
 
-IMPL_LINK( IMapWindow, MenuSelectHdl, Menu*, pMenu )
+IMPL_LINK_TYPED( IMapWindow, MenuSelectHdl, Menu*, pMenu, bool )
 {
-    if (pMenu)
-    {
-        sal_uInt16  nId = pMenu->GetCurItemId();
+    if (!pMenu)
+        return false;
 
-        switch(nId)
-        {
-            case( MN_URL ):
-                DoPropertyDialog();
-            break;
+    sal_uInt16  nId = pMenu->GetCurItemId();
 
-            case( MN_MACRO ):
-                DoMacroAssign();
-            break;
+    switch(nId)
+    {
+        case( MN_URL ):
+            DoPropertyDialog();
+        break;
 
-            case( MN_ACTIVATE ):
-            {
-                const bool bNewState = !pMenu->IsItemChecked( MN_ACTIVATE );
+        case( MN_MACRO ):
+            DoMacroAssign();
+        break;
 
-                pMenu->CheckItem( MN_ACTIVATE, bNewState );
-                SetCurrentObjState( bNewState );
-                UpdateInfo( false );
-            }
-            break;
+        case( MN_ACTIVATE ):
+        {
+            const bool bNewState = !pMenu->IsItemChecked( MN_ACTIVATE );
 
-            case( MN_FRAME_TO_TOP ):
-                pView->PutMarkedToTop();
-            break;
+            pMenu->CheckItem( MN_ACTIVATE, bNewState );
+            SetCurrentObjState( bNewState );
+            UpdateInfo( false );
+        }
+        break;
 
-            case( MN_MOREFRONT ):
-                pView->MovMarkedToTop();
-            break;
+        case( MN_FRAME_TO_TOP ):
+            pView->PutMarkedToTop();
+        break;
 
-            case( MN_MOREBACK ):
-                pView->MovMarkedToBtm();
-            break;
+        case( MN_MOREFRONT ):
+            pView->MovMarkedToTop();
+        break;
 
-            case( MN_FRAME_TO_BOTTOM ):
-                pView->PutMarkedToBtm();
-            break;
+        case( MN_MOREBACK ):
+            pView->MovMarkedToBtm();
+        break;
 
-            case( MN_MARK_ALL ):
-                pView->MarkAll();
-            break;
+        case( MN_FRAME_TO_BOTTOM ):
+            pView->PutMarkedToBtm();
+        break;
 
-            case( MN_DELETE1 ):
-                pView->DeleteMarked();
+        case( MN_MARK_ALL ):
+            pView->MarkAll();
+        break;
 
-            default :
-            break;
-        }
+        case( MN_DELETE1 ):
+            pView->DeleteMarked();
+
+        default :
+        break;
     }
 
-    return 0;
+    return false;
 }
 
 void IMapWindow::CreateDefaultObject()
diff --git a/svx/source/dialog/imapwnd.hxx b/svx/source/dialog/imapwnd.hxx
index e772f875228f..63bef585e09a 100644
--- a/svx/source/dialog/imapwnd.hxx
+++ b/svx/source/dialog/imapwnd.hxx
@@ -99,7 +99,7 @@ class IMapWindow : public GraphCtrl, public DropTargetHelper
     ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >
                         mxDocumentFrame;
 
-                        DECL_LINK( MenuSelectHdl, Menu* );
+                        DECL_LINK_TYPED( MenuSelectHdl, Menu*, bool );
 
 protected:
 
diff --git a/svx/source/dialog/svxruler.cxx b/svx/source/dialog/svxruler.cxx
index a068ee569643..d51af7132c8e 100644
--- a/svx/source/dialog/svxruler.cxx
+++ b/svx/source/dialog/svxruler.cxx
@@ -3398,14 +3398,14 @@ void SvxRuler::Notify(SfxBroadcaster&, const SfxHint& rHint)
 }
 
 
-IMPL_LINK( SvxRuler, MenuSelect, Menu *, pMenu )
+IMPL_LINK_TYPED( SvxRuler, MenuSelect, Menu *, pMenu, bool )
 {
     /* Handler of the context menus for switching the unit of measurement */
     SetUnit(FieldUnit(pMenu->GetCurItemId()));
-    return 0;
+    return false;
 }
 
-IMPL_LINK( SvxRuler, TabMenuSelect, Menu *, pMenu )
+IMPL_LINK_TYPED( SvxRuler, TabMenuSelect, Menu *, pMenu, bool )
 {
     /* Handler of the tab menu for setting the type */
     if(mxTabStopItem.get() && mxTabStopItem->Count() > mxRulerImpl->nIdx)
@@ -3419,7 +3419,7 @@ IMPL_LINK( SvxRuler, TabMenuSelect, Menu *, pMenu )
         UpdateTabs();
         mxRulerImpl->nIdx = 0;
     }
-    return 0;
+    return false;
 }
 
 void SvxRuler::Command( const CommandEvent& rCommandEvent )
diff --git a/svx/source/gallery2/galbrws1.cxx b/svx/source/gallery2/galbrws1.cxx
index bf1e04d68bd0..9eaefc72f438 100644
--- a/svx/source/gallery2/galbrws1.cxx
+++ b/svx/source/gallery2/galbrws1.cxx
@@ -608,10 +608,10 @@ IMPL_LINK_NOARG_TYPED(GalleryBrowser1, ShowContextMenuHdl, void*, void)
     }
 }
 
-IMPL_LINK( GalleryBrowser1, PopupMenuHdl, Menu*, pMenu )
+IMPL_LINK_TYPED( GalleryBrowser1, PopupMenuHdl, Menu*, pMenu, bool )
 {
     ImplExecute( pMenu->GetCurItemId() );
-    return 0L;
+    return false;
 }
 
 IMPL_LINK_NOARG(GalleryBrowser1, SelectThemeHdl)
diff --git a/svx/source/gallery2/galbrws1.hxx b/svx/source/gallery2/galbrws1.hxx
index 74a655206452..4cd406432846 100644
--- a/svx/source/gallery2/galbrws1.hxx
+++ b/svx/source/gallery2/galbrws1.hxx
@@ -112,7 +112,7 @@ private:
                             DECL_LINK_TYPED( ClickNewThemeHdl, Button*, void );
                             DECL_LINK( SelectThemeHdl, void* );
                             DECL_LINK_TYPED( ShowContextMenuHdl, void*, void );
-                            DECL_LINK( PopupMenuHdl, Menu* );
+                            DECL_LINK_TYPED( PopupMenuHdl, Menu*, bool );
                             DECL_LINK( EndNewThemePropertiesDlgHdl, VclAbstractDialog2* );
                             DECL_LINK( EndThemePropertiesDlgHdl, VclAbstractDialog2* );
                             DECL_LINK_TYPED( DestroyThemePropertiesDlgHdl, void*, void );
diff --git a/svx/source/gallery2/galbrws2.cxx b/svx/source/gallery2/galbrws2.cxx
index 6f0d17364d10..2f4fcf57431f 100644
--- a/svx/source/gallery2/galbrws2.cxx
+++ b/svx/source/gallery2/galbrws2.cxx
@@ -121,8 +121,8 @@ private:
     static void Execute( const CommandInfo &rCmdInfo,
                   const css::uno::Sequence< css::beans::PropertyValue > &rArguments );
 
-    DECL_LINK( MenuSelectHdl, Menu* );
-    DECL_LINK( BackgroundMenuSelectHdl, Menu* );
+    DECL_LINK_TYPED( MenuSelectHdl, Menu*, bool );
+    DECL_LINK_TYPED( BackgroundMenuSelectHdl, Menu*, bool );
 public:
     GalleryThemePopup( const GalleryTheme* pTheme,
                        sal_uIntPtr nObjectPos,
@@ -340,10 +340,10 @@ void GalleryThemePopup::ExecutePopup( vcl::Window *pWindow, const ::Point &aPos
     maPopupMenu.Execute( pWindow, aPos );
 }
 
-IMPL_LINK( GalleryThemePopup, MenuSelectHdl, Menu*, pMenu )
+IMPL_LINK_TYPED( GalleryThemePopup, MenuSelectHdl, Menu*, pMenu, bool )
 {
     if( !pMenu )
-        return 0;
+        return false;
 
     sal_uInt16 nId( pMenu->GetCurItemId() );
     switch ( nId )
@@ -362,13 +362,13 @@ IMPL_LINK( GalleryThemePopup, MenuSelectHdl, Menu*, pMenu )
             mpBrowser->Execute( nId );
     }
 
-    return 0;
+    return false;
 }
 
-IMPL_LINK( GalleryThemePopup, BackgroundMenuSelectHdl, Menu*, pMenu )
+IMPL_LINK_TYPED( GalleryThemePopup, BackgroundMenuSelectHdl, Menu*, pMenu, bool )
 {
     if( !pMenu )
-        return 0;
+        return false;
 
     sal_uInt16 nPos( pMenu->GetCurItemId() - 1 );
     OUString aURL( mpBrowser->GetURL().GetMainURL( INetURLObject::NO_DECODE ) );
@@ -392,7 +392,7 @@ IMPL_LINK( GalleryThemePopup, BackgroundMenuSelectHdl, Menu*, pMenu )
     if ( it != m_aCommandInfo.end() )
         Execute( it->second, aArgs );
 
-    return 0;
+    return false;
 }
 
 } // end anonymous namespace
diff --git a/svx/source/mnuctrls/SmartTagCtl.cxx b/svx/source/mnuctrls/SmartTagCtl.cxx
index baa04e225fcc..f08889f8f7aa 100644
--- a/svx/source/mnuctrls/SmartTagCtl.cxx
+++ b/svx/source/mnuctrls/SmartTagCtl.cxx
@@ -154,10 +154,10 @@ void SvxSmartTagsControl::StateChanged( sal_uInt16, SfxItemState eState, const S
 
 
 
-IMPL_LINK( SvxSmartTagsControl, MenuSelect, PopupMenu *, pMen )
+IMPL_LINK_TYPED( SvxSmartTagsControl, MenuSelect, Menu *, pMen, bool )
 {
     if ( !mpSmartTagItem )
-        return 0;
+        return false;
 
     sal_uInt16 nMyId = pMen->GetCurItemId();
 
@@ -185,7 +185,7 @@ IMPL_LINK( SvxSmartTagsControl, MenuSelect, PopupMenu *, pMen )
     //SfxBoolItem aBool(SID_OPEN_SMARTTAGOPTIONS, sal_True);
     //GetBindings().GetDispatcher()->Execute( SID_AUTO_CORRECT_DLG, SfxCallMode::ASYNCHRON, &aBool, 0L );
 
-    return 0;
+    return false;
 }
 
 SvxSmartTagsControl::~SvxSmartTagsControl()
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 129dcd6ed2ae..4bb0294f3409 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -165,7 +165,7 @@ private:
     void            SetupEntry(vcl::RenderContext& rRenderContext, vcl::Window* pParent, sal_uInt16 nItem, const Rectangle& rRect, const OUString& rStyleName, bool bIsNotSelected);
     static bool     AdjustFontForItemHeight(OutputDevice* pDevice, Rectangle& rTextRect, long nHeight);
     void            SetOptimalSize();
-    DECL_LINK( MenuSelectHdl, Menu * );
+    DECL_LINK_TYPED( MenuSelectHdl, Menu *, bool );
 };
 
 class SvxFontNameBox_Impl : public FontNameBox
@@ -365,7 +365,7 @@ void SvxStyleBox_Impl::ReleaseFocus()
         m_xFrame->getContainerWindow()->setFocus();
 }
 
-IMPL_LINK( SvxStyleBox_Impl, MenuSelectHdl, Menu*, pMenu)
+IMPL_LINK_TYPED( SvxStyleBox_Impl, MenuSelectHdl, Menu*, pMenu, bool)
 {
     OUString sEntry = OUString( GetSelectEntry() );
     ReleaseFocus(); // It must be after getting entry pos!
@@ -390,7 +390,7 @@ IMPL_LINK( SvxStyleBox_Impl, MenuSelectHdl, Menu*, pMenu)
             break;
         }
     }
-    return 0;
+    return false;
 }
 
 void SvxStyleBox_Impl::Select()
diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index af3b25e6cb3e..2e0e2c465df0 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -1485,7 +1485,7 @@ IMPL_LINK_TYPED(SwTOXSelectTabPage, MenuEnableHdl, Menu*, pMenu, bool)
     return false;
 }
 
-IMPL_LINK(SwTOXSelectTabPage, MenuExecuteHdl, Menu*, pMenu)
+IMPL_LINK_TYPED(SwTOXSelectTabPage, MenuExecuteHdl, Menu*, pMenu, bool)
 {
     const OUString sSaveAutoMarkURL = sAutoMarkURL;
     OString sIdent(pMenu->GetCurItemIdent());
@@ -1503,7 +1503,7 @@ IMPL_LINK(SwTOXSelectTabPage, MenuExecuteHdl, Menu*, pMenu)
             sAutoMarkURL = lcl_CreateAutoMarkFileDlg(
                                     sAutoMarkURL, sAutoMarkType, false);
             if( sAutoMarkURL.isEmpty() )
-                return 0;
+                return false;
         }
 
         VclPtrInstance<SwAutoMarkDlg_Impl> pAutoMarkDlg(
@@ -1512,7 +1512,7 @@ IMPL_LINK(SwTOXSelectTabPage, MenuExecuteHdl, Menu*, pMenu)
         if( RET_OK != pAutoMarkDlg->Execute() && bNew )
             sAutoMarkURL = sSaveAutoMarkURL;
     }
-    return 0;
+    return false;
 }
 
 class SwTOXEdit : public Edit
diff --git a/sw/source/ui/misc/glossary.cxx b/sw/source/ui/misc/glossary.cxx
index 1b4a79b30503..0f411c2c4294 100644
--- a/sw/source/ui/misc/glossary.cxx
+++ b/sw/source/ui/misc/glossary.cxx
@@ -441,7 +441,7 @@ IMPL_LINK_TYPED( SwGlossaryDlg, EnableHdl, Menu *, pMn, bool )
     return true;
 }
 
-IMPL_LINK( SwGlossaryDlg, MenuHdl, Menu *, pMn )
+IMPL_LINK_TYPED( SwGlossaryDlg, MenuHdl, Menu *, pMn, bool )
 {
     OString sItemIdent(pMn->GetCurItemIdent());
 
@@ -468,7 +468,7 @@ IMPL_LINK( SwGlossaryDlg, MenuHdl, Menu *, pMn )
             ScopedVclPtrInstance<MessageDialog>::Create(this, SW_RES(STR_DOUBLE_SHORTNAME), VCL_MESSAGE_INFO)->Execute();
             m_pShortNameEdit->SetSelection(Selection(0, SELECTION_MAX));
             m_pShortNameEdit->GrabFocus();
-            return 1;
+            return true;
         }
         if(pGlossaryHdl->NewGlossary(aStr, aShortName, false, bNoAttr ))
         {
@@ -608,9 +608,9 @@ IMPL_LINK( SwGlossaryDlg, MenuHdl, Menu *, pMn )
     }
     else
     {
-        return 0;
+        return false;
     }
-    return 1;
+    return true;
 }
 
 // dialog manage regions
diff --git a/sw/source/ui/misc/outline.cxx b/sw/source/ui/misc/outline.cxx
index 6b71cdecde9a..3673672b40a8 100644
--- a/sw/source/ui/misc/outline.cxx
+++ b/sw/source/ui/misc/outline.cxx
@@ -259,7 +259,7 @@ IMPL_LINK_TYPED( SwOutlineTabDialog, FormHdl, Button *, pBtn, void )
     pFormMenu->Execute(pBtn, Rectangle(Point(0,0), pBtn->GetSizePixel()), PopupMenuFlags::ExecuteDown);
 }
 
-IMPL_LINK( SwOutlineTabDialog, MenuSelectHdl, Menu *, pMenu )
+IMPL_LINK_TYPED( SwOutlineTabDialog, MenuSelectHdl, Menu *, pMenu, bool )
 {
     sal_uInt8 nLevelNo = 0;
     OString sIdent = pMenu->GetCurItemIdent();
@@ -302,7 +302,7 @@ IMPL_LINK( SwOutlineTabDialog, MenuSelectHdl, Menu *, pMenu )
                     *pNumRule, aName ), pDlg->GetCurEntryPos() );
             pMenu->SetItemText(pMenu->GetItemId(pDlg->GetCurEntryPos()), aName);
         }
-        return 0;
+        return false;
     }
 
     if( nLevelNo-- )
@@ -321,7 +321,7 @@ IMPL_LINK( SwOutlineTabDialog, MenuSelectHdl, Menu *, pMenu )
     SfxTabPage* pPage = GetTabPage( nPageId );
     pPage->Reset(GetOutputItemSet());
 
-    return 0;
+    return false;
 }
 
 sal_uInt16  SwOutlineTabDialog::GetLevel(const OUString &rFormatName) const
diff --git a/sw/source/uibase/docvw/SidebarTxtControl.cxx b/sw/source/uibase/docvw/SidebarTxtControl.cxx
index d3d519ad570f..742aaa6c4317 100644
--- a/sw/source/uibase/docvw/SidebarTxtControl.cxx
+++ b/sw/source/uibase/docvw/SidebarTxtControl.cxx
@@ -326,10 +326,10 @@ IMPL_LINK( SidebarTextControl, OnlineSpellCallback, SpellCallbackInfo*, pInfo )
     return 0;
 }
 
-IMPL_LINK( SidebarTextControl, Select, Menu*, pSelMenu )
+IMPL_LINK_TYPED( SidebarTextControl, Select, Menu*, pSelMenu, bool )
 {
     mrSidebarWin.ExecuteCommand( pSelMenu->GetCurItemId() );
-    return 0;
+    return false;
 }
 
 void SidebarTextControl::Command( const CommandEvent& rCEvt )
diff --git a/sw/source/uibase/docvw/SidebarTxtControl.hxx b/sw/source/uibase/docvw/SidebarTxtControl.hxx
index 52305191a277..74745852d623 100644
--- a/sw/source/uibase/docvw/SidebarTxtControl.hxx
+++ b/sw/source/uibase/docvw/SidebarTxtControl.hxx
@@ -50,7 +50,7 @@ class SidebarTextControl : public Control
         virtual OUString GetSurroundingText() const SAL_OVERRIDE;
         virtual Selection GetSurroundingTextSelection() const SAL_OVERRIDE;
 
-        DECL_LINK( Select, Menu* );
+        DECL_LINK_TYPED( Select, Menu*, bool );
 
     public:
         SidebarTextControl( SwSidebarWin& rSidebarWin,
diff --git a/sw/source/uibase/inc/conttree.hxx b/sw/source/uibase/inc/conttree.hxx
index 9fd8e2a8ab37..58051ad62fd4 100644
--- a/sw/source/uibase/inc/conttree.hxx
+++ b/sw/source/uibase/inc/conttree.hxx
@@ -287,7 +287,7 @@ protected:
 
     void            Clear();
 
-    DECL_LINK(      PopupHdl, Menu* );
+    DECL_LINK_TYPED( PopupHdl, Menu*, bool );
     DECL_LINK_TYPED( Timeout, Timer*, void );
     DECL_LINK(      DoubleClickHdl, void* );
 
diff --git a/sw/source/uibase/inc/glossary.hxx b/sw/source/uibase/inc/glossary.hxx
index f8cd535738f0..a25a52ec29ec 100644
--- a/sw/source/uibase/inc/glossary.hxx
+++ b/sw/source/uibase/inc/glossary.hxx
@@ -126,7 +126,7 @@ class SwGlossaryDlg : public SvxStandardDialog
     DECL_LINK( NameModify, Edit * );
     DECL_LINK( NameDoubleClick, SvTreeListBox * );
     DECL_LINK( GrpSelect, SvTreeListBox * );
-    DECL_LINK( MenuHdl, Menu * );
+    DECL_LINK_TYPED( MenuHdl, Menu *, bool );
     DECL_LINK_TYPED( EnableHdl, Menu *, bool );
     DECL_LINK_TYPED(BibHdl, Button *, void);
     DECL_LINK_TYPED(EditHdl, MenuButton *, void);
diff --git a/sw/source/uibase/inc/inputwin.hxx b/sw/source/uibase/inc/inputwin.hxx
index 25730b5cae3c..622642c8007e 100644
--- a/sw/source/uibase/inc/inputwin.hxx
+++ b/sw/source/uibase/inc/inputwin.hxx
@@ -73,7 +73,7 @@ friend class InputEdit;
 protected:
     virtual void    Resize() SAL_OVERRIDE;
     virtual void    Click() SAL_OVERRIDE;
-    DECL_LINK( MenuHdl, Menu * );
+    DECL_LINK_TYPED( MenuHdl, Menu *, bool );
     DECL_LINK_TYPED( DropdownClickHdl, ToolBox*, void );
     void            ApplyFormula();
     void            CancelFormula();
diff --git a/sw/source/uibase/inc/navipi.hxx b/sw/source/uibase/inc/navipi.hxx
index ccb64a1b7c21..6d39178bca87 100644
--- a/sw/source/uibase/inc/navipi.hxx
+++ b/sw/source/uibase/inc/navipi.hxx
@@ -107,7 +107,7 @@ class SwNavigationPI : public vcl::Window,
     DECL_LINK( EditAction, NumEditAction * );
     DECL_LINK( EditGetFocus, NumEditAction * );
     DECL_LINK_TYPED( DoneLink, SfxPoolItem *, void );
-    DECL_LINK( MenuSelectHdl, Menu * );
+    DECL_LINK_TYPED( MenuSelectHdl, Menu *, bool );
     DECL_LINK_TYPED( ChangePageHdl, Idle*, void );
     DECL_LINK( PageEditModifyHdl, void* );
     DECL_LINK( PopupModeEndHdl, void * );
diff --git a/sw/source/uibase/inc/outline.hxx b/sw/source/uibase/inc/outline.hxx
index bbb1dc8bca31..b72edb4ab0fd 100644
--- a/sw/source/uibase/inc/outline.hxx
+++ b/sw/source/uibase/inc/outline.hxx
@@ -61,7 +61,7 @@ class SwOutlineTabDialog : public SfxTabDialog
 protected:
     DECL_LINK_TYPED(CancelHdl, Button*, void);
     DECL_LINK_TYPED( FormHdl, Button *, void );
-    DECL_LINK( MenuSelectHdl, Menu * );
+    DECL_LINK_TYPED( MenuSelectHdl, Menu *, bool );
 
         virtual void    PageCreated(sal_uInt16 nPageId, SfxTabPage& rPage) SAL_OVERRIDE;
         virtual short   Ok() SAL_OVERRIDE;
diff --git a/sw/source/uibase/inc/swuicnttab.hxx b/sw/source/uibase/inc/swuicnttab.hxx
index 2f08b236cb40..44478ef463e2 100644
--- a/sw/source/uibase/inc/swuicnttab.hxx
+++ b/sw/source/uibase/inc/swuicnttab.hxx
@@ -205,7 +205,7 @@ class SwTOXSelectTabPage : public SfxTabPage
     DECL_LINK(TOXTypeHdl,   ListBox* );
     DECL_LINK_TYPED(AddStylesHdl, Button*, void );
     DECL_LINK_TYPED(MenuEnableHdl, Menu*, bool);
-    DECL_LINK(MenuExecuteHdl, Menu*);
+    DECL_LINK_TYPED(MenuExecuteHdl, Menu*, bool);
     DECL_LINK(LanguageHdl, ListBox*);
 
     DECL_LINK_TYPED(CheckBoxHdl, Button*, void );
diff --git a/sw/source/uibase/inc/unotools.hxx b/sw/source/uibase/inc/unotools.hxx
index 775aeefcecd1..28a5d3784134 100644
--- a/sw/source/uibase/inc/unotools.hxx
+++ b/sw/source/uibase/inc/unotools.hxx
@@ -90,7 +90,7 @@ class SW_DLLPUBLIC SwOneExampleFrame
     static  bool    bShowServiceNotAvailableMessage;
 
     DECL_DLLPRIVATE_LINK_TYPED( TimeoutHdl, Idle*, void );
-    DECL_DLLPRIVATE_LINK( PopupHdl, Menu* );
+    DECL_DLLPRIVATE_LINK_TYPED( PopupHdl, Menu*, bool );
 
     SAL_DLLPRIVATE void  CreateControl();
     SAL_DLLPRIVATE void  DisposeControl();
diff --git a/sw/source/uibase/inc/workctrl.hxx b/sw/source/uibase/inc/workctrl.hxx
index eb526aa3c41d..3362d314d02a 100644
--- a/sw/source/uibase/inc/workctrl.hxx
+++ b/sw/source/uibase/inc/workctrl.hxx
@@ -68,7 +68,7 @@ public:
                                               SfxItemState eState,
                                               const SfxPoolItem* pState ) SAL_OVERRIDE;
 
-    DECL_STATIC_LINK(SwTbxAutoTextCtrl, PopupHdl, PopupMenu*);
+    DECL_STATIC_LINK_TYPED(SwTbxAutoTextCtrl, PopupHdl, Menu*, bool);
 };
 
 class SwTbxFieldCtrl : public SfxToolBoxControl
diff --git a/sw/source/uibase/ribbar/inputwin.cxx b/sw/source/uibase/ribbar/inputwin.cxx
index 7569757d59c8..6fd9d120ee30 100644
--- a/sw/source/uibase/ribbar/inputwin.cxx
+++ b/sw/source/uibase/ribbar/inputwin.cxx
@@ -299,7 +299,7 @@ void SwInputWindow::ShowWin()
     ToolBox::Show();
 }
 
-IMPL_LINK( SwInputWindow, MenuHdl, Menu *, pMenu )
+IMPL_LINK_TYPED( SwInputWindow, MenuHdl, Menu *, pMenu, bool )
 {
 static const char * const aStrArr[] = {
     sCalc_Phd,
@@ -336,7 +336,7 @@ static const char * const aStrArr[] = {
         aTmp += " ";
         aEdit->ReplaceSelected( aTmp );
     }
-    return 0;
+    return false;
 }
 
 IMPL_LINK_NOARG_TYPED(SwInputWindow, DropdownClickHdl, ToolBox *, void)
diff --git a/sw/source/uibase/ribbar/workctrl.cxx b/sw/source/uibase/ribbar/workctrl.cxx
index a7c1e4ada781..3306d4a5b9bd 100644
--- a/sw/source/uibase/ribbar/workctrl.cxx
+++ b/sw/source/uibase/ribbar/workctrl.cxx
@@ -88,7 +88,7 @@ VclPtr<SfxPopupWindow> SwTbxAutoTextCtrl::CreatePopupWindow()
     if(pView && !pView->GetDocShell()->IsReadOnly() &&
        !pView->GetWrtShell().HasReadonlySel() )
     {
-        Link<> aLnk = LINK(this, SwTbxAutoTextCtrl, PopupHdl);
+        Link<Menu*,bool> aLnk = LINK(this, SwTbxAutoTextCtrl, PopupHdl);
 
         pPopup = new PopupMenu;
         SwGlossaryList* pGlossaryList = ::GetGlossaryList();
@@ -139,7 +139,7 @@ void SwTbxAutoTextCtrl::StateChanged( sal_uInt16,
     GetToolBox().EnableItem( GetId(), (GetItemState(pState) != SfxItemState::DISABLED) );
 }
 
-IMPL_STATIC_LINK(SwTbxAutoTextCtrl, PopupHdl, PopupMenu*, pMenu)
+IMPL_STATIC_LINK_TYPED(SwTbxAutoTextCtrl, PopupHdl, Menu*, pMenu, bool)
 {
     sal_uInt16 nId = pMenu->GetCurItemId();
 
@@ -159,7 +159,7 @@ IMPL_STATIC_LINK(SwTbxAutoTextCtrl, PopupHdl, PopupMenu*, pMenu)
     pGlosHdl->SetCurGroup(sGroup, true);
     pGlosHdl->InsertGlossary(sShortName);
 
-    return 0;
+    return false;
 }
 
 void SwTbxAutoTextCtrl::DelPopup()
diff --git a/sw/source/uibase/utlui/glbltree.cxx b/sw/source/uibase/utlui/glbltree.cxx
index a7db9aa3e904..6047282f016b 100644
--- a/sw/source/uibase/utlui/glbltree.cxx
+++ b/sw/source/uibase/utlui/glbltree.cxx
@@ -771,10 +771,10 @@ void    SwGlobalTree::EditContent(const SwGlblDocContent* pCont )
     }
 }
 
-IMPL_LINK( SwGlobalTree, PopupHdl, Menu* , pMenu)
+IMPL_LINK_TYPED( SwGlobalTree, PopupHdl, Menu* , pMenu, bool)
 {
     ExcecuteContextMenuAction( pMenu->GetCurItemId());
-    return sal_IntPtr(true);
+    return true;
 }
 
 void    SwGlobalTree::ExcecuteContextMenuAction( sal_uInt16 nSelectedPopupEntry )
diff --git a/sw/source/uibase/utlui/navipi.cxx b/sw/source/uibase/utlui/navipi.cxx
index 52c1764a30b1..68b81fbb0c6f 100644
--- a/sw/source/uibase/utlui/navipi.cxx
+++ b/sw/source/uibase/utlui/navipi.cxx
@@ -995,7 +995,7 @@ void SwNavigationPI::Notify( SfxBroadcaster& rBrdc, const SfxHint& rHint )
     }
 }
 
-IMPL_LINK( SwNavigationPI, MenuSelectHdl, Menu *, pMenu )
+IMPL_LINK_TYPED( SwNavigationPI, MenuSelectHdl, Menu *, pMenu, bool )
 {
     sal_uInt16 nMenuId = pMenu->GetCurItemId();
     if(nMenuId != USHRT_MAX)
@@ -1005,7 +1005,7 @@ IMPL_LINK( SwNavigationPI, MenuSelectHdl, Menu *, pMenu )
         else
             aContentTree->SetOutlineLevel( static_cast< sal_uInt8 >(nMenuId - 100) );
     }
-    return 0;
+    return false;
 }
 
 void SwNavigationPI::UpdateListBox()
diff --git a/sw/source/uibase/utlui/unotools.cxx b/sw/source/uibase/utlui/unotools.cxx
index d3479b089e6c..cd5ab414e469 100644
--- a/sw/source/uibase/utlui/unotools.cxx
+++ b/sw/source/uibase/utlui/unotools.cxx
@@ -457,7 +457,7 @@ void SwOneExampleFrame::CreatePopup(const Point& rPt)
     aPop.InsertItem(ITEM_UP,   rArr.GetString(rArr.FindIndex(ST_MENU_UP )));
     aPop.InsertItem(ITEM_DOWN, rArr.GetString(rArr.FindIndex(ST_MENU_DOWN )));
 
-    Link<> aSelLk = LINK(this, SwOneExampleFrame, PopupHdl );
+    Link<Menu*,bool> aSelLk = LINK(this, SwOneExampleFrame, PopupHdl );
     aPop.SetSelectHdl(aSelLk);
     if(EX_SHOW_ONLINE_LAYOUT == nStyleFlags)
     {
@@ -486,7 +486,7 @@ void SwOneExampleFrame::CreatePopup(const Point& rPt)
 
 }
 
-IMPL_LINK(SwOneExampleFrame, PopupHdl, Menu*, pMenu )
+IMPL_LINK_TYPED(SwOneExampleFrame, PopupHdl, Menu*, pMenu, bool )
 {
     sal_uInt16 nId = pMenu->GetCurItemId();
     if ((nId > ITEM_ZOOM) &&
@@ -511,7 +511,7 @@ IMPL_LINK(SwOneExampleFrame, PopupHdl, Menu*, pMenu )
         else
             xScrCrsr->screenDown();
     }
-    return 0;
+    return false;
 };
 
 SwFrmCtrlWindow::SwFrmCtrlWindow(vcl::Window* pParent, SwOneExampleFrame* pFrame)