From 2d48f5fc0a4f7b5b8c9d3a4f4cc85d5f3a7e5053 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Tue, 6 Dec 2016 13:26:09 +0200 Subject: convert VCLEVENT constants to scoped enum Change-Id: Ic8ccb0a9715ec05182dacddab2c015b0de6a0fba Reviewed-on: https://gerrit.libreoffice.org/31675 Tested-by: Jenkins Reviewed-by: Noel Grandin --- framework/source/dispatch/windowcommanddispatch.cxx | 4 ++-- framework/source/layoutmanager/toolbarlayoutmanager.cxx | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'framework') 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(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() ) { -- cgit