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>

4 files changed, 22 insertions, 32 deletions

diff --git a/sc/source/ui/optdlg/calcoptionsdlg.cxx b/sc/source/ui/optdlg/calcoptionsdlg.cxx
index 72b962ec569d..bef3220fc23b 100644
--- a/sc/source/ui/optdlg/calcoptionsdlg.cxx
+++ b/sc/source/ui/optdlg/calcoptionsdlg.cxx
@@ -222,18 +222,15 @@ IMPL_LINK_TYPED(ScCalcOptionsDialog, AsZeroModifiedHdl, Button*, pCheckBox, void
     maConfig.mbEmptyStringAsZero = mbSelectedEmptyStringAsZero = static_cast<CheckBox*>(pCheckBox)->IsChecked();
 }
 
-IMPL_LINK(ScCalcOptionsDialog, ConversionModifiedHdl, ListBox*, pConv )
+IMPL_LINK_TYPED(ScCalcOptionsDialog, ConversionModifiedHdl, ListBox&, rConv, void )
 {
-
-    maConfig.meStringConversion = (ScCalcConfig::StringConversion)pConv->GetSelectEntryPos();
+    maConfig.meStringConversion = (ScCalcConfig::StringConversion)rConv.GetSelectEntryPos();
     CoupleEmptyAsZeroToStringConversion();
-    return 0;
 }
 
-IMPL_LINK(ScCalcOptionsDialog, SyntaxModifiedHdl, ListBox*, pSyntax)
+IMPL_LINK_TYPED(ScCalcOptionsDialog, SyntaxModifiedHdl, ListBox&, rSyntax, void)
 {
-    maConfig.SetStringRefSyntax(toAddressConvention(pSyntax->GetSelectEntryPos()));
-    return 0;
+    maConfig.SetStringRefSyntax(toAddressConvention(rSyntax.GetSelectEntryPos()));
 }
 
 IMPL_LINK_TYPED(ScCalcOptionsDialog, CBUseOpenCLHdl, Button*, pCheckBox, void)
diff --git a/sc/source/ui/optdlg/calcoptionsdlg.hxx b/sc/source/ui/optdlg/calcoptionsdlg.hxx
index f7a2040d6657..7f9923bda8f3 100644
--- a/sc/source/ui/optdlg/calcoptionsdlg.hxx
+++ b/sc/source/ui/optdlg/calcoptionsdlg.hxx
@@ -43,8 +43,8 @@ public:
     DECL_LINK( EditModifiedHdl, Edit * );
     DECL_STATIC_LINK_TYPED( ScCalcOptionsDialog, TestClickHdl, Button*, void );
     DECL_LINK_TYPED( AsZeroModifiedHdl, Button*, void);
-    DECL_LINK( ConversionModifiedHdl, ListBox*);
-    DECL_LINK( SyntaxModifiedHdl, ListBox*);
+    DECL_LINK_TYPED( ConversionModifiedHdl, ListBox&, void);
+    DECL_LINK_TYPED( SyntaxModifiedHdl, ListBox&, void);
     DECL_LINK_TYPED( CBUseOpenCLHdl, Button*, void);
     DECL_LINK( SpinOpenCLMinSizeHdl, NumericField*);
 
diff --git a/sc/source/ui/optdlg/tpusrlst.cxx b/sc/source/ui/optdlg/tpusrlst.cxx
index 2c96167fb022..864b871db90b 100644
--- a/sc/source/ui/optdlg/tpusrlst.cxx
+++ b/sc/source/ui/optdlg/tpusrlst.cxx
@@ -457,9 +457,9 @@ void ScTpUserLists::RemoveList( size_t nList )
 
 // Handler:
 
