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 /sd/source/ui/sidebar | |
| 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 'sd/source/ui/sidebar')
| -rw-r--r-- | sd/source/ui/sidebar/SlideBackground.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sd/source/ui/sidebar/SlideBackground.cxx b/sd/source/ui/sidebar/SlideBackground.cxx index 1946be932b8c..6673ee838ec3 100644 --- a/sd/source/ui/sidebar/SlideBackground.cxx +++ b/sd/source/ui/sidebar/SlideBackground.cxx @@ -111,7 +111,7 @@ SlideBackground::SlideBackground( mbEditModeChangePending(false), mxFrame(rxFrame), maContext(), - maApplication(vcl::EnumContext::Application_None), + maApplication(vcl::EnumContext::Application::NONE), mbTitle(false), mpBindings(pBindings) { @@ -138,7 +138,7 @@ SlideBackground::~SlideBackground() bool SlideBackground::IsImpress() { - return ( maApplication == vcl::EnumContext::Application_Impress ); + return ( maApplication == vcl::EnumContext::Application::Impress ); } void SlideBackground::Initialize() @@ -391,18 +391,18 @@ IMPL_LINK(SlideBackground, EventMultiplexerListener, { if(!mbTitle) { - vcl::EnumContext aDrawOtherContext(vcl::EnumContext::Application_Draw, + vcl::EnumContext aDrawOtherContext(vcl::EnumContext::Application::Draw, vcl::EnumContext::Context_DrawPage); - vcl::EnumContext aDrawMasterContext(vcl::EnumContext::Application_Draw, + vcl::EnumContext aDrawMasterContext(vcl::EnumContext::Application::Draw, vcl::EnumContext::Context_MasterPage); - vcl::EnumContext aImpressOtherContext(vcl::EnumContext::Application_Impress, + vcl::EnumContext aImpressOtherContext(vcl::EnumContext::Application::Impress, vcl::EnumContext::Context_DrawPage); - vcl::EnumContext aImpressMasterContext(vcl::EnumContext::Application_Impress, + vcl::EnumContext aImpressMasterContext(vcl::EnumContext::Application::Impress, vcl::EnumContext::Context_MasterPage); if(maContext == aDrawOtherContext || maContext == aDrawMasterContext) { mpMasterLabel->SetText(SD_RESSTR(STR_MASTERPAGE_NAME)); - maApplication = vcl::EnumContext::Application_Draw; + maApplication = vcl::EnumContext::Application::Draw; mpCloseMaster->Hide(); mpEditMaster->Hide(); if( maContext == aDrawMasterContext) @@ -413,7 +413,7 @@ IMPL_LINK(SlideBackground, EventMultiplexerListener, else if ( maContext == aImpressOtherContext || maContext == aImpressMasterContext ) { mpMasterLabel->SetText(SD_RESSTR(STR_MASTERSLIDE_NAME)); - maApplication = vcl::EnumContext::Application_Impress; + maApplication = vcl::EnumContext::Application::Impress; mpCloseMaster->Hide(); mpEditMaster->Show(); if( maContext == aImpressMasterContext ) |