convert Link<> to typed

Change-Id: Icb335b68df33eccf0b972fad64954806cd93b68d

4 files changed, 18 insertions, 20 deletions

diff --git a/sd/source/ui/inc/MasterPageObserver.hxx b/sd/source/ui/inc/MasterPageObserver.hxx
index 8ac9096e2394..057ef8e99ab1 100644
--- a/sd/source/ui/inc/MasterPageObserver.hxx
+++ b/sd/source/ui/inc/MasterPageObserver.hxx
@@ -30,6 +30,8 @@ class SdDrawDocument;
 
 namespace sd {
 
+class MasterPageObserverEvent;
+
 /** This singleton observes all registered documents for changes in the used
     master pages and in turn informs its listeners about it.  One such
     listener is the master page selector control in the tool panel that
@@ -61,7 +63,7 @@ public:
             The event listener to call for future events.  Call
             RemoveEventListener() before the listener is destroyed.
     */
-    void AddEventListener (const Link<>& rEventListener);
+    void AddEventListener (const Link<MasterPageObserverEvent&,void>& rEventListener);
 
     /** Remove the given listener from the list of listeners.
         @param rEventListener
@@ -69,7 +71,7 @@ public:
             from this object.  Passing a listener that has not
             been registered before is safe and is silently ignored.
     */
-    void RemoveEventListener (const Link<>& rEventListener);
+    void RemoveEventListener (const Link<MasterPageObserverEvent&,void>& rEventListener);
 
 private:
     static ::osl::Mutex maMutex;
diff --git a/sd/source/ui/sidebar/MasterPageObserver.cxx b/sd/source/ui/sidebar/MasterPageObserver.cxx
index 1df0a078bb24..9e71684192d4 100644
--- a/sd/source/ui/sidebar/MasterPageObserver.cxx
+++ b/sd/source/ui/sidebar/MasterPageObserver.cxx
@@ -56,7 +56,7 @@ public:
             The event listener to call for future events.  Call
             RemoveEventListener() before the listener is destroyed.
     */
-    void AddEventListener (const Link<>& rEventListener);
+    void AddEventListener (const Link<MasterPageObserverEvent&,void>& rEventListener);
 
     /** Remove the given listener from the list of listeners.
         @param rEventListener
@@ -64,10 +64,10 @@ public:
             from this object.  Passing a listener that has not
             been registered before is safe and is silently ignored.
     */
-    void RemoveEventListener (const Link<>& rEventListener);
+    void RemoveEventListener (const Link<MasterPageObserverEvent&,void>& rEventListener);
 
 private:
-    ::std::vector<Link<>> maListeners;
+    ::std::vector<Link<MasterPageObserverEvent&,void>> maListeners;
 
     struct DrawDocHash {
         size_t operator()(SdDrawDocument* argument) const
@@ -127,13 +127,13 @@ void MasterPageObserver::UnregisterDocument (SdDrawDocument& rDocument)
     mpImpl->UnregisterDocument (rDocument);
 }
 
-void MasterPageObserver::AddEventListener (const Link<>& rEventListener)
+void MasterPageObserver::AddEventListener (const Link<MasterPageObserverEvent&,void>& rEventListener)
 {
 
     mpImpl->AddEventListener (rEventListener);
 }
 
-void MasterPageObserver::RemoveEventListener (const Link<>& rEventListener)
+void MasterPageObserver::RemoveEventListener (const Link<MasterPageObserverEvent&,void>& rEventListener)
 {
     mpImpl->RemoveEventListener (rEventListener);
 }
@@ -176,7 +176,7 @@ void MasterPageObserver::Implementation::UnregisterDocument (
 }
 
 void MasterPageObserver::Implementation::AddEventListener (
-    const Link<>& rEventListener)
+    const Link<MasterPageObserverEvent&,void>& rEventListener)
 {
     if (::std::find (
         maListeners.begin(),
@@ -208,7 +208,7 @@ void MasterPageObserver::Implementation::AddEventListener (
 }
 
 void MasterPageObserver::Implementation::RemoveEventListener (
-    const Link<>& rEventListener)
+    const Link<MasterPageObserverEvent&,void>& rEventListener)
 {
     maListeners.erase (
         ::std::find (
@@ -334,12 +334,9 @@ void MasterPageObserver::Implementation::AnalyzeUsedMasterPages (
 void MasterPageObserver::Implementation::SendEvent (
     MasterPageObserverEvent& rEvent)
 {
-    ::std::vector<Link<>>::iterator aLink (maListeners.begin());
-    ::std::vector<Link<>>::iterator aEnd (maListeners.end());
-    while (aLink!=aEnd)
+    for (auto& aLink : maListeners)
     {
-        aLink->Call (&rEvent);
-        ++aLink;
+        aLink.Call(rEvent);
     }
 }
 
diff --git a/sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx b/sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx
index 53d9fe7f41f9..1168b3c65ca0 100644
--- a/sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx
+++ b/sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx
@@ -281,15 +281,15 @@ void RecentlyUsedMasterPages::SendEvent()
     }
 }
 
-IMPL_LINK(RecentlyUsedMasterPages, MasterPageChangeListener,
-    MasterPageObserverEvent*, pEvent)
+IMPL_LINK_TYPED(RecentlyUsedMasterPages, MasterPageChangeListener,
+    MasterPageObserverEvent&, rEvent, void)
 {
-    switch (pEvent->meType)
+    switch (rEvent.meType)
     {
         case MasterPageObserverEvent::ET_MASTER_PAGE_ADDED:
         case MasterPageObserverEvent::ET_MASTER_PAGE_EXISTS:
             AddMasterPage(
-                mpContainer->GetTokenForStyleName(pEvent->mrMasterPageName));
+                mpContainer->GetTokenForStyleName(rEvent.mrMasterPageName));
             break;
 
         case MasterPageObserverEvent::ET_MASTER_PAGE_REMOVED:
@@ -299,7 +299,6 @@ IMPL_LINK(RecentlyUsedMasterPages, MasterPageChangeListener,
             SendEvent();
             break;
     }
-    return 0;
 }
 
 IMPL_LINK_TYPED(RecentlyUsedMasterPages, MasterPageContainerChangeListener,
diff --git a/sd/source/ui/sidebar/RecentlyUsedMasterPages.hxx b/sd/source/ui/sidebar/RecentlyUsedMasterPages.hxx
index 47bdf836a8e9..51f3a299116d 100644
--- a/sd/source/ui/sidebar/RecentlyUsedMasterPages.hxx
+++ b/sd/source/ui/sidebar/RecentlyUsedMasterPages.hxx
@@ -103,7 +103,7 @@ private:
     RecentlyUsedMasterPages& operator= (const RecentlyUsedMasterPages&) SAL_DELETED_FUNCTION;
 
     void SendEvent();
-    DECL_LINK(MasterPageChangeListener, MasterPageObserverEvent*);
+    DECL_LINK_TYPED(MasterPageChangeListener, MasterPageObserverEvent&, void);
     DECL_LINK_TYPED(MasterPageContainerChangeListener, MasterPageContainerChangeEvent&, void);
 
     /** Add a descriptor for the specified master page to the end of the