diff options
| author | Noel Grandin <noel@peralex.com> | 2016-05-10 10:14:16 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2016-05-10 09:57:14 +0000 |
| commit | 57f84e5b1f27a442981602bc428270a5ecb95959 (patch) | |
| tree | fcb7b5881b50bf3fd97bfa2b7521d43d0f06fdb4 /framework | |
| parent | effde80f670c60986a92ca0f1c5c9922eb17908d (diff) | |
Convert TOOLBOX_MENUTYPE_ to scoped enum
Change-Id: I8eb25fc274b45b8add04dfc03e4b52f130ad04de
Reviewed-on: https://gerrit.libreoffice.org/24827
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/source/layoutmanager/toolbarlayoutmanager.cxx | 6 | ||||
| -rw-r--r-- | framework/source/uielement/addonstoolbarmanager.cxx | 2 | ||||
| -rw-r--r-- | framework/source/uielement/toolbarmanager.cxx | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.cxx b/framework/source/layoutmanager/toolbarlayoutmanager.cxx index e264e97db947..e8779f1d9778 100644 --- a/framework/source/layoutmanager/toolbarlayoutmanager.cxx +++ b/framework/source/layoutmanager/toolbarlayoutmanager.cxx @@ -537,11 +537,11 @@ bool ToolbarLayoutManager::createToolbar( const OUString& rResourceURL ) if ( pWindow && pWindow->GetType() == WINDOW_TOOLBOX ) { ToolBox* pToolbar = static_cast<ToolBox *>(pWindow); - sal_uInt16 nMenuType = pToolbar->GetMenuType(); + ToolBoxMenuType nMenuType = pToolbar->GetMenuType(); if ( aCmdOptions.Lookup( SvtCommandOptions::CMDOPTION_DISABLED, "ConfigureDialog" )) - pToolbar->SetMenuType( nMenuType & ~TOOLBOX_MENUTYPE_CUSTOMIZE ); + pToolbar->SetMenuType( nMenuType & ~ToolBoxMenuType::Customize ); else - pToolbar->SetMenuType( nMenuType | TOOLBOX_MENUTYPE_CUSTOMIZE ); + pToolbar->SetMenuType( nMenuType | ToolBoxMenuType::Customize ); } bNotify = true; diff --git a/framework/source/uielement/addonstoolbarmanager.cxx b/framework/source/uielement/addonstoolbarmanager.cxx index 0154bddb5f81..fe3aadc5b9bc 100644 --- a/framework/source/uielement/addonstoolbarmanager.cxx +++ b/framework/source/uielement/addonstoolbarmanager.cxx @@ -80,7 +80,7 @@ AddonsToolBarManager::AddonsToolBarManager( const Reference< XComponentContext > ToolBox* pToolBar ) : ToolBarManager( rxContext, rFrame, rResourceName, pToolBar ) { - m_pToolBar->SetMenuType( TOOLBOX_MENUTYPE_CLIPPEDITEMS ); + m_pToolBar->SetMenuType( ToolBoxMenuType::ClippedItems ); m_pToolBar->SetSelectHdl( LINK( this, AddonsToolBarManager, Select) ); m_pToolBar->SetClickHdl( LINK( this, AddonsToolBarManager, Click ) ); m_pToolBar->SetDoubleClickHdl( LINK( this, AddonsToolBarManager, DoubleClick ) ); diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx index 1a6eacab14f3..4eb687710dd0 100644 --- a/framework/source/uielement/toolbarmanager.cxx +++ b/framework/source/uielement/toolbarmanager.cxx @@ -167,9 +167,9 @@ ToolBarManager::ToolBarManager( const Reference< XComponentContext >& rxContext, // enables a menu for clipped items and customization SvtCommandOptions aCmdOptions; - sal_uInt16 nMenuType = TOOLBOX_MENUTYPE_CLIPPEDITEMS; + ToolBoxMenuType nMenuType = ToolBoxMenuType::ClippedItems; if ( !aCmdOptions.Lookup( SvtCommandOptions::CMDOPTION_DISABLED, "CreateDialog")) - nMenuType |= TOOLBOX_MENUTYPE_CUSTOMIZE; + nMenuType |= ToolBoxMenuType::Customize; m_pToolBar->SetCommandHdl( LINK( this, ToolBarManager, Command ) ); m_pToolBar->SetMenuType( nMenuType ); |