-IMPL_LINK( ScTpUserLists, LbSelectHdl, ListBox*, pLb )
+IMPL_LINK_TYPED( ScTpUserLists, LbSelectHdl, ListBox&, rLb, void )
 {
-    if ( pLb == mpLbLists )
+    if ( &rLb == mpLbLists )
     {
         sal_Int32 nSelPos = mpLbLists->GetSelectEntryPos();
         if ( nSelPos != LISTBOX_ENTRY_NOTFOUND )
@@ -476,8 +476,6 @@ IMPL_LINK( ScTpUserLists, LbSelectHdl, ListBox*, pLb )
             UpdateEntries( nSelPos );
         }
     }
-
-    return 0;
 }
 
 IMPL_LINK_TYPED( ScTpUserLists, BtnClickHdl, Button*, pBtn, void )
@@ -515,7 +513,7 @@ IMPL_LINK_TYPED( ScTpUserLists, BtnClickHdl, Button*, pBtn, void )
             if ( mpLbLists->GetEntryCount() > 0 )
             {
                 mpLbLists->SelectEntryPos( nCancelPos );
-                LbSelectHdl( mpLbLists );
+                LbSelectHdl( *mpLbLists.get() );
                 mpFtLists->Enable();
                 mpLbLists->Enable();
             }
@@ -552,7 +550,7 @@ IMPL_LINK_TYPED( ScTpUserLists, BtnClickHdl, Button*, pBtn, void )
                 AddNewList( theEntriesStr );
                 UpdateUserListBox();
                 mpLbLists->SelectEntryPos( mpLbLists->GetEntryCount()-1 );
-                LbSelectHdl( mpLbLists );
+                LbSelectHdl( *mpLbLists.get() );
                 mpFtLists->Enable();
                 mpLbLists->Enable();
             }
@@ -561,7 +559,7 @@ IMPL_LINK_TYPED( ScTpUserLists, BtnClickHdl, Button*, pBtn, void )
                 if ( mpLbLists->GetEntryCount() > 0 )
                 {
                     mpLbLists->SelectEntryPos( nCancelPos );
-                    LbSelectHdl( mpLbLists );
+                    LbSelectHdl( *mpLbLists.get() );
                     mpLbLists->Enable();
                     mpLbLists->Enable();
                 }
@@ -589,7 +587,7 @@ IMPL_LINK_TYPED( ScTpUserLists, BtnClickHdl, Button*, pBtn, void )
             else
             {
                 mpLbLists->SelectEntryPos( 0 );
-                LbSelectHdl( mpLbLists );
+                LbSelectHdl( *mpLbLists.get() );
             }
 
             mpBtnNew->Show();
@@ -636,7 +634,7 @@ IMPL_LINK_TYPED( ScTpUserLists, BtnClickHdl, Button*, pBtn, void )
                         ( nRemovePos >= mpLbLists->GetEntryCount() )
                             ? mpLbLists->GetEntryCount()-1
                             : nRemovePos );
