summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sd/source/ui/animations/CustomAnimationPane.cxx25
-rw-r--r--sd/source/ui/animations/SlideTransitionPane.cxx26
-rw-r--r--sd/source/ui/annotations/annotationmanager.cxx18
-rw-r--r--sd/source/ui/inc/EventMultiplexer.hxx92
-rw-r--r--sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx33
-rw-r--r--sd/source/ui/sidebar/LayoutMenu.cxx24
-rw-r--r--sd/source/ui/sidebar/SlideBackground.cxx30
-rw-r--r--sd/source/ui/slidesorter/controller/SlsListener.cxx38
-rw-r--r--sd/source/ui/table/TableDesignPane.cxx20
-rw-r--r--sd/source/ui/tools/EventMultiplexer.cxx66
-rw-r--r--sd/source/ui/view/FormShellManager.cxx12
-rw-r--r--sd/source/ui/view/ToolBarManager.cxx14
-rw-r--r--sd/source/ui/view/outlview.cxx10
-rw-r--r--sd/source/ui/view/sdview.cxx4
-rw-r--r--sd/source/ui/view/viewoverlaymanager.cxx21
15 files changed, 221 insertions, 212 deletions
diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx
index b5dbe2d2bb0f..6c363c9ee778 100644
--- a/sd/source/ui/animations/CustomAnimationPane.cxx
+++ b/sd/source/ui/animations/CustomAnimationPane.cxx
@@ -310,12 +310,12 @@ void CustomAnimationPane::addListener()
Link<tools::EventMultiplexerEvent&,void> aLink( LINK(this,CustomAnimationPane,EventMultiplexerListener) );
mrBase.GetEventMultiplexer()->AddEventListener (
aLink,
- tools::EventMultiplexerEvent::EID_EDIT_VIEW_SELECTION
- | tools::EventMultiplexerEvent::EID_CURRENT_PAGE
- | tools::EventMultiplexerEvent::EID_MAIN_VIEW_REMOVED
- | tools::EventMultiplexerEvent::EID_MAIN_VIEW_ADDED
- | tools::EventMultiplexerEvent::EID_DISPOSING
- | tools::EventMultiplexerEvent::EID_END_TEXT_EDIT);
+ EventMultiplexerEventId::EditViewSelection
+ | EventMultiplexerEventId::CurrentPageChanged
+ | EventMultiplexerEventId::MainViewRemoved
+ | EventMultiplexerEventId::MainViewAdded
+ | EventMultiplexerEventId::Disposing
+ | EventMultiplexerEventId::EndTextEdit);
}
void CustomAnimationPane::removeListener()
@@ -329,15 +329,15 @@ IMPL_LINK(CustomAnimationPane,EventMultiplexerListener,
{
switch (rEvent.meEventId)
{
- case tools::EventMultiplexerEvent::EID_EDIT_VIEW_SELECTION:
+ case EventMultiplexerEventId::EditViewSelection:
onSelectionChanged();
break;
- case tools::EventMultiplexerEvent::EID_CURRENT_PAGE:
+ case EventMultiplexerEventId::CurrentPageChanged:
onChangeCurrentPage();
break;
- case tools::EventMultiplexerEvent::EID_MAIN_VIEW_ADDED:
+ case EventMultiplexerEventId::MainViewAdded:
// At this moment the controller may not yet been set at model
// or ViewShellBase. Take it from the view shell passed with
// the event.
@@ -352,21 +352,22 @@ IMPL_LINK(CustomAnimationPane,EventMultiplexerListener,
}
}
SAL_FALLTHROUGH;
- case tools::EventMultiplexerEvent::EID_MAIN_VIEW_REMOVED:
+ case EventMultiplexerEventId::MainViewRemoved:
mxView = nullptr;
mxCurrentPage = nullptr;
updateControls();
break;
- case tools::EventMultiplexerEvent::EID_DISPOSING:
+ case EventMultiplexerEventId::Disposing:
mxView.clear();
onSelectionChanged();
onChangeCurrentPage();
break;
- case tools::EventMultiplexerEvent::EID_END_TEXT_EDIT:
+ case EventMultiplexerEventId::EndTextEdit:
if( mpMainSequence.get() && rEvent.mpUserData )
mpCustomAnimationList->update( mpMainSequence );
break;
+ default: break;
}
}
diff --git a/sd/source/ui/animations/SlideTransitionPane.cxx b/sd/source/ui/animations/SlideTransitionPane.cxx
index bc04d6b90346..b80be66e0fca 100644
--- a/sd/source/ui/animations/SlideTransitionPane.cxx
+++ b/sd/source/ui/animations/SlideTransitionPane.cxx
@@ -957,12 +957,12 @@ void SlideTransitionPane::addListener()
Link<tools::EventMultiplexerEvent&,void> aLink( LINK(this,SlideTransitionPane,EventMultiplexerListener) );
mrBase.GetEventMultiplexer()->AddEventListener (
aLink,
- tools::EventMultiplexerEvent::EID_EDIT_VIEW_SELECTION
- | tools::EventMultiplexerEvent::EID_SLIDE_SORTER_SELECTION
- | tools::EventMultiplexerEvent::EID_CURRENT_PAGE
- | tools::EventMultiplexerEvent::EID_MAIN_VIEW_REMOVED
- | tools::EventMultiplexerEvent::EID_MAIN_VIEW_ADDED
- | tools::EventMultiplexerEvent::EID_CONFIGURATION_UPDATED);
+ EventMultiplexerEventId::EditViewSelection
+ | EventMultiplexerEventId::SlideSortedSelection
+ | EventMultiplexerEventId::CurrentPageChanged
+ | EventMultiplexerEventId::MainViewRemoved
+ | EventMultiplexerEventId::MainViewAdded
+ | EventMultiplexerEventId::ConfigurationUpdated);
}
void SlideTransitionPane::removeListener()
@@ -976,26 +976,26 @@ IMPL_LINK(SlideTransitionPane,EventMultiplexerListener,
{
switch (rEvent.meEventId)
{
- case tools::EventMultiplexerEvent::EID_EDIT_VIEW_SELECTION:
+ case EventMultiplexerEventId::EditViewSelection:
onSelectionChanged();
break;
- case tools::EventMultiplexerEvent::EID_CURRENT_PAGE:
- case tools::EventMultiplexerEvent::EID_SLIDE_SORTER_SELECTION:
+ case EventMultiplexerEventId::CurrentPageChanged:
+ case EventMultiplexerEventId::SlideSortedSelection:
onChangeCurrentPage();
break;
- case tools::EventMultiplexerEvent::EID_MAIN_VIEW_REMOVED:
+ case EventMultiplexerEventId::MainViewRemoved:
mxView.clear();
onSelectionChanged();
onChangeCurrentPage();
break;
- case tools::EventMultiplexerEvent::EID_MAIN_VIEW_ADDED:
+ case EventMultiplexerEventId::MainViewAdded:
mbIsMainViewChangePending = true;
break;
- case tools::EventMultiplexerEvent::EID_CONFIGURATION_UPDATED:
+ case EventMultiplexerEventId::ConfigurationUpdated:
if (mbIsMainViewChangePending)
{
mbIsMainViewChangePending = false;
@@ -1013,7 +1013,7 @@ IMPL_LINK(SlideTransitionPane,EventMultiplexerListener,
break;
default:
- if (rEvent.meEventId != tools::EventMultiplexerEvent::EID_DISPOSING)
+ if (rEvent.meEventId != EventMultiplexerEventId::Disposing)
{
onSelectionChanged();
onChangeCurrentPage();
diff --git a/sd/source/ui/annotations/annotationmanager.cxx b/sd/source/ui/annotations/annotationmanager.cxx
index b2e6c9a20cea..76703f876a2e 100644
--- a/sd/source/ui/annotations/annotationmanager.cxx
+++ b/sd/source/ui/annotations/annotationmanager.cxx
@@ -868,10 +868,10 @@ void AnnotationManagerImpl::addListener()
Link<tools::EventMultiplexerEvent&,void> aLink( LINK(this,AnnotationManagerImpl,EventMultiplexerListener) );
mrBase.GetEventMultiplexer()->AddEventListener (
aLink,
- tools::EventMultiplexerEvent::EID_EDIT_VIEW_SELECTION
- | tools::EventMultiplexerEvent::EID_CURRENT_PAGE
- | tools::EventMultiplexerEvent::EID_MAIN_VIEW_REMOVED
- | tools::EventMultiplexerEvent::EID_MAIN_VIEW_ADDED);
+ EventMultiplexerEventId::EditViewSelection
+ | EventMultiplexerEventId::CurrentPageChanged
+ | EventMultiplexerEventId::MainViewRemoved
+ | EventMultiplexerEventId::MainViewAdded);
}
void AnnotationManagerImpl::removeListener()
@@ -885,20 +885,22 @@ IMPL_LINK(AnnotationManagerImpl,EventMultiplexerListener,
{
switch (rEvent.meEventId)
{
- case tools::EventMultiplexerEvent::EID_CURRENT_PAGE:
- case tools::EventMultiplexerEvent::EID_EDIT_VIEW_SELECTION:
+ case EventMultiplexerEventId::CurrentPageChanged:
+ case EventMultiplexerEventId::EditViewSelection:
onSelectionChanged();
break;
- case tools::EventMultiplexerEvent::EID_MAIN_VIEW_REMOVED:
+ case EventMultiplexerEventId::MainViewRemoved:
mxView.clear();
onSelectionChanged();
break;
- case tools::EventMultiplexerEvent::EID_MAIN_VIEW_ADDED:
+ case EventMultiplexerEventId::MainViewAdded:
mxView.set( mrBase.GetController(), UNO_QUERY );
onSelectionChanged();
break;
+
+ default: break;
}
}
diff --git a/sd/source/ui/inc/EventMultiplexer.hxx b/sd/source/ui/inc/EventMultiplexer.hxx
index f5b4ade90592..2e8aeb2fbe4a 100644
--- a/sd/source/ui/inc/EventMultiplexer.hxx
+++ b/sd/source/ui/inc/EventMultiplexer.hxx
@@ -25,6 +25,7 @@
#include <rtl/ref.hxx>
#include <svl/lstner.hxx>
#include <tools/link.hxx>
+#include <o3tl/typed_flags_set.hxx>
#include <set>
#include <memory>
@@ -33,108 +34,113 @@ namespace sd {
class ViewShellBase;
}
-namespace sd { namespace tools {
-class EventMultiplexerEvent
-{
-public:
- typedef sal_uInt32 EventId;
+enum class EventMultiplexerEventId : sal_uInt32 {
/** The EventMultiplexer itself is being disposed. Called for a live
EventMultiplexer. Removing a listener as response is not necessary,
though.
*/
- static const EventId EID_DISPOSING = 0x00000001;
+ Disposing = 0x00000001,
/** The selection in the center pane has changed.
*/
- static const EventId EID_EDIT_VIEW_SELECTION = 0x00000002;
+ EditViewSelection = 0x00000002,
/** The selection in the slide sorter has changed, regardless of whether
the slide sorter is displayed in the left pane or the center pane.
*/
- static const EventId EID_SLIDE_SORTER_SELECTION = 0x00000004;
+ SlideSortedSelection = 0x00000004,
/** The current page has changed.
*/
- static const EventId EID_CURRENT_PAGE = 0x00000008;
+ CurrentPageChanged = 0x00000008,
/** The current MainViewShell (the ViewShell displayed in the center
pane) has been removed.
*/
- static const EventId EID_MAIN_VIEW_REMOVED = 0x00000010;
+ MainViewRemoved = 0x00000010,
/** A new ViewShell has been made the MainViewShell.
*/
- static const EventId EID_MAIN_VIEW_ADDED = 0x00000020;
-
- /** A ViewShell has been removed from one of the panes. Note that for
- the ViewShell in the center pane bth this event type and
- EID_MAIN_VIEW_REMOVED is broadcasted.
- */
- static const EventId EID_VIEW_REMOVED = 0x00000040;
+ MainViewAdded = 0x00000020,
/** 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
- EID_MAIN_VIEW_ADDED is broadcasted.
+ EventId::MainViewAdded is broadcasted.
*/
- static const EventId EID_VIEW_ADDED = 0x00000080;
+ ViewAdded = 0x00000040,
/** The PaneManager is being destroyed.
*/
- static const EventId EID_PANE_MANAGER_DYING = 0x00000100;
+ PaneManagerDying = 0x00000080,
/** Edit mode was (or is being) switched to normal mode. Find
- EID_EDIT_MODE_MASTER below.
+ EventId::EditModeMaster below.
*/
- static const EventId EID_EDIT_MODE_NORMAL = 0x00000200;
+ EditModeNormal = 0x00000100,
/** One or more pages have been inserted into or deleted from the model.
*/
- static const EventId EID_PAGE_ORDER = 0x00000400;
+ PageOrder = 0x00000200,
/** Text editing in one of the shapes in the MainViewShell has started.
*/
- static const EventId EID_BEGIN_TEXT_EDIT = 0x00000800;
+ BeginTextEdit = 0x00000400,
/** Text editing in one of the shapes in the MainViewShell has ended.
*/
- static const EventId EID_END_TEXT_EDIT = 0x00001000;
+ EndTextEdit = 0x00000800,
/** A UNO controller has been attached to the UNO frame.
*/
- static const EventId EID_CONTROLLER_ATTACHED = 0x00002000;
+ ControllerAttached = 0x00001000,
/** A UNO controller has been detached to the UNO frame.
*/
- static const EventId EID_CONTROLLER_DETACHED = 0x00004000;
+ ControllerDetached = 0x00002000,
/** The state of a shape has changed. The page is available in the user data.
*/
- static const EventId EID_SHAPE_CHANGED = 0x00008000;
+ ShapeChanged = 0x00004000,
/** A shape has been inserted to a page. The page is available in the
user data.
*/
- static const EventId EID_SHAPE_INSERTED = 0x00010000;
+ ShapeInserted = 0x00008000,
/** A shape has been removed from a page. The page is available in the
user data.
*/
- static const EventId EID_SHAPE_REMOVED = 0x00020000;
+ ShapeRemoved = 0x00010000,
/** A configuration update has been completed.
*/
- static const EventId EID_CONFIGURATION_UPDATED = 0x00040000;
+ ConfigurationUpdated = 0x00020000,
/** Edit mode was (or is being) switched to master mode.
*/
- static const EventId EID_EDIT_MODE_MASTER = 0x00080000;
+ EditModeMaster = 0x00040000,
- EventId meEventId;
+ /** Some constants that make it easier to remove a listener for all
+ event types at once.
+ */
+ AllMask = 0x0007ffff,
+ NONE = 0x00000000
+};
+namespace o3tl {
+ template<> struct typed_flags<EventMultiplexerEventId> : is_typed_flags<EventMultiplexerEventId, 0x0007ffff> {};
+}
+
+namespace sd { namespace tools {
+
+class EventMultiplexerEvent
+{
+public:
+ EventMultiplexerEventId meEventId;
const void* mpUserData;
EventMultiplexerEvent (
- EventId eEventId,
+ EventMultiplexerEventId eEventId,
const void* pUserData);
};
@@ -150,8 +156,8 @@ public:
mrViewShellBase.GetEventMultiplexer().AddEventListener (
LINK(this,MasterPagesSelector,EventMultiplexerListener),
- tools::EventMultiplexerEvent::EID_MAIN_VIEW_ADDED
- | tools::EventMultiplexerEvent::EID_MAIN_VIEW_REMOVED);
+ EventMultiplexerEventId::MainViewAdded
+ | EventMultiplexerEventId::MainViewRemoved);
*/
class EventMultiplexer
{
@@ -161,12 +167,6 @@ public:
EventMultiplexer (ViewShellBase& rBase);
~EventMultiplexer();
- /** Some constants that make it easier to remove a listener for all
- event types at once.
- */
- static const EventMultiplexerEvent::EventId EID_FULL_SET = 0xffffffff;
- static const EventMultiplexerEvent::EventId EID_EMPTY_SET = 0x00000000;
-
/** Add an event listener that will be informed about the specified
event types.
@param rCallback
@@ -178,18 +178,18 @@ public:
*/
void AddEventListener (
const Link<EventMultiplexerEvent&,void>& rCallback,
- EventMultiplexerEvent::EventId aEventTypeSet);
+ EventMultiplexerEventId aEventTypeSet);
/** 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 EID_FULL_SET, the default value, to
+ 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,
- EventMultiplexerEvent::EventId aEventTypeSet = EID_FULL_SET);
+ EventMultiplexerEventId aEventTypeSet = EventMultiplexerEventId::AllMask);
/** 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
@@ -200,7 +200,7 @@ public:
Some data sent to the listeners along with the event.
*/
void MultiplexEvent(
- EventMultiplexerEvent::EventId eEventId,
+ EventMultiplexerEventId eEventId,
void* pUserData);
private:
diff --git a/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx b/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx
index 09458acb2b3d..465938a4e02c 100644
--- a/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx
+++ b/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx
@@ -75,13 +75,13 @@ CurrentMasterPagesSelector::CurrentMasterPagesSelector (
{
Link<sd::tools::EventMultiplexerEvent&,void> aLink (LINK(this,CurrentMasterPagesSelector,EventMultiplexerListener));
rBase.GetEventMultiplexer()->AddEventListener(aLink,
- sd::tools::EventMultiplexerEvent::EID_CURRENT_PAGE
- | sd::tools::EventMultiplexerEvent::EID_EDIT_MODE_NORMAL
- | sd::tools::EventMultiplexerEvent::EID_EDIT_MODE_MASTER
- | sd::tools::EventMultiplexerEvent::EID_PAGE_ORDER
- | sd::tools::EventMultiplexerEvent::EID_SHAPE_CHANGED
- | sd::tools::EventMultiplexerEvent::EID_SHAPE_INSERTED
- | sd::tools::EventMultiplexerEvent::EID_SHAPE_REMOVED);
+ EventMultiplexerEventId::CurrentPageChanged
+ | EventMultiplexerEventId::EditModeNormal
+ | EventMultiplexerEventId::EditModeMaster
+ | EventMultiplexerEventId::PageOrder
+ | EventMultiplexerEventId::ShapeChanged
+ | EventMultiplexerEventId::ShapeInserted
+ | EventMultiplexerEventId::ShapeRemoved);
}
CurrentMasterPagesSelector::~CurrentMasterPagesSelector()
@@ -255,14 +255,14 @@ IMPL_LINK(CurrentMasterPagesSelector,EventMultiplexerListener,
{
switch (rEvent.meEventId)
{
- case sd::tools::EventMultiplexerEvent::EID_CURRENT_PAGE:
- case sd::tools::EventMultiplexerEvent::EID_EDIT_MODE_NORMAL:
- case sd::tools::EventMultiplexerEvent::EID_EDIT_MODE_MASTER:
- case sd::tools::EventMultiplexerEvent::EID_SLIDE_SORTER_SELECTION:
+ case EventMultiplexerEventId::CurrentPageChanged:
+ case EventMultiplexerEventId::EditModeNormal:
+ case EventMultiplexerEventId::EditModeMaster:
+ case EventMultiplexerEventId::SlideSortedSelection:
UpdateSelection();
break;
- case sd::tools::EventMultiplexerEvent::EID_PAGE_ORDER:
+ case EventMultiplexerEventId::PageOrder:
// This is tricky. If a master page is removed, moved, or
// added we have to wait until both the notes master page
// and the standard master page have been removed, moved,
@@ -274,11 +274,12 @@ IMPL_LINK(CurrentMasterPagesSelector,EventMultiplexerListener,
MasterPagesSelector::Fill();
break;
- case sd::tools::EventMultiplexerEvent::EID_SHAPE_CHANGED:
- case sd::tools::EventMultiplexerEvent::EID_SHAPE_INSERTED:
- case sd::tools::EventMultiplexerEvent::EID_SHAPE_REMOVED:
- InvalidatePreview(static_cast<const SdPage*>(rEvent.mpUserData));
+ case EventMultiplexerEventId::ShapeChanged:
+ case EventMultiplexerEventId::ShapeInserted:
+ case EventMultiplexerEventId::ShapeRemoved:
+ InvalidatePreview(static_cast<const SdPage*>(rEvent.mpUserData));
break;
+ default: break;
}
}
diff --git a/sd/source/ui/sidebar/LayoutMenu.cxx b/sd/source/ui/sidebar/LayoutMenu.cxx
index 9169178ab18b..16ae669a4507 100644
--- a/sd/source/ui/sidebar/LayoutMenu.cxx
+++ b/sd/source/ui/sidebar/LayoutMenu.cxx
@@ -169,13 +169,13 @@ void LayoutMenu::implConstruct( DrawDocShell& rDocumentShell )
Link<::sd::tools::EventMultiplexerEvent&,void> aEventListenerLink (LINK(this,LayoutMenu,EventMultiplexerListener));
mrBase.GetEventMultiplexer()->AddEventListener(aEventListenerLink,
- ::sd::tools::EventMultiplexerEvent::EID_CURRENT_PAGE
- | ::sd::tools::EventMultiplexerEvent::EID_SLIDE_SORTER_SELECTION
- | ::sd::tools::EventMultiplexerEvent::EID_MAIN_VIEW_ADDED
- | ::sd::tools::EventMultiplexerEvent::EID_MAIN_VIEW_REMOVED
- | ::sd::tools::EventMultiplexerEvent::EID_CONFIGURATION_UPDATED
- | ::sd::tools::EventMultiplexerEvent::EID_EDIT_MODE_NORMAL
- | ::sd::tools::EventMultiplexerEvent::EID_EDIT_MODE_MASTER);
+ EventMultiplexerEventId::CurrentPageChanged
+ | EventMultiplexerEventId::SlideSortedSelection
+ | EventMultiplexerEventId::MainViewAdded
+ | EventMultiplexerEventId::MainViewRemoved
+ | EventMultiplexerEventId::ConfigurationUpdated
+ | EventMultiplexerEventId::EditModeNormal
+ | EventMultiplexerEventId::EditModeMaster);
Window::SetHelpId(HID_SD_TASK_PANE_PREVIEW_LAYOUTS);
SetAccessibleName(SdResId(STR_TASKPANEL_LAYOUT_MENU_TITLE));
@@ -710,21 +710,21 @@ IMPL_LINK(LayoutMenu, EventMultiplexerListener, ::sd::tools::EventMultiplexerEve
{
switch (rEvent.meEventId)
{
- case ::sd::tools::EventMultiplexerEvent::EID_CURRENT_PAGE:
- case ::sd::tools::EventMultiplexerEvent::EID_SLIDE_SORTER_SELECTION:
+ case EventMultiplexerEventId::CurrentPageChanged:
+ case EventMultiplexerEventId::SlideSortedSelection:
if ( ! mbSelectionUpdatePending)
UpdateSelection();
break;
- case ::sd::tools::EventMultiplexerEvent::EID_MAIN_VIEW_ADDED:
+ case EventMultiplexerEventId::MainViewAdded:
mbIsMainViewChangePending = true;
break;
- case ::sd::tools::EventMultiplexerEvent::EID_MAIN_VIEW_REMOVED:
+ case EventMultiplexerEventId::MainViewRemoved:
HideFocus();
break;
- case ::sd::tools::EventMultiplexerEvent::EID_CONFIGURATION_UPDATED:
+ case EventMultiplexerEventId::ConfigurationUpdated:
if (mbIsMainViewChangePending)
{
mbIsMainViewChangePending = false;
diff --git a/sd/source/ui/sidebar/SlideBackground.cxx b/sd/source/ui/sidebar/SlideBackground.cxx
index ec2361765fd9..89587c52282d 100644
--- a/sd/source/ui/sidebar/SlideBackground.cxx
+++ b/sd/source/ui/sidebar/SlideBackground.cxx
@@ -332,14 +332,14 @@ void SlideBackground::addListener()
Link<tools::EventMultiplexerEvent&,void> aLink( LINK(this, SlideBackground, EventMultiplexerListener) );
mrBase.GetEventMultiplexer()->AddEventListener (
aLink,
- tools::EventMultiplexerEvent::EID_CURRENT_PAGE |
- tools::EventMultiplexerEvent::EID_MAIN_VIEW_ADDED |
- tools::EventMultiplexerEvent::EID_SHAPE_CHANGED |
- tools::EventMultiplexerEvent::EID_EDIT_MODE_NORMAL |
- tools::EventMultiplexerEvent::EID_EDIT_MODE_MASTER |
- tools::EventMultiplexerEvent::EID_EDIT_VIEW_SELECTION |
- tools::EventMultiplexerEvent::EID_END_TEXT_EDIT |
- tools::EventMultiplexerEvent::EID_VIEW_ADDED);
+ EventMultiplexerEventId::CurrentPageChanged |
+ EventMultiplexerEventId::MainViewAdded |
+ EventMultiplexerEventId::ShapeChanged |
+ EventMultiplexerEventId::EditModeNormal |
+ EventMultiplexerEventId::EditModeMaster |
+ EventMultiplexerEventId::EditViewSelection |
+ EventMultiplexerEventId::EndTextEdit |
+ EventMultiplexerEventId::ViewAdded);
}
void SlideBackground::removeListener()
@@ -355,15 +355,15 @@ IMPL_LINK(SlideBackground, EventMultiplexerListener,
{
// add more events as per requirement
// Master Page change triggers a shape change event. Solves sync problem.
- case tools::EventMultiplexerEvent::EID_SHAPE_CHANGED:
+ case EventMultiplexerEventId::ShapeChanged:
populateMasterSlideDropdown();
break;
- case tools::EventMultiplexerEvent::EID_EDIT_MODE_NORMAL:
- case tools::EventMultiplexerEvent::EID_EDIT_MODE_MASTER:
+ case EventMultiplexerEventId::EditModeNormal:
+ case EventMultiplexerEventId::EditModeMaster:
mbEditModeChangePending = true;
break;
- case tools::EventMultiplexerEvent::EID_EDIT_VIEW_SELECTION:
- case tools::EventMultiplexerEvent::EID_END_TEXT_EDIT:
+ case EventMultiplexerEventId::EditViewSelection:
+ case EventMultiplexerEventId::EndTextEdit:
{
if (mbEditModeChangePending)
{
@@ -407,7 +407,7 @@ IMPL_LINK(SlideBackground, EventMultiplexerListener,
}
}
break;
- case tools::EventMultiplexerEvent::EID_CURRENT_PAGE:
+ case EventMultiplexerEventId::CurrentPageChanged:
{
static sal_uInt16 SidArray[] = {
SID_ATTR_PAGE_COLOR,
@@ -422,7 +422,7 @@ IMPL_LINK(SlideBackground, EventMultiplexerListener,
GetBindings()->Invalidate( SidArray );
}
break;
- case tools::EventMultiplexerEvent::EID_VIEW_ADDED:
+ case EventMultiplexerEventId::ViewAdded:
{
if(!mbTitle)
{
diff --git a/sd/source/ui/slidesorter/controller/SlsListener.cxx b/sd/source/ui/slidesorter/controller/SlsListener.cxx
index d4cf350ca584..5203b879407a 100644
--- a/sd/source/ui/slidesorter/controller/SlsListener.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsListener.cxx
@@ -128,11 +128,11 @@ Listener::Listener (
Link<tools::EventMultiplexerEvent&,void> aLink (LINK(this, Listener, EventMultiplexerCallback));
mpBase->GetEventMultiplexer()->AddEventListener(
aLink,
- tools::EventMultiplexerEvent::EID_MAIN_VIEW_REMOVED
- | tools::EventMultiplexerEvent::EID_MAIN_VIEW_ADDED
- | tools::EventMultiplexerEvent::EID_CONTROLLER_ATTACHED
- | tools::EventMultiplexerEvent::EID_CONTROLLER_DETACHED
- | tools::EventMultiplexerEvent::EID_CONFIGURATION_UPDATED);
+ EventMultiplexerEventId::MainViewRemoved
+ | EventMultiplexerEventId::MainViewAdded
+ | EventMultiplexerEventId::ControllerAttached
+ | EventMultiplexerEventId::ControllerDetached
+ | EventMultiplexerEventId::ConfigurationUpdated);
}
}
@@ -188,11 +188,11 @@ void Listener::ReleaseListeners()
Link<sd::tools::EventMultiplexerEvent&,void> aLink (LINK(this, Listener, EventMultiplexerCallback));
mpBase->GetEventMultiplexer()->RemoveEventListener(
aLink,
- tools::EventMultiplexerEvent::EID_MAIN_VIEW_REMOVED
- | tools::EventMultiplexerEvent::EID_MAIN_VIEW_ADDED
- | tools::EventMultiplexerEvent::EID_CONTROLLER_ATTACHED
- | tools::EventMultiplexerEvent::EID_CONTROLLER_DETACHED
- | tools::EventMultiplexerEvent::EID_CONFIGURATION_UPDATED);
+ EventMultiplexerEventId::MainViewRemoved
+ | EventMultiplexerEventId::MainViewAdded
+ | EventMultiplexerEventId::ControllerAttached
+ | EventMultiplexerEventId::ControllerDetached
+ | EventMultiplexerEventId::ConfigurationUpdated);
}
}
@@ -348,7 +348,7 @@ IMPL_LINK(Listener, EventMultiplexerCallback, ::sd::tools::EventMultiplexerEvent
{
switch (rEvent.meEventId)
{
- case tools::EventMultiplexerEvent::EID_MAIN_VIEW_REMOVED:
+ case EventMultiplexerEventId::MainViewRemoved:
{
if (mpBase != nullptr)
{
@@ -359,11 +359,11 @@ IMPL_LINK(Listener, EventMultiplexerCallback, ::sd::tools::EventMultiplexerEvent
}
break;
- case tools::EventMultiplexerEvent::EID_MAIN_VIEW_ADDED:
+ case EventMultiplexerEventId::MainViewAdded:
mbIsMainViewChangePending = true;
break;
- case tools::EventMultiplexerEvent::EID_CONFIGURATION_UPDATED:
+ case EventMultiplexerEventId::ConfigurationUpdated:
if (mbIsMainViewChangePending && mpBase != nullptr)
{
mbIsMainViewChangePending = false;
@@ -376,7 +376,7 @@ IMPL_LINK(Listener, EventMultiplexerCallback, ::sd::tools::EventMultiplexerEvent
}
break;
- case tools::EventMultiplexerEvent::EID_CONTROLLER_ATTACHED:
+ case EventMultiplexerEventId::ControllerAttached:
{
ConnectToController();
// mrController.GetPageSelector().GetCoreSelection();
@@ -384,17 +384,17 @@ IMPL_LINK(Listener, EventMultiplexerCallback, ::sd::tools::EventMultiplexerEvent
}
break;
- case tools::EventMultiplexerEvent::EID_CONTROLLER_DETACHED:
+ case EventMultiplexerEventId::ControllerDetached:
DisconnectFromController();
break;
- case tools::EventMultiplexerEvent::EID_SHAPE_CHANGED:
- case tools::EventMultiplexerEvent::EID_SHAPE_INSERTED:
- case tools::EventMultiplexerEvent::EID_SHAPE_REMOVED:
+ case EventMultiplexerEventId::ShapeChanged:
+ case EventMultiplexerEventId::ShapeInserted:
+ case EventMultiplexerEventId::ShapeRemoved:
HandleShapeModification(static_cast<const SdrPage*>(rEvent.mpUserData));
break;
- case tools::EventMultiplexerEvent::EID_END_TEXT_EDIT:
+ case EventMultiplexerEventId::EndTextEdit:
if (rEvent.mpUserData != nullptr)
{
const SdrObject* pObject = static_cast<const SdrObject*>(rEvent.mpUserData);
diff --git a/sd/source/ui/table/TableDesignPane.cxx b/sd/source/ui/table/TableDesignPane.cxx
index 9233453be888..f09f52dc5a36 100644
--- a/sd/source/ui/table/TableDesignPane.cxx
+++ b/sd/source/ui/table/TableDesignPane.cxx
@@ -424,11 +424,11 @@ void TableDesignWidget::addListener()
Link<tools::EventMultiplexerEvent&,void> aLink( LINK(this,TableDesignWidget,EventMultiplexerListener) );
mrBase.GetEventMultiplexer()->AddEventListener (
aLink,
- tools::EventMultiplexerEvent::EID_EDIT_VIEW_SELECTION
- | tools::EventMultiplexerEvent::EID_CURRENT_PAGE
- | tools::EventMultiplexerEvent::EID_MAIN_VIEW_REMOVED
- | tools::EventMultiplexerEvent::EID_MAIN_VIEW_ADDED
- | tools::EventMultiplexerEvent::EID_DISPOSING);
+ EventMultiplexerEventId::EditViewSelection
+ | EventMultiplexerEventId::CurrentPageChanged
+ | EventMultiplexerEventId::MainViewRemoved
+ | EventMultiplexerEventId::MainViewAdded
+ | EventMultiplexerEventId::Disposing);
}
void TableDesignWidget::removeListener()
@@ -442,20 +442,22 @@ IMPL_LINK(TableDesignWidget,EventMultiplexerListener,
{
switch (rEvent.meEventId)
{
- case tools::EventMultiplexerEvent::EID_CURRENT_PAGE:
- case tools::EventMultiplexerEvent::EID_EDIT_VIEW_SELECTION:
+ case EventMultiplexerEventId::CurrentPageChanged:
+ case EventMultiplexerEventId::EditViewSelection:
onSelectionChanged();
break;
- case tools::EventMultiplexerEvent::EID_MAIN_VIEW_REMOVED:
+ case EventMultiplexerEventId::MainViewRemoved:
mxView.clear();
onSelectionChanged();
break;
- case tools::EventMultiplexerEvent::EID_MAIN_VIEW_ADDED:
+ case EventMultiplexerEventId::MainViewAdded:
mxView.set( mrBase.GetController(), UNO_QUERY );
onSelectionChanged();
break;
+
+ default: break;
}
}
diff --git a/sd/source/ui/tools/EventMultiplexer.cxx b/sd/source/ui/tools/EventMultiplexer.cxx
index d51d5b9e0c0f..fc5aae457e25 100644
--- a/sd/source/ui/tools/EventMultiplexer.cxx
+++ b/sd/source/ui/tools/EventMultiplexer.cxx
@@ -69,11 +69,11 @@ public:
void AddEventListener (
const Link<EventMultiplexerEvent&,void>& rCallback,
- EventMultiplexerEvent::EventId aEventTypes);
+ EventMultiplexerEventId aEventTypes);
void RemoveEventListener (
const Link<EventMultiplexerEvent&,void>& rCallback,
- EventMultiplexerEvent::EventId aEventTypes);
+ EventMultiplexerEventId aEventTypes);
void CallListeners (EventMultiplexerEvent& rEvent);
@@ -118,7 +118,7 @@ protected:
private:
ViewShellBase& mrBase;
- typedef ::std::pair<Link<EventMultiplexerEvent&,void>,EventMultiplexerEvent::EventId> ListenerDescriptor;
+ typedef ::std::pair<Link<EventMultiplexerEvent&,void>,EventMultiplexerEventId> ListenerDescriptor;
typedef ::std::vector<ListenerDescriptor> ListenerList;
ListenerList maListeners;
@@ -139,7 +139,7 @@ private:
void DisconnectFromController();
void CallListeners (
- EventMultiplexerEvent::EventId eId,
+ EventMultiplexerEventId eId,
void* pUserData = nullptr);
/** This method throws a DisposedException when the object has already been
@@ -177,20 +177,20 @@ EventMultiplexer::~EventMultiplexer()
void EventMultiplexer::AddEventListener (
const Link<EventMultiplexerEvent&,void>& rCallback,
- EventMultiplexerEvent::EventId aEventTypes)
+ EventMultiplexerEventId aEventTypes)
{
mpImpl->AddEventListener (rCallback, aEventTypes);
}
void EventMultiplexer::RemoveEventListener (
const Link<EventMultiplexerEvent&,void>& rCallback,
- EventMultiplexerEvent::EventId aEventTypes)
+ EventMultiplexerEventId aEventTypes)
{
mpImpl->RemoveEventListener (rCallback, aEventTypes);
}
void EventMultiplexer::MultiplexEvent(
- EventMultiplexerEvent::EventId eEventId,
+ EventMultiplexerEventId eEventId,
void* pUserData )
{
EventMultiplexerEvent aEvent(eEventId, pUserData);
@@ -307,7 +307,7 @@ void EventMultiplexer::Implementation::ReleaseListeners()
void EventMultiplexer::Implementation::AddEventListener (
const Link<EventMultiplexerEvent&,void>& rCallback,
- EventMultiplexerEvent::EventId aEventTypes)
+ EventMultiplexerEventId aEventTypes)
{
ListenerList::iterator iListener (maListeners.begin());
ListenerList::const_iterator iEnd (maListeners.end());
@@ -327,7 +327,7 @@ void EventMultiplexer::Implementation::AddEventListener (
void EventMultiplexer::Implementation::RemoveEventListener (
const Link<EventMultiplexerEvent&,void>& rCallback,
- EventMultiplexerEvent::EventId aEventTypes)
+ EventMultiplexerEventId aEventTypes)
{
ListenerList::iterator iListener (maListeners.begin());
ListenerList::const_iterator iEnd (maListeners.end());
@@ -339,7 +339,7 @@ void EventMultiplexer::Implementation::RemoveEventListener (
// Update the event type set.
iListener->second &= ~aEventTypes;
// When no events remain in the set then remove the listener.
- if (iListener->second == EID_EMPTY_SET)
+ if (iListener->second == EventMultiplexerEventId::NONE)
maListeners.erase (iListener);
}
}
@@ -488,16 +488,16 @@ void SAL_CALL EventMultiplexer::Implementation::propertyChange (
if ( rEvent.PropertyName == aCurrentPagePropertyName )
{
- CallListeners(EventMultiplexerEvent::EID_CURRENT_PAGE);
+ CallListeners(EventMultiplexerEventId::CurrentPageChanged);
}
else if ( rEvent.PropertyName == aEditModePropertyName )
{
bool bIsMasterPageMode (false);
rEvent.NewValue >>= bIsMasterPageMode;
if (bIsMasterPageMode)
- CallListeners(EventMultiplexerEvent::EID_EDIT_MODE_MASTER);
+ CallListeners(EventMultiplexerEventId::EditModeMaster);
else
- CallListeners(EventMultiplexerEvent::EID_EDIT_MODE_NORMAL);
+ CallListeners(EventMultiplexerEventId::EditModeNormal);
}
}
@@ -513,19 +513,19 @@ void SAL_CALL EventMultiplexer::Implementation::frameAction (
{
case frame::FrameAction_COMPONENT_DETACHING:
DisconnectFromController();
- CallListeners (EventMultiplexerEvent::EID_CONTROLLER_DETACHED);
+ CallListeners (EventMultiplexerEventId::ControllerDetached);
break;
case frame::FrameAction_COMPONENT_REATTACHED:
- CallListeners (EventMultiplexerEvent::EID_CONTROLLER_DETACHED);
+ CallListeners (EventMultiplexerEventId::ControllerDetached);
DisconnectFromController();
ConnectToController();
- CallListeners (EventMultiplexerEvent::EID_CONTROLLER_ATTACHED);
+ CallListeners (EventMultiplexerEventId::ControllerAttached);
break;
case frame::FrameAction_COMPONENT_ATTACHED:
ConnectToController();
- CallListeners (EventMultiplexerEvent::EID_CONTROLLER_ATTACHED);
+ CallListeners (EventMultiplexerEventId::ControllerAttached);
break;
default:
@@ -539,7 +539,7 @@ void SAL_CALL EventMultiplexer::Implementation::selectionChanged (
const lang::EventObject& )
throw (css::uno::RuntimeException, std::exception)
{
- CallListeners (EventMultiplexerEvent::EID_EDIT_VIEW_SELECTION);
+ CallListeners (EventMultiplexerEventId::EditViewSelection);
}
//===== drawing::framework::XConfigurationChangeListener ==================
@@ -555,12 +555,12 @@ void SAL_CALL EventMultiplexer::Implementation::notifyConfigurationChange (
case ResourceActivationEvent:
if (rEvent.ResourceId->getResourceURL().match(FrameworkHelper::msViewURLPrefix))
{
- CallListeners (EventMultiplexerEvent::EID_VIEW_ADDED);
+ CallListeners (EventMultiplexerEventId::ViewAdded);
if (rEvent.ResourceId->isBoundToURL(
FrameworkHelper::msCenterPaneURL, AnchorBindingMode_DIRECT))
{
- CallListeners (EventMultiplexerEvent::EID_MAIN_VIEW_ADDED);
+ CallListeners (EventMultiplexerEventId::MainViewAdded);
}
// Add selection change listener at slide sorter.
@@ -582,12 +582,10 @@ void SAL_CALL EventMultiplexer::Implementation::notifyConfigurationChange (
case ResourceDeactivationEvent:
if (rEvent.ResourceId->getResourceURL().match(FrameworkHelper::msViewURLPrefix))
{
- CallListeners (EventMultiplexerEvent::EID_VIEW_REMOVED);
-
if (rEvent.ResourceId->isBoundToURL(
FrameworkHelper::msCenterPaneURL, AnchorBindingMode_DIRECT))
{
- CallListeners (EventMultiplexerEvent::EID_MAIN_VIEW_REMOVED);
+ CallListeners (EventMultiplexerEventId::MainViewRemoved);
}
// Remove selection change listener from slide sorter. Add
@@ -608,7 +606,7 @@ void SAL_CALL EventMultiplexer::Implementation::notifyConfigurationChange (
break;
case ConfigurationUpdateEvent:
- CallListeners (EventMultiplexerEvent::EID_CONFIGURATION_UPDATED);
+ CallListeners (EventMultiplexerEventId::ConfigurationUpdated);
break;
}
@@ -616,7 +614,7 @@ void SAL_CALL EventMultiplexer::Implementation::notifyConfigurationChange (
void SAL_CALL EventMultiplexer::Implementation::disposing()
{
- CallListeners (EventMultiplexerEvent::EID_DISPOSING);
+ CallListeners (EventMultiplexerEventId::Disposing);
ReleaseListeners();
}
@@ -642,25 +640,25 @@ void EventMultiplexer::Implementation::Notify (
{
case SdrHintKind::ModelCleared:
case SdrHintKind::PageOrderChange:
- CallListeners (EventMultiplexerEvent::EID_PAGE_ORDER);
+ CallListeners (EventMultiplexerEventId::PageOrder);
break;
case SdrHintKind::SwitchToPage:
- CallListeners (EventMultiplexerEvent::EID_CURRENT_PAGE);
+ CallListeners (EventMultiplexerEventId::CurrentPageChanged);
break;
case SdrHintKind::ObjectChange:
- CallListeners(EventMultiplexerEvent::EID_SHAPE_CHANGED,
+ CallListeners(EventMultiplexerEventId::ShapeChanged,
const_cast<void*>(static_cast<const void*>(pSdrHint->GetPage())));
break;
case SdrHintKind::ObjectInserted:
- CallListeners(EventMultiplexerEvent::EID_SHAPE_INSERTED,
+ CallListeners(EventMultiplexerEventId::ShapeInserted,
const_cast<void*>(static_cast<const void*>(pSdrHint->GetPage())));
break;
case SdrHintKind::ObjectRemoved:
- CallListeners(EventMultiplexerEvent::EID_SHAPE_REMOVED,
+ CallListeners(EventMultiplexerEventId::ShapeRemoved,
const_cast<void*>(static_cast<const void*>(pSdrHint->GetPage())));
break;
default:
@@ -675,7 +673,7 @@ void EventMultiplexer::Implementation::Notify (
}
void EventMultiplexer::Implementation::CallListeners (
- EventMultiplexerEvent::EventId eId,
+ EventMultiplexerEventId eId,
void* pUserData)
{
EventMultiplexerEvent aEvent(eId, pUserData);
@@ -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);
}
}
IMPL_LINK_NOARG(EventMultiplexer::Implementation, SlideSorterSelectionChangeListener, LinkParamNone*, void)
{
- CallListeners(EventMultiplexerEvent::EID_SLIDE_SORTER_SELECTION);
+ CallListeners(EventMultiplexerEventId::SlideSortedSelection);
}
//===== EventMultiplexerEvent =================================================
EventMultiplexerEvent::EventMultiplexerEvent (
- EventId eEventId,
+ EventMultiplexerEventId eEventId,
const void* pUserData)
: meEventId(eEventId),
mpUserData(pUserData)
diff --git a/sd/source/ui/view/FormShellManager.cxx b/sd/source/ui/view/FormShellManager.cxx
index 613d8b2562fd..fc57bec856a1 100644
--- a/sd/source/ui/view/FormShellManager.cxx
+++ b/sd/source/ui/view/FormShellManager.cxx
@@ -60,9 +60,9 @@ FormShellManager::FormShellManager (ViewShellBase& rBase)
Link<sd::tools::EventMultiplexerEvent&,void> aLink (LINK(this, FormShellManager, ConfigurationUpdateHandler));
mrBase.GetEventMultiplexer()->AddEventListener(
aLink,
- sd::tools::EventMultiplexerEvent::EID_MAIN_VIEW_REMOVED
- | sd::tools::EventMultiplexerEvent::EID_MAIN_VIEW_ADDED
- | sd::tools::EventMultiplexerEvent::EID_CONFIGURATION_UPDATED);
+ EventMultiplexerEventId::MainViewRemoved
+ | EventMultiplexerEventId::MainViewAdded
+ | EventMultiplexerEventId::ConfigurationUpdated);
RegisterAtCenterPane();
}
@@ -202,15 +202,15 @@ IMPL_LINK(FormShellManager, ConfigurationUpdateHandler, sd::tools::EventMultiple
{
switch (rEvent.meEventId)
{
- case sd::tools::EventMultiplexerEvent::EID_MAIN_VIEW_REMOVED:
+ case EventMultiplexerEventId::MainViewRemoved:
UnregisterAtCenterPane();
break;
- case sd::tools::EventMultiplexerEvent::EID_MAIN_VIEW_ADDED:
+ case EventMultiplexerEventId::MainViewAdded:
mbIsMainViewChangePending = true;
break;
- case sd::tools::EventMultiplexerEvent::EID_CONFIGURATION_UPDATED:
+ case EventMultiplexerEventId::ConfigurationUpdated:
if (mbIsMainViewChangePending)
{
mbIsMainViewChangePending = false;
diff --git a/sd/source/ui/view/ToolBarManager.cxx b/sd/source/ui/view/ToolBarManager.cxx
index d97d91ad8408..eb40f3c20984 100644
--- a/sd/source/ui/view/ToolBarManager.cxx
+++ b/sd/source/ui/view/ToolBarManager.cxx
@@ -538,9 +538,9 @@ ToolBarManager::Implementation::Implementation (
Link<tools::EventMultiplexerEvent&,void> aLink (LINK(this,ToolBarManager::Implementation,EventMultiplexerCallback));
mpEventMultiplexer->AddEventListener(
aLink,
- tools::EventMultiplexerEvent::EID_CONTROLLER_ATTACHED
- | tools::EventMultiplexerEvent::EID_CONTROLLER_DETACHED
- | tools::EventMultiplexerEvent::EID_PANE_MANAGER_DYING);
+ EventMultiplexerEventId::ControllerAttached
+ | EventMultiplexerEventId::ControllerDetached
+ | EventMultiplexerEventId::PaneManagerDying);
}
/** The order of statements is important.
@@ -867,19 +867,21 @@ IMPL_LINK(ToolBarManager::Implementation,EventMultiplexerCallback,
SolarMutexGuard g;
switch (rEvent.meEventId)
{
- case tools::EventMultiplexerEvent::EID_CONTROLLER_ATTACHED:
+ case EventMultiplexerEventId::ControllerAttached:
if (mnPendingSetValidCall == nullptr)
mnPendingSetValidCall
= Application::PostUserEvent(LINK(this,Implementation,SetValidCallback));
break;
- case tools::EventMultiplexerEvent::EID_CONTROLLER_DETACHED:
+ case EventMultiplexerEventId::ControllerDetached:
SetValid(false);
break;
- case tools::EventMultiplexerEvent::EID_PANE_MANAGER_DYING:
+ case EventMultiplexerEventId::PaneManagerDying:
SetValid(false);
break;
+
+ default: break;
}
}
diff --git a/sd/source/ui/view/outlview.cxx b/sd/source/ui/view/outlview.cxx
index 83e8992890f4..3288f7fb993c 100644
--- a/sd/source/ui/view/outlview.cxx
+++ b/sd/source/ui/view/outlview.cxx
@@ -129,8 +129,8 @@ OutlineView::OutlineView( DrawDocShell& rDocSh, vcl::Window* pWindow, OutlineVie
Link<tools::EventMultiplexerEvent&,void> aLink( LINK(this,OutlineView,EventMultiplexerListener) );
mrOutlineViewShell.GetViewShellBase().GetEventMultiplexer()->AddEventListener(
aLink,
- tools::EventMultiplexerEvent::EID_CURRENT_PAGE
- | tools::EventMultiplexerEvent::EID_PAGE_ORDER);
+ EventMultiplexerEventId::CurrentPageChanged
+ | EventMultiplexerEventId::PageOrder);
LanguageType eLang = mrOutliner.GetDefaultLanguage();
maPageNumberFont = OutputDevice::GetDefaultFont( DefaultFontType::SANS_UNICODE, eLang, GetDefaultFontFlags::NONE );
@@ -1427,11 +1427,11 @@ IMPL_LINK(OutlineView, EventMultiplexerListener, ::sd::tools::EventMultiplexerEv
{
switch (rEvent.meEventId)
{
- case tools::EventMultiplexerEvent::EID_CURRENT_PAGE:
+ case EventMultiplexerEventId::CurrentPageChanged:
SetActualPage(mrOutlineViewShell.GetActualPage());
break;
- case tools::EventMultiplexerEvent::EID_PAGE_ORDER:
+ case EventMultiplexerEventId::PageOrder:
if (dynamic_cast<Outliner&>(mrOutliner).GetIgnoreCurrentPageChangesLevel()==0)
{
if (((mrDoc.GetPageCount()-1)%2) == 0)
@@ -1444,6 +1444,8 @@ IMPL_LINK(OutlineView, EventMultiplexerListener, ::sd::tools::EventMultiplexerEv
}
}
break;
+
+ default: break;
}
}
diff --git a/sd/source/ui/view/sdview.cxx b/sd/source/ui/view/sdview.cxx
index 7853f40c7cf8..247fe7116bac 100644
--- a/sd/source/ui/view/sdview.cxx
+++ b/sd/source/ui/view/sdview.cxx
@@ -665,7 +665,7 @@ bool View::SdrBeginTextEdit(
bool bMasterPage = pPage && pPage->IsMasterPage();
GetViewShell()->GetViewShellBase().GetEventMultiplexer()->MultiplexEvent(
- sd::tools::EventMultiplexerEvent::EID_BEGIN_TEXT_EDIT, static_cast<void*>(pObj) );
+ EventMultiplexerEventId::BeginTextEdit, static_cast<void*>(pObj) );
if( pOutl==nullptr && pObj )
pOutl = SdrMakeOutliner(OutlinerMode::TextObject, *pObj->GetModel());
@@ -801,7 +801,7 @@ SdrEndTextEditKind View::SdrEndTextEdit(bool bDontDeleteReally)
}
GetViewShell()->GetViewShellBase().GetEventMultiplexer()->MultiplexEvent(
- sd::tools::EventMultiplexerEvent::EID_END_TEXT_EDIT,
+ EventMultiplexerEventId::EndTextEdit,
static_cast<void*>(xObj.get()) );
if( xObj.is() )
diff --git a/sd/source/ui/view/viewoverlaymanager.cxx b/sd/source/ui/view/viewoverlaymanager.cxx
index 5b6729fbceac..6cff6d7b2879 100644
--- a/sd/source/ui/view/viewoverlaymanager.cxx
+++ b/sd/source/ui/view/viewoverlaymanager.cxx
@@ -399,11 +399,11 @@ ViewOverlayManager::ViewOverlayManager( ViewShellBase& rViewShellBase )
, mnUpdateTagsEvent( nullptr )
{
Link<tools::EventMultiplexerEvent&,void> aLink( LINK(this,ViewOverlayManager,EventMultiplexerListener) );
- mrBase.GetEventMultiplexer()->AddEventListener(aLink, tools::EventMultiplexerEvent::EID_CURRENT_PAGE
- | tools::EventMultiplexerEvent::EID_MAIN_VIEW_ADDED
- | tools::EventMultiplexerEvent::EID_VIEW_ADDED
- | tools::EventMultiplexerEvent::EID_BEGIN_TEXT_EDIT
- | tools::EventMultiplexerEvent::EID_END_TEXT_EDIT );
+ mrBase.GetEventMultiplexer()->AddEventListener(aLink, EventMultiplexerEventId::CurrentPageChanged
+ | EventMultiplexerEventId::MainViewAdded
+ | EventMultiplexerEventId::ViewAdded
+ | EventMultiplexerEventId::BeginTextEdit
+ | EventMultiplexerEventId::EndTextEdit );
StartListening( *mrBase.GetDocShell() );
}
@@ -506,13 +506,14 @@ IMPL_LINK(ViewOverlayManager,EventMultiplexerListener,
{
switch (rEvent.meEventId)
{
- case tools::EventMultiplexerEvent::EID_MAIN_VIEW_ADDED:
- case tools::EventMultiplexerEvent::EID_VIEW_ADDED:
- case tools::EventMultiplexerEvent::EID_BEGIN_TEXT_EDIT:
- case tools::EventMultiplexerEvent::EID_END_TEXT_EDIT:
- case tools::EventMultiplexerEvent::EID_CURRENT_PAGE:
+ case EventMultiplexerEventId::MainViewAdded:
+ case EventMultiplexerEventId::ViewAdded:
+ case EventMultiplexerEventId::BeginTextEdit:
+ case EventMultiplexerEventId::EndTextEdit:
+ case EventMultiplexerEventId::CurrentPageChanged:
UpdateTags();
break;
+ default: break;
}
}
generated by cgit (git 2.34.1) at 2024-12-27 20:15:35 +0000