diff options
| author | Noel Grandin <noel@peralex.com> | 2015-05-07 15:25:20 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2015-05-11 12:17:42 +0000 |
| commit | 82d68f9cbce4073a727c43b4a8e81d39871b71eb (patch) | |
| tree | 64b3a9e1092586afee46899adfd00070821613b8 /framework | |
| parent | 19ea033f380aa196c9c868a3cdb43e967eb42abe (diff) | |
convert COMMAND_ constants to scoped enum
Change-Id: I88e67f89dbbab0646e8f106dfeb32c6ee1bb0b95
Reviewed-on: https://gerrit.libreoffice.org/15671
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/source/dispatch/windowcommanddispatch.cxx | 2 | ||||
| -rw-r--r-- | framework/source/uielement/statusbarmanager.cxx | 2 | ||||
| -rw-r--r-- | framework/source/uielement/toolbarmanager.cxx | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/framework/source/dispatch/windowcommanddispatch.cxx b/framework/source/dispatch/windowcommanddispatch.cxx index 69205499dcee..dcdc4651c2d8 100644 --- a/framework/source/dispatch/windowcommanddispatch.cxx +++ b/framework/source/dispatch/windowcommanddispatch.cxx @@ -107,7 +107,7 @@ IMPL_LINK(WindowCommandDispatch, impl_notifyCommand, void*, pParam) return 0L; const CommandEvent* pCommand = static_cast<CommandEvent*>(pEvent->GetData()); - if (pCommand->GetCommand() != COMMAND_SHOWDIALOG) + if (pCommand->GetCommand() != CommandEventId::ShowDialog) return 0L; const CommandDialogData* pData = pCommand->GetDialogData(); diff --git a/framework/source/uielement/statusbarmanager.cxx b/framework/source/uielement/statusbarmanager.cxx index f6bfb7eaf03e..80e81c03032b 100644 --- a/framework/source/uielement/statusbarmanager.cxx +++ b/framework/source/uielement/statusbarmanager.cxx @@ -599,7 +599,7 @@ void StatusBarManager::Command( const CommandEvent& rEvt ) if ( m_bDisposed ) return; - if ( rEvt.GetCommand() == COMMAND_CONTEXTMENU ) + if ( rEvt.GetCommand() == CommandEventId::ContextMenu ) { sal_uInt16 nId = m_pStatusBar->GetItemId( rEvt.GetMousePosPixel() ); StatusBarControllerMap::const_iterator it = m_aControllerMap.find( nId ); diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx index 46d04d9e5894..3e12b5efef78 100644 --- a/framework/source/uielement/toolbarmanager.cxx +++ b/framework/source/uielement/toolbarmanager.cxx @@ -1777,7 +1777,7 @@ IMPL_LINK_TYPED( ToolBarManager, Command, CommandEvent const *, pCmdEvt, void ) if ( m_bDisposed ) return; - if ( pCmdEvt->GetCommand() != COMMAND_CONTEXTMENU ) + if ( pCmdEvt->GetCommand() != CommandEventId::ContextMenu ) return; ::PopupMenu * pMenu = GetToolBarCustomMenu(m_pToolBar); |