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, 14 insertions, 17 deletions

diff --git a/reportdesign/source/ui/dlg/Condition.cxx b/reportdesign/source/ui/dlg/Condition.cxx
index bf7e664bd519..41a4b0d171f2 100644
--- a/reportdesign/source/ui/dlg/Condition.cxx
+++ b/reportdesign/source/ui/dlg/Condition.cxx
@@ -398,17 +398,15 @@ void Condition::GetFocus()
         m_pCondLHS->GrabFocus();
 }
 
-IMPL_LINK( Condition, OnTypeSelected, ListBox*, /*_pNotInterestedIn*/ )
+IMPL_LINK_NOARG_TYPED( Condition, OnTypeSelected, ListBox&, void )
 {
     impl_layoutOperands();
-    return 0L;
 }
 
 
-IMPL_LINK( Condition, OnOperationSelected, ListBox*, /*_pNotInterestedIn*/ )
+IMPL_LINK_NOARG_TYPED( Condition, OnOperationSelected, ListBox&, void )
 {
     impl_layoutOperands();
-    return 0L;
 }
 
 void Condition::impl_layoutOperands()
diff --git a/reportdesign/source/ui/dlg/Condition.hxx b/reportdesign/source/ui/dlg/Condition.hxx
index 294fd18d1799..c8660d062c5c 100644
--- a/reportdesign/source/ui/dlg/Condition.hxx
+++ b/reportdesign/source/ui/dlg/Condition.hxx
@@ -167,8 +167,8 @@ namespace rptui
         void    impl_setCondition( const OUString& _rConditionFormula );
 
     private:
-        DECL_LINK( OnTypeSelected, ListBox* );
-        DECL_LINK( OnOperationSelected, ListBox* );
+        DECL_LINK_TYPED( OnTypeSelected, ListBox&, void );
+        DECL_LINK_TYPED( OnOperationSelected, ListBox&, void );
     };
 
 
diff --git a/reportdesign/source/ui/dlg/GroupsSorting.cxx b/reportdesign/source/ui/dlg/GroupsSorting.cxx
index 68ce8f2f20c6..26665dd16cca 100644
--- a/reportdesign/source/ui/dlg/GroupsSorting.cxx
+++ b/reportdesign/source/ui/dlg/GroupsSorting.cxx
@@ -1177,18 +1177,18 @@ IMPL_LINK_NOARG_TYPED( OGroupsSortingDialog, OnFormatAction, ToolBox*, void )
     }
 }
 
-IMPL_LINK( OGroupsSortingDialog, LBChangeHdl, ListBox*, pListBox )
+IMPL_LINK_TYPED( OGroupsSortingDialog, LBChangeHdl, ListBox&, rListBox, void )
 {
-    if ( pListBox->IsValueChangedFromSaved() )
+    if ( rListBox.IsValueChangedFromSaved() )
     {
         sal_Int32 nRow = m_pFieldExpression->GetCurRow();
         sal_Int32 nGroupPos = m_pFieldExpression->getGroupPosition(nRow);
-        if (pListBox != m_pHeaderLst && pListBox != m_pFooterLst)
+        if (&rListBox != m_pHeaderLst && &rListBox != m_pFooterLst)
         {
-            if ( pListBox->IsValueChangedFromSaved() )
+            if ( rListBox.IsValueChangedFromSaved() )
                 SaveData(nRow);
-            if ( pListBox == m_pGroupOnLst )
-                m_pGroupIntervalEd->Enable( pListBox->GetSelectEntryPos() != 0 );
+            if ( &rListBox == m_pGroupOnLst )
+                m_pGroupIntervalEd->Enable( rListBox.GetSelectEntryPos() != 0 );
         }
         else if ( nGroupPos != NO_GROUP )
         {
@@ -1197,17 +1197,16 @@ IMPL_LINK( OGroupsSortingDialog, LBChangeHdl, ListBox*, pListBox )
             aArgs[1].Name = PROPERTY_GROUP;
             aArgs[1].Value <<= xGroup;
 
-            if ( m_pHeaderLst  == pListBox )
+            if ( m_pHeaderLst  == &rListBox )
                 aArgs[0].Name = PROPERTY_HEADERON;
             else
                 aArgs[0].Name = PROPERTY_FOOTERON;
 
-            aArgs[0].Value <<= pListBox->GetSelectEntryPos() == 0;
-            m_pController->executeChecked(m_pHeaderLst  == pListBox ? SID_GROUPHEADER : SID_GROUPFOOTER,aArgs);
+            aArgs[0].Value <<= rListBox.GetSelectEntryPos() == 0;
+            m_pController->executeChecked(m_pHeaderLst  == &rListBox ? SID_GROUPHEADER : SID_GROUPFOOTER, aArgs);
             m_pFieldExpression->InvalidateHandleColumn();
         }
     }
-    return 1L;
 }
 
 void OGroupsSortingDialog::showHelpText(sal_uInt16 _nResId)
diff --git a/reportdesign/source/ui/inc/GroupsSorting.hxx b/reportdesign/source/ui/inc/GroupsSorting.hxx
index 3b3fd602dd28..4b9ed07e75ba 100644
--- a/reportdesign/source/ui/inc/GroupsSorting.hxx
+++ b/reportdesign/source/ui/inc/GroupsSorting.hxx
@@ -84,7 +84,7 @@ class OGroupsSortingDialog :    public FloatingWindow
 private:
     DECL_LINK_TYPED( OnControlFocusLost, Control&, void );
     DECL_LINK_TYPED( OnControlFocusGot, Control&, void );
-    DECL_LINK( LBChangeHdl, ListBox* );
+    DECL_LINK_TYPED( LBChangeHdl, ListBox&, void );
     DECL_LINK_TYPED( OnFormatAction, ToolBox*, void );
 
     /** returns the groups