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>

18 files changed, 33 insertions, 33 deletions

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)