convert Link<> to typed

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

1 files changed, 14 insertions, 25 deletions

diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index d70b472df7cb..c6f363c12eee 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -1870,15 +1870,12 @@ bool SvxConfigPage::FillItemSet( SfxItemSet* )
     return result;
 }
 
-IMPL_LINK( SvxConfigPage, SelectSaveInLocation, ListBox *, pBox )
+IMPL_LINK_NOARG_TYPED( SvxConfigPage, SelectSaveInLocation, ListBox&, void )
 {
-    (void)pBox;
-
     pCurrentSaveInData = static_cast<SaveInData*>(m_pSaveInListBox->GetEntryData(
             m_pSaveInListBox->GetSelectEntryPos()));
 
     Init();
-    return 1;
 }
 
 void SvxConfigPage::ReloadTopLevelListBox( SvxConfigEntry* pToSelect )
@@ -1916,7 +1913,7 @@ void SvxConfigPage::ReloadTopLevelListBox( SvxConfigEntry* pToSelect )
         nSelectionPos : m_pTopLevelListBox->GetEntryCount() - 1;
 
     m_pTopLevelListBox->SelectEntryPos( nSelectionPos );
-    m_pTopLevelListBox->GetSelectHdl().Call( this );
+    m_pTopLevelListBox->GetSelectHdl().Call( *m_pTopLevelListBox );
 }
 
 void SvxConfigPage::AddSubMenusToUI(
@@ -2254,7 +2251,7 @@ void SvxMenuConfigPage::Init()
     ReloadTopLevelListBox();
 
     m_pTopLevelListBox->SelectEntryPos(0);
-    m_pTopLevelListBox->GetSelectHdl().Call(this);
+    m_pTopLevelListBox->GetSelectHdl().Call(*m_pTopLevelListBox);
 }
 
 void SvxMenuConfigPage::dispose()
@@ -2388,10 +2385,8 @@ short SvxMenuConfigPage::QueryReset()
     return qbox->Execute();
 }
 
-IMPL_LINK( SvxMenuConfigPage, SelectMenu, ListBox *, pBox )
+IMPL_LINK_NOARG_TYPED( SvxMenuConfigPage, SelectMenu, ListBox&, void )
 {
-    (void)pBox;
-
     m_pContentsListBox->Clear();
 
     SvxConfigEntry* pMenuData = GetTopLevelSelection();
@@ -2414,8 +2409,6 @@ IMPL_LINK( SvxMenuConfigPage, SelectMenu, ListBox *, pBox )
     }
 
     UpdateButtonStates();
-
-    return 0;
 }
 
 IMPL_LINK_TYPED( SvxMenuConfigPage, MenuSelectHdl, MenuButton *, pButton, void )
@@ -2969,7 +2962,7 @@ void SvxToolbarConfigPage::DeleteSelectedTopLevel()
         {
             m_pTopLevelListBox->SelectEntryPos( nSelectionPos - 1 );
         }
-        m_pTopLevelListBox->GetSelectHdl().Call( this );
+        m_pTopLevelListBox->GetSelectHdl().Call( *m_pTopLevelListBox );
 
         // and now remove the entry
         m_pTopLevelListBox->RemoveEntry( nSelectionPos );
@@ -3099,7 +3092,7 @@ IMPL_LINK_TYPED( SvxToolbarConfigPage, ToolbarSelectHdl, MenuButton *, pButton,
 
                 pSaveInData_->RestoreToolbar( pToolbar );
 
-                m_pTopLevelListBox->GetSelectHdl().Call( this );
+                m_pTopLevelListBox->GetSelectHdl().Call( *m_pTopLevelListBox );
             }
 
             break;
@@ -3109,7 +3102,7 @@ IMPL_LINK_TYPED( SvxToolbarConfigPage, ToolbarSelectHdl, MenuButton *, pButton,
             pToolbar->SetStyle( 0 );
             pSaveInData->SetSystemStyle( m_xFrame, pToolbar->GetCommand(), 0 );
 
-            m_pTopLevelListBox->GetSelectHdl().Call( this );
+            m_pTopLevelListBox->GetSelectHdl().Call( *m_pTopLevelListBox );
 
             break;
         }
