Use typed Link for MenuButton::SetSelectHdl

(and MenuButton::GetSelectHdl was unused)

Change-Id: I94df06bcda9e041fde65553e30247874b20ff74b

8 files changed, 16 insertions, 26 deletions

diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index 96ed1acc96b5..ac1a8b47a217 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -2428,7 +2428,7 @@ IMPL_LINK( SvxMenuConfigPage, SelectMenu, ListBox *, pBox )
     return 0;
 }
 
-IMPL_LINK( SvxMenuConfigPage, MenuSelectHdl, MenuButton *, pButton )
+IMPL_LINK_TYPED( SvxMenuConfigPage, MenuSelectHdl, MenuButton *, pButton, void )
 {
     OString sIdent = pButton->GetCurItemIdent();
 
@@ -2473,12 +2473,9 @@ IMPL_LINK( SvxMenuConfigPage, MenuSelectHdl, MenuButton *, pButton )
             GetSaveInData()->SetModified( true );
         }
     }
-    else
-        return sal_False;
-    return sal_True;
 }
 
-IMPL_LINK( SvxMenuConfigPage, EntrySelectHdl, MenuButton *, pButton )
+IMPL_LINK_TYPED( SvxMenuConfigPage, EntrySelectHdl, MenuButton *, pButton, void )
 {
     OString sIdent = pButton->GetCurItemIdent();
     if (sIdent == "addsubmenu")
@@ -2538,15 +2535,13 @@ IMPL_LINK( SvxMenuConfigPage, EntrySelectHdl, MenuButton *, pButton )
     }
     else
     {
-        return sal_False;
+        return;
     }
 
     if ( GetSaveInData()->IsModified() )
     {
         UpdateButtonStates();
     }
-
-    return sal_True;
 }
 
 IMPL_LINK( SvxMenuConfigPage, AddFunctionHdl,
@@ -3080,7 +3075,7 @@ void SvxToolbarConfigPage::MoveEntry( bool bMoveUp )
     }
 }
 
-IMPL_LINK( SvxToolbarConfigPage, ToolbarSelectHdl, MenuButton *, pButton )
+IMPL_LINK_TYPED( SvxToolbarConfigPage, ToolbarSelectHdl, MenuButton *, pButton, void )
 {
     sal_uInt16 nSelectionPos = m_pTopLevelListBox->GetSelectEntryPos();
 
@@ -3167,10 +3162,9 @@ IMPL_LINK( SvxToolbarConfigPage, ToolbarSelectHdl, MenuButton *, pButton )
             break;
         }
     }
-    return 1;
 }
 
-IMPL_LINK( SvxToolbarConfigPage, EntrySelectHdl, MenuButton *, pButton )
+IMPL_LINK_TYPED( SvxToolbarConfigPage, EntrySelectHdl, MenuButton *, pButton, void )
 {
     bool bNeedsApply = false;
 
@@ -3444,8 +3438,6 @@ IMPL_LINK( SvxToolbarConfigPage, EntrySelectHdl, MenuButton *, pButton )
         static_cast<ToolbarSaveInData*>( GetSaveInData())->ApplyToolbar( pToolbar );
         UpdateButtonStates();
     }
-
-    return 1;
 }
 
 void SvxToolbarConfigPage::Init()
diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx
index 9f3e149545a4..c1238be481e1 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -916,9 +916,9 @@ IMPL_LINK(SpellDialog, AddToDictClickHdl, PushButton*, EMPTYARG )
 }
 
 
-IMPL_LINK(SpellDialog, AddToDictSelectHdl, MenuButton*, pButton )
+IMPL_LINK_TYPED(SpellDialog, AddToDictSelectHdl, MenuButton*, pButton, void )
 {
-    return AddToDictionaryExecute(pButton->GetCurItemId(), pButton->GetPopupMenu());
+    AddToDictionaryExecute(pButton->GetCurItemId(), pButton->GetPopupMenu());
 }
 
 
diff --git a/cui/source/inc/SpellDialog.hxx b/cui/source/inc/SpellDialog.hxx
index 6f8b3161cd26..9e6d219ad0e7 100644
--- a/cui/source/inc/SpellDialog.hxx
+++ b/cui/source/inc/SpellDialog.hxx
@@ -180,7 +180,7 @@ private:
     DECL_LINK(CancelHdl, void *);
     DECL_LINK( ModifyHdl, SentenceEditWindow_Impl *);
     DECL_LINK(UndoHdl, void *);
-    DECL_LINK( AddToDictSelectHdl, MenuButton* );
+    DECL_LINK_TYPED( AddToDictSelectHdl, MenuButton*, void );
     DECL_LINK( AddToDictClickHdl, PushButton* );
     DECL_LINK( LanguageSelectHdl, SvxLanguageBox* );
     DECL_LINK( DialogUndoHdl, SpellUndoAction_Impl* );
diff --git a/cui/source/inc/cfg.hxx b/cui/source/inc/cfg.hxx
index 3038b4b80d57..fc52ab86fc77 100644
--- a/cui/source/inc/cfg.hxx
+++ b/cui/source/inc/cfg.hxx
@@ -473,8 +473,8 @@ private:
     DECL_LINK( SelectMenu, ListBox * );
     DECL_LINK( SelectMenuEntry, Control * );
     DECL_LINK( NewMenuHdl, Button * );
