convert Link<> to typed

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

8 files changed, 21 insertions, 23 deletions

diff --git a/sc/source/ui/inc/acredlin.hxx b/sc/source/ui/inc/acredlin.hxx
index 9ee1f8cc93de..3516edc7c7b5 100644
--- a/sc/source/ui/inc/acredlin.hxx
+++ b/sc/source/ui/inc/acredlin.hxx
@@ -99,19 +99,19 @@ private:
 
     DECL_LINK_TYPED( FilterHandle, SvxTPFilter*, void );
     DECL_LINK_TYPED( RefHandle, SvxTPFilter*, void );
-    DECL_LINK_TYPED( RejectHandle, SvxTPView*, void);
-    DECL_LINK_TYPED( AcceptHandle, SvxTPView*, void);
-    DECL_LINK_TYPED( RejectAllHandle, SvxTPView*, void);
-    DECL_LINK_TYPED( AcceptAllHandle, SvxTPView*, void);
-    DECL_LINK_TYPED( ExpandingHandle, SvTreeListBox*, bool);
-    DECL_LINK_TYPED( SelectHandle, SvTreeListBox*, void);
-    DECL_LINK( RefInfoHandle, OUString*);
+    DECL_LINK_TYPED( RejectHandle, SvxTPView*, void );
+    DECL_LINK_TYPED( AcceptHandle, SvxTPView*, void );
+    DECL_LINK_TYPED( RejectAllHandle, SvxTPView*, void );
+    DECL_LINK_TYPED( AcceptAllHandle, SvxTPView*, void );
+    DECL_LINK_TYPED( ExpandingHandle, SvTreeListBox*, bool );
+    DECL_LINK_TYPED( SelectHandle, SvTreeListBox*, void );
+    DECL_LINK_TYPED( RefInfoHandle, const OUString*, void );
 
     DECL_LINK_TYPED( UpdateSelectionHdl, Idle*, void );
-    DECL_LINK_TYPED( ChgTrackModHdl, ScChangeTrack&, void);
-    DECL_LINK_TYPED( CommandHdl, SvSimpleTable*, void);
+    DECL_LINK_TYPED( ChgTrackModHdl, ScChangeTrack&, void );
+    DECL_LINK_TYPED( CommandHdl, SvSimpleTable*, void );
     DECL_LINK_TYPED( ReOpenTimerHdl, Idle*, void );
-    DECL_LINK_TYPED( ColCompareHdl, const SvSortData*, sal_Int32);
+    DECL_LINK_TYPED( ColCompareHdl, const SvSortData*, sal_Int32 );
 
 protected:
 
diff --git a/sc/source/ui/inc/reffact.hxx b/sc/source/ui/inc/reffact.hxx
index 83a29f6e58ea..e3e8bccad264 100644
--- a/sc/source/ui/inc/reffact.hxx
+++ b/sc/source/ui/inc/reffact.hxx
@@ -161,7 +161,7 @@ class ScSimpleRefDlgWrapper: public SfxChildWindow
 
         static void     SetDefaultPosSize(Point aPos, Size aSize, bool bSet = true);
         void            SetRefString(const OUString& rStr);
-        void            SetCloseHdl( const Link<>& rLink );
+        void            SetCloseHdl( const Link<const OUString*,void>& rLink );
         void            SetUnoLinks( const Link<>& rDone, const Link<>& rAbort,
                                         const Link<>& rChange );
         void            SetFlags( bool bCloseOnButtonUp, bool bSingleCell, bool bMultiSelection );
