convert Link<> to typed

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

5 files changed, 7 insertions, 8 deletions

diff --git a/sd/source/ui/annotations/annotationwindow.hxx b/sd/source/ui/annotations/annotationwindow.hxx
index 640f3d4086c2..de129e1bab4d 100644
--- a/sd/source/ui/annotations/annotationwindow.hxx
+++ b/sd/source/ui/annotations/annotationwindow.hxx
@@ -135,7 +135,7 @@ class AnnotationWindow : public FloatingWindow
 
         void            ToggleInsMode();
 
-        DECL_LINK( OnlineSpellCallback, SpellCallbackInfo*);
+        DECL_LINK_TYPED( OnlineSpellCallback, SpellCallbackInfo&, void );
 
         virtual void    Deactivate() SAL_OVERRIDE;
         virtual void    Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect) SAL_OVERRIDE;
diff --git a/sd/source/ui/docshell/docshell.cxx b/sd/source/ui/docshell/docshell.cxx
index ca32796f60db..b936ca7c0db9 100644
--- a/sd/source/ui/docshell/docshell.cxx
+++ b/sd/source/ui/docshell/docshell.cxx
@@ -421,7 +421,7 @@ void DrawDocShell::SetModified( bool bSet /* = true */ )
  */
 // ExecuteSpellPopup now handled by DrawDocShell. This is necessary
 // to get hands on the outliner and the text object.
-IMPL_LINK(DrawDocShell, OnlineSpellCallback, SpellCallbackInfo*, pInfo)
+IMPL_LINK_TYPED(DrawDocShell, OnlineSpellCallback, SpellCallbackInfo&, rInfo, void)
 {
     SdrObject* pObj = NULL;
     SdrOutliner* pOutl = NULL;
@@ -432,8 +432,7 @@ IMPL_LINK(DrawDocShell, OnlineSpellCallback, SpellCallbackInfo*, pInfo)
         pObj = GetViewShell()->GetView()->GetTextEditObject();
     }
 
-    mpDoc->ImpOnlineSpellCallback(pInfo, pObj, pOutl);
-    return 0;
+    mpDoc->ImpOnlineSpellCallback(&rInfo, pObj, pOutl);
 }
 
 void DrawDocShell::ClearUndoBuffer()
diff --git a/sd/source/ui/inc/DrawDocShell.hxx b/sd/source/ui/inc/DrawDocShell.hxx
index 5b82479ebf28..6ba5aee41553 100644
--- a/sd/source/ui/inc/DrawDocShell.hxx
+++ b/sd/source/ui/inc/DrawDocShell.hxx
@@ -199,8 +199,8 @@ public:
 
     DECL_LINK( RenameSlideHdl, AbstractSvxNameDialog* );
 
-                            // ExecuteSpellPopup now handled by DrawDocShell
-                            DECL_LINK( OnlineSpellCallback, SpellCallbackInfo* );
+    // ExecuteSpellPopup now handled by DrawDocShell
+    DECL_LINK_TYPED( OnlineSpellCallback, SpellCallbackInfo&, void );
 
     void                    ClearUndoBuffer();
 
diff --git a/sd/source/ui/view/drviews4.cxx b/sd/source/ui/view/drviews4.cxx
index 43dab6be0282..f02fefcf6955 100644
--- a/sd/source/ui/view/drviews4.cxx
+++ b/sd/source/ui/view/drviews4.cxx
@@ -609,7 +609,7 @@ void DrawViewShell::Command(const CommandEvent& rCEvt, ::sd::Window* pWin)
                                     ( !rCEvt.IsMouseEvent() && pOutlinerView->IsCursorAtWrongSpelledWord() ) )
                                 {
                                     // Popup for Online-Spelling now handled by DrawDocShell
-                                    Link<> aLink = LINK(GetDocSh(), DrawDocShell, OnlineSpellCallback);
+                                    Link<SpellCallbackInfo&,void> aLink = LINK(GetDocSh(), DrawDocShell, OnlineSpellCallback);
 
                                     if( !rCEvt.IsMouseEvent() )
                                     {
diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx
index a690de1acc08..4f2c9f67e8ce 100644
--- a/sd/source/ui/view/outlnvsh.cxx
+++ b/sd/source/ui/view/outlnvsh.cxx
@@ -1374,7 +1374,7 @@ void OutlineViewShell::Command( const CommandEvent& rCEvt, ::sd::Window* pWin )
         if (pOLV && pOLV->IsWrongSpelledWordAtPos(aPos))
         {
             // Popup for Online-Spelling now handled by DrawDocShell
-            Link<> aLink = LINK(GetDocSh(), DrawDocShell, OnlineSpellCallback);
+            Link<SpellCallbackInfo&,void> aLink = LINK(GetDocSh(), DrawDocShell, OnlineSpellCallback);
 
             pOLV->ExecuteSpellPopup(aPos, &aLink);
         }