tdf#104046 - Slides in the slide pane don't update in realtime

This appears to be a consequence of my change

commit 942716fee138b68c2af9411384f402b5692a88b2
convert EID constants to typed_flags

in that change I made a "fix":
@@ -689,20 +687,20 @@ void
EventMultiplexer::Implementation::CallListeners (EventMultiplexerEvent&
rEv
ListenerList::const_iterator iListenerEnd
(aCopyListeners.end());
for (; iListener!=iListenerEnd; ++iListener)
{
-        if ((iListener->second && rEvent.meEventId))
+        if (iListener->second & rEvent.meEventId)
iListener->first.Call(rEvent);
}
}

which causes this bug.

I should have noticed that my "fix" indicates that the event filtering
part of this multiplexing code was never working, and since no-one has
ever complained about, lets just remove all of this unnecessary
complexity.

Change-Id: Id71613d4fd5817ee1358705059e4ce63d57573ad
Reviewed-on: https://gerrit.libreoffice.org/31894
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

1 files changed, 2 insertions, 14 deletions

diff --git a/sd/source/ui/slidesorter/controller/SlsListener.cxx b/sd/source/ui/slidesorter/controller/SlsListener.cxx
index 0d6f2a499945..330e1a71a88a 100644
--- a/sd/source/ui/slidesorter/controller/SlsListener.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsListener.cxx
@@ -126,13 +126,7 @@ Listener::Listener (
         }
 
         Link<tools::EventMultiplexerEvent&,void> aLink (LINK(this, Listener, EventMultiplexerCallback));
-        mpBase->GetEventMultiplexer()->AddEventListener(
-            aLink,
-            EventMultiplexerEventId::MainViewRemoved
-            | EventMultiplexerEventId::MainViewAdded
-            | EventMultiplexerEventId::ControllerAttached
-            | EventMultiplexerEventId::ControllerDetached
-            | EventMultiplexerEventId::ConfigurationUpdated);
+        mpBase->GetEventMultiplexer()->AddEventListener(aLink);
     }
 }
 
@@ -186,13 +180,7 @@ void Listener::ReleaseListeners()
     if (mpBase != nullptr)
     {
         Link<sd::tools::EventMultiplexerEvent&,void> aLink (LINK(this, Listener, EventMultiplexerCallback));
-        mpBase->GetEventMultiplexer()->RemoveEventListener(
-            aLink,
-            EventMultiplexerEventId::MainViewRemoved
-            | EventMultiplexerEventId::MainViewAdded
-            | EventMultiplexerEventId::ControllerAttached
-            | EventMultiplexerEventId::ControllerDetached
-            | EventMultiplexerEventId::ConfigurationUpdated);
+        mpBase->GetEventMultiplexer()->RemoveEventListener(aLink);
     }
 }