convert Link<> to typed

Change-Id: Ia0e76911dba6e1e2fd5f01799121c8f4b4219aba

4 files changed, 10 insertions, 10 deletions

diff --git a/sw/inc/crsrsh.hxx b/sw/inc/crsrsh.hxx
index cf6d81805011..e38a6c1df693 100644
--- a/sw/inc/crsrsh.hxx
+++ b/sw/inc/crsrsh.hxx
@@ -170,7 +170,7 @@ private:
                                    into a fly. A macro can then be called */
     Link<SwCrsrShell*,void> m_aChgLnk;             /**< link will be called by every attribute/
                                    format changes at cursor position.*/
-    Link<> m_aGrfArrivedLnk;      ///< Link calls to UI if a graphic is arrived
+    Link<SwCrsrShell&,void> m_aGrfArrivedLnk;      ///< Link calls to UI if a graphic is arrived
 
     SwShellCrsr* m_pCurCrsr;      ///< current cursor
     SwShellCrsr* m_pCrsrStk;      ///< stack for the cursor
@@ -489,8 +489,8 @@ public:
     const Link<SwCrsrShell*,void>& GetChgLnk() const           { return m_aChgLnk; }
 
     // Methods returning/altering ling for "graphic completely loaded".
-    void        SetGrfArrivedLnk( const Link<> &rLnk ) { m_aGrfArrivedLnk = rLnk; }
-    const Link<>& GetGrfArrivedLnk() const           { return m_aGrfArrivedLnk; }
+    void        SetGrfArrivedLnk( const Link<SwCrsrShell&,void> &rLnk ) { m_aGrfArrivedLnk = rLnk; }
+    const Link<SwCrsrShell&,void>& GetGrfArrivedLnk() const           { return m_aGrfArrivedLnk; }
 
     //Call ChgLink. When within an action calling will be delayed.
     void CallChgLnk();
diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx
index 5a2b487f6ac9..92916e4c4a12 100644
--- a/sw/source/core/crsr/crsrsh.cxx
+++ b/sw/source/core/crsr/crsrsh.cxx
@@ -2200,7 +2200,7 @@ void SwCrsrShell::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew )
 
     if( m_aGrfArrivedLnk.IsSet() &&
         ( RES_GRAPHIC_ARRIVED == nWhich || RES_GRAPHIC_SWAPIN == nWhich ))
-        m_aGrfArrivedLnk.Call( this );
+        m_aGrfArrivedLnk.Call( *this );
 }
 
 /** Does the current cursor create a selection?
diff --git a/sw/source/uibase/inc/basesh.hxx b/sw/source/uibase/inc/basesh.hxx
index 38651f917cf0..628fd856fcb7 100644
--- a/sw/source/uibase/inc/basesh.hxx
+++ b/sw/source/uibase/inc/basesh.hxx
@@ -33,6 +33,7 @@
 class SwWrtShell;
 class SwView;
 class SfxItemSet;
+class SwCrsrShell;
 
 struct DBTextStruct_Impl;
 class SwBaseShell: public SfxShell
@@ -49,7 +50,7 @@ class SwBaseShell: public SfxShell
     // Update-Timer for graphic
     std::set<sal_uInt16> aGrfUpdateSlots;
 
-    DECL_LINK( GraphicArrivedHdl, void* );
+    DECL_LINK_TYPED( GraphicArrivedHdl, SwCrsrShell&, void );
 
 protected:
     SwWrtShell&         GetShell();
@@ -57,7 +58,7 @@ protected:
 
     inline SwView&      GetView()                       { return rView; }
     inline void         SetGetStateSet( SfxItemSet* p ) { pGetStateSet = p; }
-    inline bool     AddGrfUpdateSlot( sal_uInt16 nSlot ){ return aGrfUpdateSlots.insert( nSlot ).second; }
+    inline bool         AddGrfUpdateSlot( sal_uInt16 nSlot ){ return aGrfUpdateSlots.insert( nSlot ).second; }
 
     DECL_LINK_TYPED(    InsertDBTextHdl, void*, void );
 
diff --git a/sw/source/uibase/shells/basesh.cxx b/sw/source/uibase/shells/basesh.cxx
index 787c21dbac5e..0fa96789c298 100644
--- a/sw/source/uibase/shells/basesh.cxx
+++ b/sw/source/uibase/shells/basesh.cxx
@@ -1218,7 +1218,7 @@ void SwBaseShell::Execute(SfxRequest &rReq)
 // Here the state fpr SID_IMAP / SID_CONTOUR will be handled
 // until the swapping of the graphic is finished.
 
-IMPL_LINK_NOARG(SwBaseShell, GraphicArrivedHdl)
+IMPL_LINK_NOARG_TYPED(SwBaseShell, GraphicArrivedHdl, SwCrsrShell&, void)
 {
     sal_uInt16 nGrfType;
     SwWrtShell &rSh = GetShell();
@@ -1310,7 +1310,6 @@ IMPL_LINK_NOARG(SwBaseShell, GraphicArrivedHdl)
         }
         aGrfUpdateSlots.clear();
     }
-    return 0;
 }
 
 void SwBaseShell::GetState( SfxItemSet &rSet )
@@ -1923,9 +1922,9 @@ SwBaseShell::~SwBaseShell()
     if( rView.GetCurShell() == this )
         rView.ResetSubShell();
 
-    Link<> aTmp( LINK( this, SwBaseShell, GraphicArrivedHdl));
+    Link<SwCrsrShell&,void> aTmp( LINK( this, SwBaseShell, GraphicArrivedHdl));
     if( aTmp == rView.GetWrtShell().GetGrfArrivedLnk() )
-        rView.GetWrtShell().SetGrfArrivedLnk( Link<>() );
+        rView.GetWrtShell().SetGrfArrivedLnk( Link<SwCrsrShell&,void>() );
 }
 
 void SwBaseShell::ExecTextCtrl( SfxRequest& rReq )