diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-12-21 09:28:30 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-12-21 10:34:13 +0000 |
| commit | 735a002507e914bc0c35504a85dc0585b25b76ce (patch) | |
| tree | acd91105fa2d9128cc10b7f2118cef23b8015921 /sfx2 | |
| parent | c95293de347597bb32d3c4aa5429b21385cae97a (diff) | |
convert EnumContext::Context to scoped enum
Change-Id: I16ec63beb801073e5d604d852892c2fd6e8d8fc3
Reviewed-on: https://gerrit.libreoffice.org/32272
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/notebookbar/ContextVBox.cxx | 2 | ||||
| -rw-r--r-- | sfx2/source/sidebar/ContextChangeBroadcaster.cxx | 2 | ||||
| -rw-r--r-- | sfx2/source/sidebar/ResourceManager.cxx | 2 | ||||
| -rw-r--r-- | sfx2/source/sidebar/SidebarController.cxx | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/sfx2/source/notebookbar/ContextVBox.cxx b/sfx2/source/notebookbar/ContextVBox.cxx index 64de1cab2a48..8723cc458c2e 100644 --- a/sfx2/source/notebookbar/ContextVBox.cxx +++ b/sfx2/source/notebookbar/ContextVBox.cxx @@ -50,7 +50,7 @@ public: { VclContainer* pChild = static_cast<VclContainer*>( GetChild( nChild ) ); - if ( pChild->HasContext( eContext ) || pChild->HasContext( vcl::EnumContext::Context::Context_Any ) ) + if ( pChild->HasContext( eContext ) || pChild->HasContext( vcl::EnumContext::Context::Any ) ) { Size aSize( pChild->GetOptimalSize() ); aSize.Height() += 6; diff --git a/sfx2/source/sidebar/ContextChangeBroadcaster.cxx b/sfx2/source/sidebar/ContextChangeBroadcaster.cxx index 0a1bbe044bba..bdbf62defb36 100644 --- a/sfx2/source/sidebar/ContextChangeBroadcaster.cxx +++ b/sfx2/source/sidebar/ContextChangeBroadcaster.cxx @@ -58,7 +58,7 @@ void ContextChangeBroadcaster::Deactivate (const css::uno::Reference<css::frame: BroadcastContextChange( rxFrame, GetModuleName(rxFrame), - vcl::EnumContext::GetContextName(vcl::EnumContext::Context_Default)); + vcl::EnumContext::GetContextName(vcl::EnumContext::Context::Default)); } } diff --git a/sfx2/source/sidebar/ResourceManager.cxx b/sfx2/source/sidebar/ResourceManager.cxx index 2095acf6db15..9e0f0003ecf1 100644 --- a/sfx2/source/sidebar/ResourceManager.cxx +++ b/sfx2/source/sidebar/ResourceManager.cxx @@ -517,7 +517,7 @@ void ResourceManager::ReadContextList ( // Setup the actual context enum. const vcl::EnumContext::Context eContext (vcl::EnumContext::GetContextEnum(sContextName)); - if (eContext == vcl::EnumContext::Context_Unknown) + if (eContext == vcl::EnumContext::Context::Unknown) { SAL_WARN("sfx.sidebar", "context name " << sContextName << " not recognized"); continue; diff --git a/sfx2/source/sidebar/SidebarController.cxx b/sfx2/source/sidebar/SidebarController.cxx index f048a7a5b0f8..840d7531e1c5 100644 --- a/sfx2/source/sidebar/SidebarController.cxx +++ b/sfx2/source/sidebar/SidebarController.cxx @@ -689,14 +689,14 @@ void SidebarController::SwitchToDeck ( if (aPanelContextDescriptors.empty()) { // There are no panels to be displayed in the current context. - if (vcl::EnumContext::GetContextEnum(rContext.msContext) != vcl::EnumContext::Context_Empty) + if (vcl::EnumContext::GetContextEnum(rContext.msContext) != vcl::EnumContext::Context::Empty) { // Switch to the "empty" context and try again. SwitchToDeck( rDeckDescriptor, Context( rContext.msApplication, - vcl::EnumContext::GetContextName(vcl::EnumContext::Context_Empty))); + vcl::EnumContext::GetContextName(vcl::EnumContext::Context::Empty))); return; } else |