-    DECL_LINK( MenuSelectHdl, MenuButton * );
-    DECL_LINK( EntrySelectHdl, MenuButton * );
+    DECL_LINK_TYPED( MenuSelectHdl, MenuButton *, void );
+    DECL_LINK_TYPED( EntrySelectHdl, MenuButton *, void );
     DECL_LINK( AddCommandsHdl, Button * );
     DECL_LINK( AddFunctionHdl, SvxScriptSelectorDialog * );
 
@@ -574,8 +574,8 @@ private:
 
     DECL_LINK( SelectToolbar, ListBox * );
     DECL_LINK( SelectToolbarEntry, Control * );
-    DECL_LINK( ToolbarSelectHdl, MenuButton * );
-    DECL_LINK( EntrySelectHdl, MenuButton * );
+    DECL_LINK_TYPED( ToolbarSelectHdl, MenuButton *, void );
+    DECL_LINK_TYPED( EntrySelectHdl, MenuButton *, void );
     DECL_LINK( NewToolbarHdl, Button * );
     DECL_LINK( AddCommandsHdl, Button * );
     DECL_LINK( AddFunctionHdl, SvxScriptSelectorDialog * );
diff --git a/cui/source/inc/cuitabline.hxx b/cui/source/inc/cuitabline.hxx
index a55dd130193e..6c4143c34535 100644
--- a/cui/source/inc/cuitabline.hxx
+++ b/cui/source/inc/cuitabline.hxx
@@ -176,7 +176,7 @@ private:
     sal_Int32           nActLineWidth;
 
     // handler for gallery popup menu button + size
-    DECL_LINK( GraphicHdl_Impl, MenuButton * );
+    DECL_LINK_TYPED( GraphicHdl_Impl, MenuButton *, void );
     DECL_LINK( MenuCreateHdl_Impl, MenuButton * );
     DECL_STATIC_LINK( SvxLineTabPage, GraphicArrivedHdl_Impl, SvxBrushItem* );
     DECL_LINK( SizeHdl_Impl, MetricField * );
diff --git a/cui/source/inc/numpages.hxx b/cui/source/inc/numpages.hxx
index 3fe577afac96..625da381375e 100644
--- a/cui/source/inc/numpages.hxx
+++ b/cui/source/inc/numpages.hxx
@@ -330,7 +330,7 @@ class SvxNumOptionsTabPage : public SfxTabPage
         DECL_LINK( NumberTypeSelectHdl_Impl, ListBox * );
         DECL_LINK( LevelHdl_Impl, ListBox * );
         DECL_LINK(PopupActivateHdl_Impl, void *);
-        DECL_LINK( GraphicHdl_Impl, MenuButton * );
+        DECL_LINK_TYPED( GraphicHdl_Impl, MenuButton *, void );
         DECL_LINK(BulletHdl_Impl, void *);
         DECL_LINK( SizeHdl_Impl, MetricField * );
         DECL_LINK( RatioHdl_Impl, CheckBox * );
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index c638187edb52..797a37dcf22b 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -1959,7 +1959,7 @@ IMPL_LINK( SvxNumOptionsTabPage, BulRelSizeHdl_Impl, MetricField *, pField)
     return 0;
 }
 
-IMPL_LINK( SvxNumOptionsTabPage, GraphicHdl_Impl, MenuButton *, pButton )
+IMPL_LINK_TYPED( SvxNumOptionsTabPage, GraphicHdl_Impl, MenuButton *, pButton, void )
 {
     sal_uInt16                  nItemId = pButton->GetCurItemId();
     OUString                aGrfName;
@@ -2035,7 +2035,6 @@ IMPL_LINK( SvxNumOptionsTabPage, GraphicHdl_Impl, MenuButton *, pButton )
         //needed due to asynchronous loading of graphics in the SvxBrushItem
         aInvalidateTimer.Start();
     }
-    return 0;
 }
 
 IMPL_LINK_NOARG(SvxNumOptionsTabPage, PopupActivateHdl_Impl)
diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx
index 184d428732a1..25dfd8cb5f2c 100644
--- a/cui/source/tabpages/tpline.cxx
+++ b/cui/source/tabpages/tpline.cxx
@@ -1777,10 +1777,9 @@ IMPL_STATIC_LINK(SvxLineTabPage, GraphicArrivedHdl_Impl, SvxBrushItem*, pItem)
 
 // #58425# Symbols on a list (e.g. StarChart)
 // Handler for menu button
-IMPL_LINK( SvxLineTabPage, GraphicHdl_Impl, MenuButton *, pButton )
+IMPL_LINK_TYPED( SvxLineTabPage, GraphicHdl_Impl, MenuButton *, pButton, void )
 {
     SymbolSelected(pButton);
-    return 0;
 }
 
 IMPL_LINK( SvxLineTabPage, SizeHdl_Impl, MetricField *, pField)