diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-12-12 11:00:47 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-12-12 09:45:03 +0000 |
commit | 69f6fbb5d0ad87c85e0236a7fece107b69eb8b8b (patch) | |
tree | 9c69a71582e38f39e99300f53cb8251358229912 /sd/source/ui/sidebar/LayoutMenu.cxx | |
parent | e9e1ccec47d02dd43c46a6095caa27d19e7f23fb (diff) |
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>
Diffstat (limited to 'sd/source/ui/sidebar/LayoutMenu.cxx')
-rw-r--r-- | sd/source/ui/sidebar/LayoutMenu.cxx | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/sd/source/ui/sidebar/LayoutMenu.cxx b/sd/source/ui/sidebar/LayoutMenu.cxx index a8a21b0e5a0a..c46f20741ce0 100644 --- a/sd/source/ui/sidebar/LayoutMenu.cxx +++ b/sd/source/ui/sidebar/LayoutMenu.cxx @@ -168,14 +168,7 @@ void LayoutMenu::implConstruct( DrawDocShell& rDocumentShell ) InvalidateContent(); Link<::sd::tools::EventMultiplexerEvent&,void> aEventListenerLink (LINK(this,LayoutMenu,EventMultiplexerListener)); - mrBase.GetEventMultiplexer()->AddEventListener(aEventListenerLink, - EventMultiplexerEventId::CurrentPageChanged - | EventMultiplexerEventId::SlideSortedSelection - | EventMultiplexerEventId::MainViewAdded - | EventMultiplexerEventId::MainViewRemoved - | EventMultiplexerEventId::ConfigurationUpdated - | EventMultiplexerEventId::EditModeNormal - | EventMultiplexerEventId::EditModeMaster); + mrBase.GetEventMultiplexer()->AddEventListener(aEventListenerLink); Window::SetHelpId(HID_SD_TASK_PANE_PREVIEW_LAYOUTS); SetAccessibleName(SdResId(STR_TASKPANEL_LAYOUT_MENU_TITLE)); @@ -728,7 +721,6 @@ IMPL_LINK(LayoutMenu, EventMultiplexerListener, ::sd::tools::EventMultiplexerEve break; default: - /* Ignored */ break; } } |