-                    LbSelectHdl( mpLbLists );
+                    LbSelectHdl( *mpLbLists.get() );
                 }
                 else
                 {
@@ -693,7 +691,7 @@ IMPL_LINK_TYPED( ScTpUserLists, BtnClickHdl, Button*, pBtn, void )
             CopyListFromArea( theStartPos, theEndPos );
             UpdateUserListBox();
             mpLbLists->SelectEntryPos( mpLbLists->GetEntryCount()-1 );
-            LbSelectHdl( mpLbLists );
+            LbSelectHdl( *mpLbLists.get() );
             mpEdCopyFrom->SetText( theAreaStr );
             mpEdCopyFrom->Disable();
             mpBtnCopy->Disable();
diff --git a/sc/source/ui/optdlg/tpview.cxx b/sc/source/ui/optdlg/tpview.cxx
index c2db50993c06..740702a5d2e2 100644
--- a/sc/source/ui/optdlg/tpview.cxx
+++ b/sc/source/ui/optdlg/tpview.cxx
@@ -69,7 +69,7 @@ ScTpContentOptions::ScTpContentOptions( vcl::Window*         pParent,
     get(pOutlineCB,"outline");
 
     SetExchangeSupport();
-    Link<> aSelObjHdl(LINK( this, ScTpContentOptions, SelLbObjHdl ) );
+    Link<ListBox&,void> aSelObjHdl(LINK( this, ScTpContentOptions, SelLbObjHdl ) );
     pObjGrfLB->  SetSelectHdl(aSelObjHdl);
     pDiagramLB-> SetSelectHdl(aSelObjHdl);
     pDrawLB->    SetSelectHdl(aSelObjHdl);
@@ -244,20 +244,18 @@ SfxTabPage::sfxpg ScTpContentOptions::DeactivatePage( SfxItemSet* pSetP )
     return SfxTabPage::LEAVE_PAGE;
 }
 
-IMPL_LINK( ScTpContentOptions, SelLbObjHdl, ListBox*, pLb )
+IMPL_LINK_TYPED( ScTpContentOptions, SelLbObjHdl, ListBox&, rLb, void )
 {
-    const sal_Int32 nSelPos = pLb->GetSelectEntryPos();
+    const sal_Int32 nSelPos = rLb.GetSelectEntryPos();
     ScVObjMode  eMode   = ScVObjMode(nSelPos);
     ScVObjType  eType   = VOBJ_TYPE_OLE;
 
-    if ( pLb == pDiagramLB )
+    if ( &rLb == pDiagramLB )
         eType = VOBJ_TYPE_CHART;
-    else if ( pLb == pDrawLB )
+    else if ( &rLb == pDrawLB )
         eType = VOBJ_TYPE_DRAW;
 
     pLocalOptions->SetObjMode( eType, eMode );
-
-    return 0;
 }
 
 IMPL_LINK_TYPED( ScTpContentOptions, CBHdl, Button*, pBtn, void )
@@ -358,9 +356,9 @@ void ScTpContentOptions::InitGridOpt()
         pColorLB->SelectEntryPos( pColorLB->InsertEntry( aCol, aName ) );
 }
 
-IMPL_LINK( ScTpContentOptions, GridHdl, ListBox*, pLb )
+IMPL_LINK_TYPED( ScTpContentOptions, GridHdl, ListBox&, rLb, void )
 {
-    sal_Int32   nSelPos = pLb->GetSelectEntryPos();
+    sal_Int32   nSelPos = rLb.GetSelectEntryPos();
     bool    bGrid = ( nSelPos <= 1 );
     bool    bGridOnTop = ( nSelPos == 1 );
 
@@ -368,7 +366,6 @@ IMPL_LINK( ScTpContentOptions, GridHdl, ListBox*, pLb )
     pColorLB->Enable(bGrid);
     pLocalOptions->SetOption( VOPT_GRID, bGrid );
     pLocalOptions->SetOption( VOPT_GRID_ONTOP, bGridOnTop );
-    return 0;
 }
 
 ScTpLayoutOptions::ScTpLayoutOptions(   vcl::Window* pParent,
@@ -681,7 +678,7 @@ SfxTabPage::sfxpg ScTpLayoutOptions::DeactivatePage( SfxItemSet* pSetP )
     return SfxTabPage::LEAVE_PAGE;
 }
 
-IMPL_LINK_NOARG(ScTpLayoutOptions, MetricHdl)
+IMPL_LINK_NOARG_TYPED(ScTpLayoutOptions, MetricHdl, ListBox&, void)
 {
     const sal_Int32 nMPos = m_pUnitLB->GetSelectEntryPos();
     if(nMPos != LISTBOX_ENTRY_NOTFOUND)
@@ -692,8 +689,6 @@ IMPL_LINK_NOARG(ScTpLayoutOptions, MetricHdl)
         ::SetFieldUnit( *m_pTabMF, eFieldUnit );
         m_pTabMF->SetValue( m_pTabMF->Normalize( nVal ), FUNIT_TWIP );
     }
-
-    return 0;
 }
 
 IMPL_LINK_TYPED( ScTpLayoutOptions, AlignHdl, Button*, pBox, void )