diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-12-20 14:59:51 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-12-21 07:10:54 +0000 |
| commit | 5ec1b04b9bfe949316c67b1282f7f8fa066c3b60 (patch) | |
| tree | 77e1940145bf44e6dc60aeefb2df853d88f2f0c0 /sfx2/source/notebookbar | |
| parent | 72002992a3c5213882fa4d60c7cd8fab10f0b009 (diff) | |
convert EnumContext::Application to scoped enum
Change-Id: Ia289a7b63bf8797085315218785e2a2a4c45d232
Reviewed-on: https://gerrit.libreoffice.org/32230
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sfx2/source/notebookbar')
| -rw-r--r-- | sfx2/source/notebookbar/SfxNotebookBar.cxx | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/sfx2/source/notebookbar/SfxNotebookBar.cxx b/sfx2/source/notebookbar/SfxNotebookBar.cxx index c34b66629d29..b404a3724ba2 100644 --- a/sfx2/source/notebookbar/SfxNotebookBar.cxx +++ b/sfx2/source/notebookbar/SfxNotebookBar.cxx @@ -58,13 +58,13 @@ static OUString lcl_getAppName( vcl::EnumContext::Application eApp ) { switch ( eApp ) { - case vcl::EnumContext::Application::Application_Writer: + case vcl::EnumContext::Application::Writer: return OUString( "Writer" ); break; - case vcl::EnumContext::Application::Application_Calc: + case vcl::EnumContext::Application::Calc: return OUString( "Calc" ); break; - case vcl::EnumContext::Application::Application_Impress: + case vcl::EnumContext::Application::Impress: return OUString( "Impress" ); break; default: @@ -79,13 +79,13 @@ static void lcl_setNotebookbarFileName( vcl::EnumContext::Application eApp, cons comphelper::ConfigurationChanges::create( ::comphelper::getProcessComponentContext() ) ); switch ( eApp ) { - case vcl::EnumContext::Application::Application_Writer: + case vcl::EnumContext::Application::Writer: officecfg::Office::UI::Notebookbar::ActiveWriter::set( sFileName, aBatch ); break; - case vcl::EnumContext::Application::Application_Calc: + case vcl::EnumContext::Application::Calc: officecfg::Office::UI::Notebookbar::ActiveCalc::set( sFileName, aBatch ); break; - case vcl::EnumContext::Application::Application_Impress: + case vcl::EnumContext::Application::Impress: officecfg::Office::UI::Notebookbar::ActiveImpress::set( sFileName, aBatch ); break; default: @@ -98,13 +98,13 @@ static OUString lcl_getNotebookbarFileName( vcl::EnumContext::Application eApp ) { switch ( eApp ) { - case vcl::EnumContext::Application::Application_Writer: + case vcl::EnumContext::Application::Writer: return officecfg::Office::UI::Notebookbar::ActiveWriter::get(); break; - case vcl::EnumContext::Application::Application_Calc: + case vcl::EnumContext::Application::Calc: return officecfg::Office::UI::Notebookbar::ActiveCalc::get(); break; - case vcl::EnumContext::Application::Application_Impress: + case vcl::EnumContext::Application::Impress: return officecfg::Office::UI::Notebookbar::ActiveImpress::get(); break; default: @@ -170,7 +170,7 @@ void SfxNotebookBar::CloseMethod(SystemWindow* pSysWindow) bool SfxNotebookBar::IsActive() { - vcl::EnumContext::Application eApp = vcl::EnumContext::Application::Application_Any; + vcl::EnumContext::Application eApp = vcl::EnumContext::Application::Any; if (SfxViewFrame::Current()) { @@ -354,7 +354,7 @@ void SfxNotebookBar::ShowMenubar(bool bShow) m_bLock = true; Reference<frame::XFrame> xFrame; - vcl::EnumContext::Application eCurrentApp = vcl::EnumContext::Application::Application_None; + vcl::EnumContext::Application eCurrentApp = vcl::EnumContext::Application::NONE; uno::Reference< uno::XComponentContext > xContext = comphelper::getProcessComponentContext(); const Reference<frame::XModuleManager> xModuleManager = frame::ModuleManager::create( xContext ); |