convert Link<> to typed

Change-Id: I87d4697fe032e3095406becdda026447edd1d68a

4 files changed, 10 insertions, 14 deletions

diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index 777c8b8fc7e6..6bb0d37b9fa4 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -2066,7 +2066,7 @@ void ScInputHandler::SyncViews( EditView* pSourceView )
     }
 }
 
-IMPL_LINK_NOARG(ScInputHandler, ModifyHdl)
+IMPL_LINK_NOARG_TYPED(ScInputHandler, ModifyHdl, LinkParamNone*, void)
 {
     if ( !bInOwnChange && ( eMode==SC_INPUT_TYPE || eMode==SC_INPUT_TABLE ) &&
          pEngine && pEngine->GetUpdateMode() && pInputWin )
@@ -2081,7 +2081,6 @@ IMPL_LINK_NOARG(ScInputHandler, ModifyHdl)
         lcl_RemoveTabs(aText);
         pInputWin->SetTextString(aText);
     }
-    return 0;
 }
 
 /**
diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index 6293db35be83..a717f00fdd38 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -1238,10 +1238,9 @@ void ScMultiTextWnd::Resize()
     SetScrollBarRange();
 }
 
-IMPL_LINK(ScMultiTextWnd, ModifyHdl, EENotify*, pNotify)
+IMPL_LINK_NOARG_TYPED(ScMultiTextWnd, ModifyHdl, LinkParamNone*, void)
 {
-    ScTextWnd::NotifyHdl( pNotify );
-    return 0;
+    ScTextWnd::NotifyHdl(nullptr);
 }
 
 IMPL_LINK_TYPED(ScMultiTextWnd, NotifyHdl, EENotify&, rNotify, void)
@@ -1816,7 +1815,7 @@ void ScTextWnd::StartEditEngine()
         pViewFrm->GetBindings().Invalidate( SID_ATTR_INSERT );
 }
 
-IMPL_LINK_NOARG(ScTextWnd, NotifyHdl)
+IMPL_LINK_NOARG_TYPED(ScTextWnd, NotifyHdl, LinkParamNone*, void)
 {
     if (pEditView && !bInputMode)
     {
@@ -1828,8 +1827,6 @@ IMPL_LINK_NOARG(ScTextWnd, NotifyHdl)
         if ( pHdl && !pHdl->IsInOwnChange() )
             pHdl->InputChanged( pEditView, true );  // #i20282# InputChanged must know if called from modify handler
     }
-
-    return 0;
 }
 
 void ScTextWnd::StopEditEngine( bool bAll )
@@ -1846,7 +1843,7 @@ void ScTextWnd::StopEditEngine( bool bAll )
         aString = pEditEngine->GetText();
         bIsInsertMode = pEditView->IsInsertMode();
         bool bSelection = pEditView->HasSelection();
-        pEditEngine->SetModifyHdl(Link<>());
+        pEditEngine->SetModifyHdl(Link<LinkParamNone*,void>());
         DELETEZ(pEditView);
         DELETEZ(pEditEngine);
 
diff --git a/sc/source/ui/inc/inputhdl.hxx b/sc/source/ui/inc/inputhdl.hxx
index e53d7de3c16b..581cee95db7d 100644
--- a/sc/source/ui/inc/inputhdl.hxx
+++ b/sc/source/ui/inc/inputhdl.hxx
@@ -158,7 +158,7 @@ private:
     void            SkipClosingPar();
     bool            GetFuncName( OUString& aStart, OUString& aResult );  // fdo75264
     void            ShowArgumentsTip( OUString& rSelText );
-    DECL_LINK( ModifyHdl, void* );
+    DECL_LINK_TYPED( ModifyHdl, LinkParamNone*, void );
     DECL_LINK( ShowHideTipVisibleParentListener, VclWindowEvent* );
     DECL_LINK( ShowHideTipVisibleSecParentListener, VclWindowEvent* );
 
diff --git a/sc/source/ui/inc/inputwin.hxx b/sc/source/ui/inc/inputwin.hxx
index e4b10edc5ae8..d1fb1a2f221e 100644
--- a/sc/source/ui/inc/inputwin.hxx
+++ b/sc/source/ui/inc/inputwin.hxx
@@ -67,7 +67,7 @@ public:
     virtual void            SetTextString( const OUString& rString ) SAL_OVERRIDE;
     virtual const OUString& GetTextString() const SAL_OVERRIDE;
 
-    bool            IsInputActive() SAL_OVERRIDE;
+    bool                     IsInputActive() SAL_OVERRIDE;
     virtual EditView*       GetEditView() SAL_OVERRIDE;
 
                         // for function autopilots
@@ -78,7 +78,7 @@ public:
 
     virtual void            TextGrabFocus() SAL_OVERRIDE;
 
-    virtual void    DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE;
+    virtual void             DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE;
 
     virtual void            SetFormulaMode( bool bSet ) SAL_OVERRIDE;
 
@@ -87,7 +87,7 @@ public:
     virtual void            InsertAccessibleTextData( ScAccessibleEditLineTextData& rTextData ) SAL_OVERRIDE;
     virtual void            RemoveAccessibleTextData( ScAccessibleEditLineTextData& rTextData ) SAL_OVERRIDE;
 
-    DECL_LINK( NotifyHdl, void* );
+    DECL_LINK_TYPED( NotifyHdl, LinkParamNone*, void );
 
 protected:
     virtual void    Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE;
@@ -187,7 +187,7 @@ protected:
 
     virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE;
     DECL_LINK_TYPED( NotifyHdl, EENotify&, void );
-    DECL_LINK( ModifyHdl, EENotify* );
+    DECL_LINK_TYPED( ModifyHdl, LinkParamNone*, void );
 private:
     ScInputBarGroup& mrGroupBar;
     long mnLines;