5 files changed, 15 insertions, 17 deletions
diff --git a/editeng/source/editeng/editeng.cxx b/editeng/source/editeng/editeng.cxx
index 1efd13b63ec5..214552b29926 100644
--- a/editeng/source/editeng/editeng.cxx
+++ b/editeng/source/editeng/editeng.cxx
@@ -1498,12 +1498,12 @@ void EditEngine::ShowParagraph( sal_Int32 nParagraph, bool bShow )
     pImpEditEngine->ShowParagraph( nParagraph, bShow );
 }
 
-void EditEngine::SetNotifyHdl( const Link<>& rLink )
+void EditEngine::SetNotifyHdl( const Link<EENotify&,void>& rLink )
 {
     pImpEditEngine->SetNotifyHdl( rLink );
 }
 
-Link<> EditEngine::GetNotifyHdl() const
+Link<EENotify&,void> EditEngine::GetNotifyHdl() const
 {
     return pImpEditEngine->GetNotifyHdl();
 }
diff --git a/editeng/source/editeng/impedit.hxx b/editeng/source/editeng/impedit.hxx
index 04adb48ddb01..f495d0d6345e 100644
--- a/editeng/source/editeng/impedit.hxx
+++ b/editeng/source/editeng/impedit.hxx
@@ -479,8 +479,8 @@ private:
     // If it is detected at one point that the StatusHdl has to be called, but
     // this should not happen immediately (critical section):
     Timer               aStatusTimer;
-    Link<EditStatus&, void>  aStatusHdlLink;
-    Link<>              aNotifyHdl;
+    Link<EditStatus&,void>  aStatusHdlLink;
+    Link<EENotify&,void>    aNotifyHdl;
     Link<>              aImportHdl;
     Link<>              aBeginMovingParagraphsHdl;
     Link<>              aEndMovingParagraphsHdl;
@@ -836,10 +836,10 @@ public:
     EditSelection*  SelectParagraph( sal_Int32 nPara );
 
     void            SetStatusEventHdl( const Link<EditStatus&, void>& rLink ) { aStatusHdlLink = rLink; }
-    Link<EditStatus&, void> GetStatusEventHdl() const               { return aStatusHdlLink; }
+    Link<EditStatus&,void> GetStatusEventHdl() const               { return aStatusHdlLink; }
 
-    void            SetNotifyHdl( const Link<>& rLink )     { aNotifyHdl = rLink; }
-    Link<>          GetNotifyHdl() const            { return aNotifyHdl; }
+    void            SetNotifyHdl( const Link<EENotify&,void>& rLink )     { aNotifyHdl = rLink; }
+    Link<EENotify&,void>   GetNotifyHdl() const            { return aNotifyHdl; }
 
     void            FormatAndUpdate( EditView* pCurView = 0 );
     inline void     IdleFormatAndUpdate( EditView* pCurView = 0 );
diff --git a/editeng/source/editeng/impedit2.cxx b/editeng/source/editeng/impedit2.cxx
index 87507f61f0ca..96b2304d65df 100644
--- a/editeng/source/editeng/impedit2.cxx
+++ b/editeng/source/editeng/impedit2.cxx
@@ -4328,7 +4328,7 @@ bool ImpEditEngine::DoVisualCursorTraveling( const ContentNode* )
 void ImpEditEngine::CallNotify( EENotify& rNotify )
 {
     if ( !nBlockNotifications )
-        GetNotifyHdl().Call( &rNotify );
+        GetNotifyHdl().Call( rNotify );
     else
         aNotifyCache.push_back(rNotify);
 }
@@ -4342,7 +4342,7 @@ void ImpEditEngine::EnterBlockNotifications()
         // client side
         EENotify aNotify( EE_NOTIFY_BLOCKNOTIFICATION_START );
         aNotify.pEditEngine = GetEditEnginePtr();
-        GetNotifyHdl().Call( &aNotify );
+        GetNotifyHdl().Call( aNotify );
     }
 
     nBlockNotifications++;
@@ -4361,12 +4361,12 @@ void ImpEditEngine::LeaveBlockNotifications()
             EENotify aNotify(aNotifyCache[0]);
             // Remove from list before calling, maybe we enter LeaveBlockNotifications while calling the handler...
             aNotifyCache.erase(aNotifyCache.begin());
-            GetNotifyHdl().Call( &aNotify );
+            GetNotifyHdl().Call( aNotify );
         }
 
         EENotify aNotify( EE_NOTIFY_BLOCKNOTIFICATION_END );
         aNotify.pEditEngine = GetEditEnginePtr();
-        GetNotifyHdl().Call( &aNotify );
+        GetNotifyHdl().Call( aNotify );
     }
 }
 
diff --git a/editeng/source/outliner/outlin2.cxx b/editeng/source/outliner/outlin2.cxx
index e4e55ac968b0..805e65188e4b 100644
--- a/editeng/source/outliner/outlin2.cxx
+++ b/editeng/source/outliner/outlin2.cxx
@@ -125,7 +125,7 @@ void Outliner::SetNotifyHdl( const Link<>& rLink )
     if ( rLink.IsSet() )
         pEditEngine->SetNotifyHdl( LINK( this, Outliner, EditEngineNotifyHdl ) );
     else
-        pEditEngine->SetNotifyHdl( Link<>() );
+        pEditEngine->SetNotifyHdl( Link<EENotify&,void>() );
 
 }
 
diff --git a/editeng/source/outliner/outliner.cxx b/editeng/source/outliner/outliner.cxx
index 1694876416df..0e3105a182ed 100644
--- a/editeng/source/outliner/outliner.cxx
+++ b/editeng/source/outliner/outliner.cxx
@@ -2015,14 +2015,12 @@ void Outliner::ImplBlockInsertionCallbacks( bool b )
     }
 }
 
-IMPL_LINK( Outliner, EditEngineNotifyHdl, EENotify*, pNotify )
+IMPL_LINK_TYPED( Outliner, EditEngineNotifyHdl, EENotify&, rNotify, void )
 {
     if ( !nBlockInsCallback )
-        pEditEngine->aOutlinerNotifyHdl.Call( pNotify );
+        pEditEngine->aOutlinerNotifyHdl.Call( &rNotify );
     else
-        pEditEngine->aNotifyCache.push_back(*pNotify);
-
-    return 0;
+        pEditEngine->aNotifyCache.push_back(rNotify);
 }
 
 /** sets a link that is called at the beginning of a drag operation at an edit view */