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 /vcl/source/control | |
| 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 'vcl/source/control')
| -rw-r--r-- | vcl/source/control/tabctrl.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/vcl/source/control/tabctrl.cxx b/vcl/source/control/tabctrl.cxx index 0dc66120df89..ee31141867f6 100644 --- a/vcl/source/control/tabctrl.cxx +++ b/vcl/source/control/tabctrl.cxx @@ -2209,7 +2209,7 @@ sal_uInt16 NotebookbarTabControl::m_nHeaderHeight = 0; NotebookbarTabControl::NotebookbarTabControl(vcl::Window* pParent) : TabControl(pParent, WB_STDTABCONTROL) , bLastContextWasSupported(true) - , eLastContext(vcl::EnumContext::Context::Context_Any) + , eLastContext(vcl::EnumContext::Context::Any) { LanguageTag aLocale( Application::GetSettings().GetUILanguageTag()); ResMgr* pResMgr = ResMgr::SearchCreateResMgr( "vcl", aLocale ); @@ -2232,18 +2232,18 @@ void NotebookbarTabControl::SetContext( vcl::EnumContext::Context eContext ) { TabPage* pPage = static_cast<TabPage*>(GetChild(nChild)); - if (pPage->HasContext(eContext) || pPage->HasContext(vcl::EnumContext::Context::Context_Any)) + if (pPage->HasContext(eContext) || pPage->HasContext(vcl::EnumContext::Context::Any)) EnablePage(nChild + 2); else EnablePage(nChild + 2, false); if (!bHandled && bLastContextWasSupported - && pPage->HasContext(vcl::EnumContext::Context::Context_Default)) + && pPage->HasContext(vcl::EnumContext::Context::Default)) { SetCurPageId(nChild + 2); } - if (pPage->HasContext(eContext) && eContext != vcl::EnumContext::Context::Context_Any) + if (pPage->HasContext(eContext) && eContext != vcl::EnumContext::Context::Any) { SetCurPageId(nChild + 2); bHandled = true; @@ -2367,7 +2367,7 @@ bool NotebookbarTabControl::ImplPlaceTabs( long nWidth ) mbSmallInvalidate = false; // don't show empty space when tab is hidden, move next tabs to the left - if ( it->mpTabPage && !it->mpTabPage->HasContext(vcl::EnumContext::Context_Any) ) + if ( it->mpTabPage && !it->mpTabPage->HasContext(vcl::EnumContext::Context::Any) ) { aNewRect.setX(aNewRect.getX() - nHiddenWidth); nHiddenWidth += aNewRect.getWidth(); |