[Libreoffice-commits] core.git: sd/source
Noel Grandin
noel.grandin at collabora.co.uk
Mon Dec 12 09:45:34 UTC 2016
sd/source/ui/animations/CustomAnimationPane.cxx | 9 --
sd/source/ui/animations/SlideTransitionPane.cxx | 9 --
sd/source/ui/annotations/annotationmanager.cxx | 7 -
sd/source/ui/inc/EventMultiplexer.hxx | 76 ++++++--------------
sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx | 9 --
sd/source/ui/sidebar/LayoutMenu.cxx | 10 --
sd/source/ui/sidebar/SlideBackground.cxx | 11 --
sd/source/ui/slidesorter/controller/SlsListener.cxx | 16 ----
sd/source/ui/table/TableDesignPane.cxx | 8 --
sd/source/ui/tools/EventMultiplexer.cxx | 59 ++++-----------
sd/source/ui/view/FormShellManager.cxx | 6 -
sd/source/ui/view/ToolBarManager.cxx | 6 -
sd/source/ui/view/outlview.cxx | 5 -
sd/source/ui/view/viewoverlaymanager.cxx | 6 -
14 files changed, 55 insertions(+), 182 deletions(-)
New commits:
commit 69f6fbb5d0ad87c85e0236a7fece107b69eb8b8b
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Mon Dec 12 11:00:47 2016 +0200
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 at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx
index 237bdd1..319d9b4 100644
--- a/sd/source/ui/animations/CustomAnimationPane.cxx
+++ b/sd/source/ui/animations/CustomAnimationPane.cxx
@@ -308,14 +308,7 @@ void CustomAnimationPane::KeyInput( const KeyEvent& rKEvt )
void CustomAnimationPane::addListener()
{
Link<tools::EventMultiplexerEvent&,void> aLink( LINK(this,CustomAnimationPane,EventMultiplexerListener) );
- mrBase.GetEventMultiplexer()->AddEventListener (
- aLink,
- EventMultiplexerEventId::EditViewSelection
- | EventMultiplexerEventId::CurrentPageChanged
- | EventMultiplexerEventId::MainViewRemoved
- | EventMultiplexerEventId::MainViewAdded
- | EventMultiplexerEventId::Disposing
- | EventMultiplexerEventId::EndTextEdit);
+ mrBase.GetEventMultiplexer()->AddEventListener(aLink);
}
void CustomAnimationPane::removeListener()
diff --git a/sd/source/ui/animations/SlideTransitionPane.cxx b/sd/source/ui/animations/SlideTransitionPane.cxx
index dc65fdd..05a1734 100644
--- a/sd/source/ui/animations/SlideTransitionPane.cxx
+++ b/sd/source/ui/animations/SlideTransitionPane.cxx
@@ -947,14 +947,7 @@ void SlideTransitionPane::playCurrentEffect()
void SlideTransitionPane::addListener()
{
Link<tools::EventMultiplexerEvent&,void> aLink( LINK(this,SlideTransitionPane,EventMultiplexerListener) );
- mrBase.GetEventMultiplexer()->AddEventListener (
- aLink,
- EventMultiplexerEventId::EditViewSelection
- | EventMultiplexerEventId::SlideSortedSelection
- | EventMultiplexerEventId::CurrentPageChanged
- | EventMultiplexerEventId::MainViewRemoved
- | EventMultiplexerEventId::MainViewAdded
- | EventMultiplexerEventId::ConfigurationUpdated);
+ mrBase.GetEventMultiplexer()->AddEventListener( aLink );
}
void SlideTransitionPane::removeListener()
diff --git a/sd/source/ui/annotations/annotationmanager.cxx b/sd/source/ui/annotations/annotationmanager.cxx
index 1eda753..f2fcd2c 100644
--- a/sd/source/ui/annotations/annotationmanager.cxx
+++ b/sd/source/ui/annotations/annotationmanager.cxx
@@ -866,12 +866,7 @@ void AnnotationManagerImpl::DisposeTags()
void AnnotationManagerImpl::addListener()
{
Link<tools::EventMultiplexerEvent&,void> aLink( LINK(this,AnnotationManagerImpl,EventMultiplexerListener) );
- mrBase.GetEventMultiplexer()->AddEventListener (
- aLink,
- EventMultiplexerEventId::EditViewSelection
- | EventMultiplexerEventId::CurrentPageChanged
- | EventMultiplexerEventId::MainViewRemoved
- | EventMultiplexerEventId::MainViewAdded);
+ mrBase.GetEventMultiplexer()->AddEventListener(aLink);
}
void AnnotationManagerImpl::removeListener()
diff --git a/sd/source/ui/inc/EventMultiplexer.hxx b/sd/source/ui/inc/EventMultiplexer.hxx
index 2e8aeb2..45e8e8f 100644
--- a/sd/source/ui/inc/EventMultiplexer.hxx
+++ b/sd/source/ui/inc/EventMultiplexer.hxx
@@ -35,101 +35,93 @@ class ViewShellBase;
}
-enum class EventMultiplexerEventId : sal_uInt32 {
+enum class EventMultiplexerEventId
+{
/** The EventMultiplexer itself is being disposed. Called for a live
EventMultiplexer. Removing a listener as response is not necessary,
though.
*/
- Disposing = 0x00000001,
+ Disposing,
/** The selection in the center pane has changed.
*/
- EditViewSelection = 0x00000002,
+ EditViewSelection,
/** The selection in the slide sorter has changed, regardless of whether
the slide sorter is displayed in the left pane or the center pane.
*/
- SlideSortedSelection = 0x00000004,
+ SlideSortedSelection,
/** The current page has changed.
*/
- CurrentPageChanged = 0x00000008,
+ CurrentPageChanged,
/** The current MainViewShell (the ViewShell displayed in the center
pane) has been removed.
*/
- MainViewRemoved = 0x00000010,
+ MainViewRemoved,
/** A new ViewShell has been made the MainViewShell.
*/
- MainViewAdded = 0x00000020,
+ MainViewAdded,
/** A new ViewShell is being displayed in one of the panes. Note that
for the ViewShell in the center pane both this event type and
EventId::MainViewAdded is broadcasted.
*/
- ViewAdded = 0x00000040,
+ ViewAdded,
/** The PaneManager is being destroyed.
*/
- PaneManagerDying = 0x00000080,
+ PaneManagerDying,
/** Edit mode was (or is being) switched to normal mode. Find
EventId::EditModeMaster below.
*/
- EditModeNormal = 0x00000100,
+ EditModeNormal,
/** One or more pages have been inserted into or deleted from the model.
*/
- PageOrder = 0x00000200,
+ PageOrder,
/** Text editing in one of the shapes in the MainViewShell has started.
*/
- BeginTextEdit = 0x00000400,
+ BeginTextEdit,
/** Text editing in one of the shapes in the MainViewShell has ended.
*/
- EndTextEdit = 0x00000800,
+ EndTextEdit,
/** A UNO controller has been attached to the UNO frame.
*/
- ControllerAttached = 0x00001000,
+ ControllerAttached,
/** A UNO controller has been detached to the UNO frame.
*/
- ControllerDetached = 0x00002000,
+ ControllerDetached,
/** The state of a shape has changed. The page is available in the user data.
*/
- ShapeChanged = 0x00004000,
+ ShapeChanged,
/** A shape has been inserted to a page. The page is available in the
user data.
*/
- ShapeInserted = 0x00008000,
+ ShapeInserted,
/** A shape has been removed from a page. The page is available in the
user data.
*/
- ShapeRemoved = 0x00010000,
+ ShapeRemoved,
/** A configuration update has been completed.
*/
- ConfigurationUpdated = 0x00020000,
+ ConfigurationUpdated,
/** Edit mode was (or is being) switched to master mode.
*/
- EditModeMaster = 0x00040000,
-
- /** Some constants that make it easier to remove a listener for all
- event types at once.
- */
- AllMask = 0x0007ffff,
- NONE = 0x00000000
+ EditModeMaster,
};
-namespace o3tl {
- template<> struct typed_flags<EventMultiplexerEventId> : is_typed_flags<EventMultiplexerEventId, 0x0007ffff> {};
-}
namespace sd { namespace tools {
@@ -150,14 +142,6 @@ public:
There is usually one EventMultiplexer instance per ViewShellBase().
Call the laters GetEventMultiplexer() method to get access to that
instance.
-
- When a listener is registered it can specify the events it
- wants to be informed of. This can be done with code like the following:
-
- mrViewShellBase.GetEventMultiplexer().AddEventListener (
- LINK(this,MasterPagesSelector,EventMultiplexerListener),
- EventMultiplexerEventId::MainViewAdded
- | EventMultiplexerEventId::MainViewRemoved);
*/
class EventMultiplexer
{
@@ -172,24 +156,12 @@ public:
@param rCallback
The callback to call as soon as one of the event specified by
aEventTypeSet is received by the EventMultiplexer.
- @param aEventTypeSet
- A, possibly empty, set of event types that the listener wants to
- be informed about.
*/
- void AddEventListener (
- const Link<EventMultiplexerEvent&,void>& rCallback,
- EventMultiplexerEventId aEventTypeSet);
+ void AddEventListener(const Link<EventMultiplexerEvent&,void>& rCallback);
/** Remove an event listener for the specified event types.
- @param aEventTypeSet
- The listener will not be called anymore for any of the event
- types in this set. Use EventMultiplexerEventId::AllMask, the default value, to
- remove the listener for all event types it has been registered
- for.
- */
- void RemoveEventListener (
- const Link<EventMultiplexerEvent&,void>& rCallback,
- EventMultiplexerEventId aEventTypeSet = EventMultiplexerEventId::AllMask);
+ */
+ void RemoveEventListener(const Link<EventMultiplexerEvent&,void>& rCallback);
/** This method is used for out-of-line events. An event of the
specified type will be sent to all listeners that are registered for
diff --git a/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx b/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx
index 465938a..9db8fcb 100644
--- a/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx
+++ b/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx
@@ -74,14 +74,7 @@ CurrentMasterPagesSelector::CurrentMasterPagesSelector (
: MasterPagesSelector (pParent, rDocument, rBase, rpContainer, rxSidebar)
{
Link<sd::tools::EventMultiplexerEvent&,void> aLink (LINK(this,CurrentMasterPagesSelector,EventMultiplexerListener));
- rBase.GetEventMultiplexer()->AddEventListener(aLink,
- EventMultiplexerEventId::CurrentPageChanged
- | EventMultiplexerEventId::EditModeNormal
- | EventMultiplexerEventId::EditModeMaster
- | EventMultiplexerEventId::PageOrder
- | EventMultiplexerEventId::ShapeChanged
- | EventMultiplexerEventId::ShapeInserted
- | EventMultiplexerEventId::ShapeRemoved);
+ rBase.GetEventMultiplexer()->AddEventListener(aLink);
}
CurrentMasterPagesSelector::~CurrentMasterPagesSelector()
diff --git a/sd/source/ui/sidebar/LayoutMenu.cxx b/sd/source/ui/sidebar/LayoutMenu.cxx
index a8a21b0..c46f207 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;
}
}
diff --git a/sd/source/ui/sidebar/SlideBackground.cxx b/sd/source/ui/sidebar/SlideBackground.cxx
index f9548c1..1946be9 100644
--- a/sd/source/ui/sidebar/SlideBackground.cxx
+++ b/sd/source/ui/sidebar/SlideBackground.cxx
@@ -304,16 +304,7 @@ void SlideBackground::SetPanelTitle( const OUString& rTitle )
void SlideBackground::addListener()
{
Link<tools::EventMultiplexerEvent&,void> aLink( LINK(this, SlideBackground, EventMultiplexerListener) );
- mrBase.GetEventMultiplexer()->AddEventListener (
- aLink,
- EventMultiplexerEventId::CurrentPageChanged |
- EventMultiplexerEventId::MainViewAdded |
- EventMultiplexerEventId::ShapeChanged |
- EventMultiplexerEventId::EditModeNormal |
- EventMultiplexerEventId::EditModeMaster |
- EventMultiplexerEventId::EditViewSelection |
- EventMultiplexerEventId::EndTextEdit |
- EventMultiplexerEventId::ViewAdded);
+ mrBase.GetEventMultiplexer()->AddEventListener( aLink );
}
void SlideBackground::removeListener()
diff --git a/sd/source/ui/slidesorter/controller/SlsListener.cxx b/sd/source/ui/slidesorter/controller/SlsListener.cxx
index 0d6f2a4..330e1a7 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);
}
}
diff --git a/sd/source/ui/table/TableDesignPane.cxx b/sd/source/ui/table/TableDesignPane.cxx
index 0e55c21..41f1ad8 100644
--- a/sd/source/ui/table/TableDesignPane.cxx
+++ b/sd/source/ui/table/TableDesignPane.cxx
@@ -415,13 +415,7 @@ void TableDesignWidget::updateControls()
void TableDesignWidget::addListener()
{
Link<tools::EventMultiplexerEvent&,void> aLink( LINK(this,TableDesignWidget,EventMultiplexerListener) );
- mrBase.GetEventMultiplexer()->AddEventListener (
- aLink,
- EventMultiplexerEventId::EditViewSelection
- | EventMultiplexerEventId::CurrentPageChanged
- | EventMultiplexerEventId::MainViewRemoved
- | EventMultiplexerEventId::MainViewAdded
- | EventMultiplexerEventId::Disposing);
+ mrBase.GetEventMultiplexer()->AddEventListener( aLink );
}
void TableDesignWidget::removeListener()
diff --git a/sd/source/ui/tools/EventMultiplexer.cxx b/sd/source/ui/tools/EventMultiplexer.cxx
index fc9f376..2f6d031 100644
--- a/sd/source/ui/tools/EventMultiplexer.cxx
+++ b/sd/source/ui/tools/EventMultiplexer.cxx
@@ -68,12 +68,10 @@ public:
virtual ~Implementation() override;
void AddEventListener (
- const Link<EventMultiplexerEvent&,void>& rCallback,
- EventMultiplexerEventId aEventTypes);
+ const Link<EventMultiplexerEvent&,void>& rCallback);
void RemoveEventListener (
- const Link<EventMultiplexerEvent&,void>& rCallback,
- EventMultiplexerEventId aEventTypes);
+ const Link<EventMultiplexerEvent&,void>& rCallback);
void CallListeners (EventMultiplexerEvent& rEvent);
@@ -118,8 +116,7 @@ protected:
private:
ViewShellBase& mrBase;
- typedef ::std::pair<Link<EventMultiplexerEvent&,void>,EventMultiplexerEventId> ListenerDescriptor;
- typedef ::std::vector<ListenerDescriptor> ListenerList;
+ typedef ::std::vector<Link<EventMultiplexerEvent&,void>> ListenerList;
ListenerList maListeners;
/// Remember whether we are listening to the UNO controller.
@@ -170,17 +167,15 @@ EventMultiplexer::~EventMultiplexer()
}
void EventMultiplexer::AddEventListener (
- const Link<EventMultiplexerEvent&,void>& rCallback,
- EventMultiplexerEventId aEventTypes)
+ const Link<EventMultiplexerEvent&,void>& rCallback)
{
- mpImpl->AddEventListener (rCallback, aEventTypes);
+ mpImpl->AddEventListener(rCallback);
}
void EventMultiplexer::RemoveEventListener (
- const Link<EventMultiplexerEvent&,void>& rCallback,
- EventMultiplexerEventId aEventTypes)
+ const Link<EventMultiplexerEvent&,void>& rCallback)
{
- mpImpl->RemoveEventListener (rCallback, aEventTypes);
+ mpImpl->RemoveEventListener(rCallback);
}
void EventMultiplexer::MultiplexEvent(
@@ -300,42 +295,25 @@ void EventMultiplexer::Implementation::ReleaseListeners()
}
void EventMultiplexer::Implementation::AddEventListener (
- const Link<EventMultiplexerEvent&,void>& rCallback,
- EventMultiplexerEventId aEventTypes)
+ const Link<EventMultiplexerEvent&,void>& rCallback)
{
- ListenerList::iterator iListener (maListeners.begin());
- ListenerList::const_iterator iEnd (maListeners.end());
- for (;iListener!=iEnd; ++iListener)
- if (iListener->first == rCallback)
- break;
- if (iListener != maListeners.end())
- {
- // Listener exists. Update its event type set.
- iListener->second |= aEventTypes;
- }
- else
- {
- maListeners.push_back (ListenerDescriptor(rCallback,aEventTypes));
- }
+ for (auto const & i : maListeners)
+ if (i == rCallback)
+ return;
+ maListeners.push_back(rCallback);
}
void EventMultiplexer::Implementation::RemoveEventListener (
- const Link<EventMultiplexerEvent&,void>& rCallback,
- EventMultiplexerEventId aEventTypes)
+ const Link<EventMultiplexerEvent&,void>& rCallback)
{
ListenerList::iterator iListener (maListeners.begin());
ListenerList::const_iterator iEnd (maListeners.end());
for (;iListener!=iEnd; ++iListener)
- if (iListener->first == rCallback)
+ if (*iListener == rCallback)
+ {
+ maListeners.erase(iListener);
break;
- if (iListener != maListeners.end())
- {
- // Update the event type set.
- iListener->second &= ~aEventTypes;
- // When no events remain in the set then remove the listener.
- if (iListener->second == EventMultiplexerEventId::NONE)
- maListeners.erase (iListener);
- }
+ }
}
void EventMultiplexer::Implementation::ConnectToController()
@@ -675,8 +653,7 @@ void EventMultiplexer::Implementation::CallListeners (EventMultiplexerEvent& rEv
ListenerList::const_iterator iListenerEnd (aCopyListeners.end());
for (; iListener!=iListenerEnd; ++iListener)
{
- if (iListener->second & rEvent.meEventId)
- iListener->first.Call(rEvent);
+ iListener->Call(rEvent);
}
}
diff --git a/sd/source/ui/view/FormShellManager.cxx b/sd/source/ui/view/FormShellManager.cxx
index e10c612..c5b324a 100644
--- a/sd/source/ui/view/FormShellManager.cxx
+++ b/sd/source/ui/view/FormShellManager.cxx
@@ -58,11 +58,7 @@ FormShellManager::FormShellManager (ViewShellBase& rBase)
// Register at the EventMultiplexer to be informed about changes in the
// center pane.
Link<sd::tools::EventMultiplexerEvent&,void> aLink (LINK(this, FormShellManager, ConfigurationUpdateHandler));
- mrBase.GetEventMultiplexer()->AddEventListener(
- aLink,
- EventMultiplexerEventId::MainViewRemoved
- | EventMultiplexerEventId::MainViewAdded
- | EventMultiplexerEventId::ConfigurationUpdated);
+ mrBase.GetEventMultiplexer()->AddEventListener(aLink);
RegisterAtCenterPane();
}
diff --git a/sd/source/ui/view/ToolBarManager.cxx b/sd/source/ui/view/ToolBarManager.cxx
index 971f408..ec89188 100644
--- a/sd/source/ui/view/ToolBarManager.cxx
+++ b/sd/source/ui/view/ToolBarManager.cxx
@@ -532,11 +532,7 @@ ToolBarManager::Implementation::Implementation (
maToolBarRules(rpToolBarManager,rpViewShellManager)
{
Link<tools::EventMultiplexerEvent&,void> aLink (LINK(this,ToolBarManager::Implementation,EventMultiplexerCallback));
- mpEventMultiplexer->AddEventListener(
- aLink,
- EventMultiplexerEventId::ControllerAttached
- | EventMultiplexerEventId::ControllerDetached
- | EventMultiplexerEventId::PaneManagerDying);
+ mpEventMultiplexer->AddEventListener( aLink );
}
/** The order of statements is important.
diff --git a/sd/source/ui/view/outlview.cxx b/sd/source/ui/view/outlview.cxx
index edc461f..9eda921 100644
--- a/sd/source/ui/view/outlview.cxx
+++ b/sd/source/ui/view/outlview.cxx
@@ -127,10 +127,7 @@ OutlineView::OutlineView( DrawDocShell& rDocSh, vcl::Window* pWindow, OutlineVie
}
Link<tools::EventMultiplexerEvent&,void> aLink( LINK(this,OutlineView,EventMultiplexerListener) );
- mrOutlineViewShell.GetViewShellBase().GetEventMultiplexer()->AddEventListener(
- aLink,
- EventMultiplexerEventId::CurrentPageChanged
- | EventMultiplexerEventId::PageOrder);
+ mrOutlineViewShell.GetViewShellBase().GetEventMultiplexer()->AddEventListener(aLink);
LanguageType eLang = mrOutliner.GetDefaultLanguage();
maPageNumberFont = OutputDevice::GetDefaultFont( DefaultFontType::SANS_UNICODE, eLang, GetDefaultFontFlags::NONE );
diff --git a/sd/source/ui/view/viewoverlaymanager.cxx b/sd/source/ui/view/viewoverlaymanager.cxx
index 0785329..b2cf7d6 100644
--- a/sd/source/ui/view/viewoverlaymanager.cxx
+++ b/sd/source/ui/view/viewoverlaymanager.cxx
@@ -394,11 +394,7 @@ ViewOverlayManager::ViewOverlayManager( ViewShellBase& rViewShellBase )
, mnUpdateTagsEvent( nullptr )
{
Link<tools::EventMultiplexerEvent&,void> aLink( LINK(this,ViewOverlayManager,EventMultiplexerListener) );
- mrBase.GetEventMultiplexer()->AddEventListener(aLink, EventMultiplexerEventId::CurrentPageChanged
- | EventMultiplexerEventId::MainViewAdded
- | EventMultiplexerEventId::ViewAdded
- | EventMultiplexerEventId::BeginTextEdit
- | EventMultiplexerEventId::EndTextEdit );
+ mrBase.GetEventMultiplexer()->AddEventListener(aLink);
StartListening( *mrBase.GetDocShell() );
}
More information about the Libreoffice-commits
mailing list