diff --git a/sc/source/ui/inc/simpref.hxx b/sc/source/ui/inc/simpref.hxx
index 47c320217c35..d02a4f120c22 100644
--- a/sc/source/ui/inc/simpref.hxx
+++ b/sc/source/ui/inc/simpref.hxx
@@ -35,7 +35,7 @@ class ScDocument;
 class ScSimpleRefDlg: public ScAnyRefDlg
 {
 private:
-    Link<>          aCloseHdl;
+    Link<const OUString*,void> aCloseHdl;
     Link<>          aDoneHdl;
     Link<>          aAbortedHdl;
     Link<>          aChangeHdl;
@@ -65,7 +65,7 @@ protected:
 
 public:
                     ScSimpleRefDlg( SfxBindings* pB, SfxChildWindow* pCW, vcl::Window* pParent);
-                    virtual ~ScSimpleRefDlg();
+    virtual        ~ScSimpleRefDlg();
     virtual void    dispose() SAL_OVERRIDE;
 
     virtual void    SetReference( const ScRange& rRef, ScDocument* pDoc ) SAL_OVERRIDE;
@@ -76,10 +76,10 @@ public:
 
     void            StartRefInput();
 
-    void           SetRefString(const OUString &rStr);
-    virtual void   FillInfo(SfxChildWinInfo&) const SAL_OVERRIDE;
+    void            SetRefString(const OUString &rStr);
+    virtual void    FillInfo(SfxChildWinInfo&) const SAL_OVERRIDE;
 
-    void            SetCloseHdl( const Link<>& rLink );
+    void            SetCloseHdl( const Link<const OUString*,void>& rLink );
     void            SetUnoLinks( const Link<>& rDone, const Link<>& rAbort,
                                 const Link<>& rChange );
 
diff --git a/sc/source/ui/inc/tabvwsh.hxx b/sc/source/ui/inc/tabvwsh.hxx
index a560d52acbf0..521f2faea648 100644
--- a/sc/source/ui/inc/tabvwsh.hxx
+++ b/sc/source/ui/inc/tabvwsh.hxx
@@ -183,7 +183,7 @@ private:
     void          DoReadUserDataSequence( const ::com::sun::star::uno::Sequence<
                                      ::com::sun::star::beans::PropertyValue >& rSettings );
 
-    DECL_LINK( SimpleRefClose, void* );
+    DECL_LINK_TYPED( SimpleRefClose, const OUString*, void );
     DECL_LINK( SimpleRefDone, OUString* );
     DECL_LINK( SimpleRefAborted, OUString* );
     DECL_LINK( SimpleRefChange, OUString* );
diff --git a/sc/source/ui/miscdlgs/acredlin.cxx b/sc/source/ui/miscdlgs/acredlin.cxx
index 676bad75558f..08aa8a7216e5 100644
--- a/sc/source/ui/miscdlgs/acredlin.cxx
+++ b/sc/source/ui/miscdlgs/acredlin.cxx
@@ -890,7 +890,7 @@ IMPL_LINK_NOARG_TYPED(ScAcceptChgDlg, RefHandle, SvxTPFilter*, void)
     }
 }
 
-IMPL_LINK( ScAcceptChgDlg, RefInfoHandle, OUString*, pResult)
+IMPL_LINK_TYPED( ScAcceptChgDlg, RefInfoHandle, const OUString*, pResult, void)
 {
     sal_uInt16 nId;
 
@@ -921,7 +921,6 @@ IMPL_LINK( ScAcceptChgDlg, RefInfoHandle, OUString*, pResult)
         nId = ScAcceptChgDlgWrapper::GetChildWindowId();
         pViewFrm->SetChildWindow( nId, false );
     }
-    return 0;
 }
 
 IMPL_LINK_TYPED( ScAcceptChgDlg, FilterHandle, SvxTPFilter*, pRef, void )
diff --git a/sc/source/ui/miscdlgs/simpref.cxx b/sc/source/ui/miscdlgs/simpref.cxx
index c6e121abaa86..9fe9592da97d 100644
--- a/sc/source/ui/miscdlgs/simpref.cxx
+++ b/sc/source/ui/miscdlgs/simpref.cxx
@@ -149,7 +149,7 @@ bool ScSimpleRefDlg::IsRefInputMode() const
     return true;
 }
 
-void ScSimpleRefDlg::SetCloseHdl( const Link<>& rLink )
+void ScSimpleRefDlg::SetCloseHdl( const Link<const OUString*,void>& rLink )
 {
     aCloseHdl=rLink;
 }
diff --git a/sc/source/ui/view/reffact.cxx b/sc/source/ui/view/reffact.cxx
index 44712f04ef3b..11f3a90ac21c 100644
--- a/sc/source/ui/view/reffact.cxx
+++ b/sc/source/ui/view/reffact.cxx
@@ -194,7 +194,7 @@ void ScSimpleRefDlgWrapper::SetRefString(const OUString& rStr)
     }
 }
 
-void ScSimpleRefDlgWrapper::SetCloseHdl( const Link<>& rLink )
+void ScSimpleRefDlgWrapper::SetCloseHdl( const Link<const OUString*,void>& rLink )
 {
     if(GetWindow())
     {
diff --git a/sc/source/ui/view/tabvwsh4.cxx b/sc/source/ui/view/tabvwsh4.cxx
index e8857c71a254..40b01331354e 100644
--- a/sc/source/ui/view/tabvwsh4.cxx
+++ b/sc/source/ui/view/tabvwsh4.cxx
@@ -1074,7 +1074,7 @@ void ScTabViewShell::StopEditShell()
 
 // close handler to ensure function of dialog:
 
-IMPL_LINK_NOARG(ScTabViewShell, SimpleRefClose)
+IMPL_LINK_NOARG_TYPED(ScTabViewShell, SimpleRefClose, const OUString*, void)
 {
     SfxInPlaceClient* pClient = GetIPClient();
     if ( pClient && pClient->IsObjectInPlaceActive() )
@@ -1086,7 +1086,6 @@ IMPL_LINK_NOARG(ScTabViewShell, SimpleRefClose)
     }
 
     ScSimpleRefDlgWrapper::SetAutoReOpen( true );
-    return 0;
 }
 
 // handlers to call UNO listeners: