Use typed Menu::Set[De]actuivateHdl Links

Change-Id: I6736383ad0ec5c9f2ea2281bfdcfa280cd712032

6 files changed, 9 insertions, 9 deletions

diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index fefe6b925a25..9bdf2e16af2c 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -1487,10 +1487,10 @@ IMPL_LINK(SwTOXSelectTabPage, AddStylesHdl, PushButton*, pButton)
     return 0;
 }
 
-IMPL_LINK(SwTOXSelectTabPage, MenuEnableHdl, Menu*, pMenu)
+IMPL_LINK_TYPED(SwTOXSelectTabPage, MenuEnableHdl, Menu*, pMenu, bool)
 {
     pMenu->EnableItem("edit", !sAutoMarkURL.isEmpty());
-    return 0;
+    return false;
 }
 
 IMPL_LINK(SwTOXSelectTabPage, MenuExecuteHdl, Menu*, pMenu)
diff --git a/sw/source/ui/misc/glossary.cxx b/sw/source/ui/misc/glossary.cxx
index c8d4f0799cfc..1f7a6ffb72cf 100644
--- a/sw/source/ui/misc/glossary.cxx
+++ b/sw/source/ui/misc/glossary.cxx
@@ -418,7 +418,7 @@ IMPL_LINK( SwGlossaryDlg, NameDoubleClick, SvTreeListBox*, pBox )
     return 0;
 }
 
-IMPL_LINK( SwGlossaryDlg, EnableHdl, Menu *, pMn )
+IMPL_LINK_TYPED( SwGlossaryDlg, EnableHdl, Menu *, pMn, bool )
 {
     SvTreeListEntry* pEntry = m_pCategoryBox->FirstSelected();
 
@@ -437,7 +437,7 @@ IMPL_LINK( SwGlossaryDlg, EnableHdl, Menu *, pMn )
     pMn->EnableItem("macro", bExists && !bIsGroup && !bIsOld &&
                                     !pGlossaryHdl->IsReadOnly() );
     pMn->EnableItem("import", bIsGroup && !bIsOld && !pGlossaryHdl->IsReadOnly() );
-    return 1;
+    return true;
 }
 
 IMPL_LINK( SwGlossaryDlg, MenuHdl, Menu *, pMn )
diff --git a/sw/source/uibase/docvw/PageBreakWin.cxx b/sw/source/uibase/docvw/PageBreakWin.cxx
index 0840c825261c..226d46df59d8 100644
--- a/sw/source/uibase/docvw/PageBreakWin.cxx
+++ b/sw/source/uibase/docvw/PageBreakWin.cxx
@@ -434,11 +434,11 @@ void SwPageBreakWin::Fade( bool bFadeIn )
         m_aFadeTimer.Start( );
 }
 
-IMPL_LINK_NOARG(SwPageBreakWin, HideHandler)
+IMPL_LINK_NOARG_TYPED(SwPageBreakWin, HideHandler, Menu *, bool)
 {
     Fade( false );
 
-    return 0;
+    return false;
 }
 
 IMPL_LINK_NOARG_TYPED(SwPageBreakWin, FadeHandler, Timer *, void)
diff --git a/sw/source/uibase/inc/PageBreakWin.hxx b/sw/source/uibase/inc/PageBreakWin.hxx
index d2c165e043b1..6efb632f0ada 100644
--- a/sw/source/uibase/inc/PageBreakWin.hxx
+++ b/sw/source/uibase/inc/PageBreakWin.hxx
@@ -55,7 +55,7 @@ public:
 
 private:
     /// Hide the button (used when the popup menu is closed by clicking outside)
-    DECL_LINK( HideHandler, void * );
+    DECL_LINK_TYPED( HideHandler, Menu *, bool );
     DECL_LINK_TYPED( FadeHandler, Timer *, void );
 };
 
diff --git a/sw/source/uibase/inc/glossary.hxx b/sw/source/uibase/inc/glossary.hxx
index ca045327711c..56fd84460843 100644
--- a/sw/source/uibase/inc/glossary.hxx
+++ b/sw/source/uibase/inc/glossary.hxx
@@ -127,7 +127,7 @@ class SwGlossaryDlg : public SvxStandardDialog
     DECL_LINK( NameDoubleClick, SvTreeListBox * );
     DECL_LINK( GrpSelect, SvTreeListBox * );
     DECL_LINK( MenuHdl, Menu * );
-    DECL_LINK( EnableHdl, Menu * );
+    DECL_LINK_TYPED( EnableHdl, Menu *, bool );
     DECL_LINK(BibHdl, void *);
     DECL_LINK_TYPED(EditHdl, MenuButton *, void);
     DECL_LINK(InsertHdl, void *);
diff --git a/sw/source/uibase/inc/swuicnttab.hxx b/sw/source/uibase/inc/swuicnttab.hxx
index 2f4da99cf181..7a35d4744fbb 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(AddStylesHdl, PushButton* );
-    DECL_LINK(MenuEnableHdl, Menu*);
+    DECL_LINK_TYPED(MenuEnableHdl, Menu*, bool);
     DECL_LINK(MenuExecuteHdl, Menu*);
     DECL_LINK(LanguageHdl, ListBox*);