@@ -3118,7 +3111,7 @@ IMPL_LINK_TYPED( SvxToolbarConfigPage, ToolbarSelectHdl, MenuButton *, pButton,
             pToolbar->SetStyle( 1 );
             pSaveInData->SetSystemStyle( m_xFrame, pToolbar->GetCommand(), 1 );
 
-            m_pTopLevelListBox->GetSelectHdl().Call( this );
+            m_pTopLevelListBox->GetSelectHdl().Call( *m_pTopLevelListBox );
 
             break;
         }
@@ -3127,7 +3120,7 @@ IMPL_LINK_TYPED( SvxToolbarConfigPage, ToolbarSelectHdl, MenuButton *, pButton,
             pToolbar->SetStyle( 2 );
             pSaveInData->SetSystemStyle( m_xFrame, pToolbar->GetCommand(), 2 );
 
-            m_pTopLevelListBox->GetSelectHdl().Call( this );
+            m_pTopLevelListBox->GetSelectHdl().Call( *m_pTopLevelListBox );
 
             break;
         }
@@ -3439,7 +3432,7 @@ void SvxToolbarConfigPage::Init()
     }
 
     m_pTopLevelListBox->SelectEntryPos(nPos);
-    m_pTopLevelListBox->GetSelectHdl().Call(this);
+    m_pTopLevelListBox->GetSelectHdl().Call(*m_pTopLevelListBox);
 }
 
 SaveInData* SvxToolbarConfigPage::CreateSaveInData(
@@ -4319,10 +4312,8 @@ short SvxToolbarConfigPage::QueryReset()
     return qbox->Execute();
 }
 
-IMPL_LINK( SvxToolbarConfigPage, SelectToolbar, ListBox *, pBox )
+IMPL_LINK_NOARG_TYPED( SvxToolbarConfigPage, SelectToolbar, ListBox&, void )
 {
-    (void)pBox;
-
     m_pContentsListBox->Clear();
 
     SvxConfigEntry* pToolbar = GetTopLevelSelection();
@@ -4332,7 +4323,7 @@ IMPL_LINK( SvxToolbarConfigPage, SelectToolbar, ListBox *, pBox )
         m_pModifyCommandButton->Enable( false );
         m_pAddCommandsButton->Enable( false );
 
-        return 0;
+        return;
     }
 
     m_pModifyTopLevelButton->Enable( true );
@@ -4389,8 +4380,6 @@ IMPL_LINK( SvxToolbarConfigPage, SelectToolbar, ListBox *, pBox )
     }
 
     UpdateButtonStates();
-
-    return 0;
 }
 
 IMPL_LINK_NOARG_TYPED( SvxToolbarConfigPage, NewToolbarHdl, Button *, void )
@@ -4431,7 +4420,7 @@ IMPL_LINK_NOARG_TYPED( SvxToolbarConfigPage, NewToolbarHdl, Button *, void )
         if ( GetSaveInData() != pData )
         {
             m_pSaveInListBox->SelectEntryPos( nInsertPos );
-            m_pSaveInListBox->GetSelectHdl().Call(this);
+            m_pSaveInListBox->GetSelectHdl().Call(*m_pSaveInListBox);
         }
 
         SvxConfigEntry* pToolbar =
@@ -4445,7 +4434,7 @@ IMPL_LINK_NOARG_TYPED( SvxToolbarConfigPage, NewToolbarHdl, Button *, void )
         nInsertPos = m_pTopLevelListBox->InsertEntry( pToolbar->GetName() );
         m_pTopLevelListBox->SetEntryData( nInsertPos, pToolbar );
         m_pTopLevelListBox->SelectEntryPos( nInsertPos );
-        m_pTopLevelListBox->GetSelectHdl().Call(this);
+        m_pTopLevelListBox->GetSelectHdl().Call(*m_pTopLevelListBox);
 
         pData->SetModified();
     }