diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-12-06 13:26:09 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-12-07 07:10:39 +0000 |
| commit | 2d48f5fc0a4f7b5b8c9d3a4f4cc85d5f3a7e5053 (patch) | |
| tree | c2e18df7dd44255e98c91f242194fd9bb66f3f3e /framework | |
| parent | ed80d28d9f019a1afa2edd66e115eae26ea19963 (diff) | |
convert VCLEVENT constants to scoped enum
Change-Id: Ic8ccb0a9715ec05182dacddab2c015b0de6a0fba
Reviewed-on: https://gerrit.libreoffice.org/31675
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/source/dispatch/windowcommanddispatch.cxx | 4 | ||||
| -rw-r--r-- | framework/source/layoutmanager/toolbarlayoutmanager.cxx | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/framework/source/dispatch/windowcommanddispatch.cxx b/framework/source/dispatch/windowcommanddispatch.cxx index 1470007553ae..adfce4908101 100644 --- a/framework/source/dispatch/windowcommanddispatch.cxx +++ b/framework/source/dispatch/windowcommanddispatch.cxx @@ -94,12 +94,12 @@ void WindowCommandDispatch::impl_stopListening() IMPL_LINK(WindowCommandDispatch, impl_notifyCommand, VclWindowEvent&, rEvent, void) { - if (rEvent.GetId() == VCLEVENT_OBJECT_DYING) + if (rEvent.GetId() == VclEventId::ObjectDying) { impl_stopListening(); return; } - if (rEvent.GetId() != VCLEVENT_WINDOW_COMMAND) + if (rEvent.GetId() != VclEventId::WindowCommand) return; const CommandEvent* pCommand = static_cast<CommandEvent*>(rEvent.GetData()); diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.cxx b/framework/source/layoutmanager/toolbarlayoutmanager.cxx index 98cbacebeb02..eefd7dc1374e 100644 --- a/framework/source/layoutmanager/toolbarlayoutmanager.cxx +++ b/framework/source/layoutmanager/toolbarlayoutmanager.cxx @@ -908,7 +908,7 @@ long ToolbarLayoutManager::childWindowEvent( VclSimpleEvent* pEvent ) // anymore! if ( dynamic_cast< const VclWindowEvent* >(pEvent) != nullptr ) { - if ( pEvent->GetId() == VCLEVENT_TOOLBOX_SELECT ) + if ( pEvent->GetId() == VclEventId::ToolboxSelect ) { OUString aToolbarName; OUString aCommand; @@ -956,7 +956,7 @@ long ToolbarLayoutManager::childWindowEvent( VclSimpleEvent* pEvent ) } } } - else if ( pEvent->GetId() == VCLEVENT_TOOLBOX_FORMATCHANGED ) + else if ( pEvent->GetId() == VclEventId::ToolboxFormatChanged ) { if ( !implts_isToolbarCreationActive() ) { |