convert EditMode to scoped enum

Change-Id: I7c48978f3e2c173a2ec53eb6559745deeee9b93b

15 files changed, 82 insertions, 84 deletions

diff --git a/sd/source/ui/view/Outliner.cxx b/sd/source/ui/view/Outliner.cxx
index 930925c3b5f6..f7bcf14a3e44 100644
--- a/sd/source/ui/view/Outliner.cxx
+++ b/sd/source/ui/view/Outliner.cxx
@@ -162,7 +162,7 @@ Outliner::Outliner( SdDrawDocument* pDoc, OutlinerMode nMode )
       mnText(0),
       mpParaObj(nullptr),
       meStartViewMode(PK_STANDARD),
-      meStartEditMode(EM_PAGE),
+      meStartEditMode(EditMode::Page),
       mnStartPageIndex((sal_uInt16)-1),
       mpStartEditedObject(nullptr),
       maStartSelection(),
@@ -881,14 +881,14 @@ void Outliner::DetectChange()
 
     // Detect change of page count.  Restart search at first/last page in
     // that case.
-    else if (aPosition.meEditMode == EM_PAGE
+    else if (aPosition.meEditMode == EditMode::Page
         && mpDrawDocument->GetSdPageCount(aPosition.mePageKind) != mnPageCount)
     {
         // The number of pages has changed.
         mnPageCount = mpDrawDocument->GetSdPageCount(aPosition.mePageKind);
         maObjectIterator = ::sd::outliner::OutlinerContainer(this).current();
     }
-    else if (aPosition.meEditMode == EM_MASTERPAGE
+    else if (aPosition.meEditMode == EditMode::MasterPage
         && mpDrawDocument->GetSdPageCount(aPosition.mePageKind) != mnPageCount)
     {
         // The number of master pages has changed.
@@ -1722,7 +1722,7 @@ sal_uInt16 Outliner::ShowModalMessageBox (Dialog& rMessageBox)
 //===== Outliner::Implementation ==============================================
 
 Outliner::Implementation::Implementation()
-    : meOriginalEditMode(EM_PAGE),
+    : meOriginalEditMode(EditMode::Page),
       mbOwnOutlineView(false),
       mpOutlineView(nullptr)
 {
diff --git a/sd/source/ui/view/OutlinerIterator.cxx b/sd/source/ui/view/OutlinerIterator.cxx
index 33a615ef35cd..591ed8f17e92 100644
--- a/sd/source/ui/view/OutlinerIterator.cxx
+++ b/sd/source/ui/view/OutlinerIterator.cxx
@@ -40,7 +40,7 @@ IteratorPosition::IteratorPosition()
 : mnText(0)
 , mnPageIndex(-1)
 , mePageKind(PK_STANDARD)
-, meEditMode(EM_PAGE)
+, meEditMode(EditMode::Page)
 {
 }
 
@@ -238,12 +238,12 @@ Iterator OutlinerContainer::CreateDocumentIterator (
             if (bDirectionIsForward)
             {
                 ePageKind = PK_STANDARD;
-                eEditMode = EM_PAGE;
+                eEditMode = EditMode::Page;
             }
             else
             {
                 ePageKind = PK_HANDOUT;
-                eEditMode = EM_MASTERPAGE;
+                eEditMode = EditMode::MasterPage;
             }
             break;
 
@@ -251,12 +251,12 @@ Iterator OutlinerContainer::CreateDocumentIterator (
             if (bDirectionIsForward)
             {
                 ePageKind = PK_HANDOUT;
-                eEditMode = EM_MASTERPAGE;
+                eEditMode = EditMode::MasterPage;
             }
             else
             {
                 ePageKind = PK_STANDARD;
-                eEditMode = EM_PAGE;
+                eEditMode = EditMode::Page;
             }
             break;
 
@@ -271,7 +271,7 @@ Iterator OutlinerContainer::CreateDocumentIterator (
             else
             {
                 ePageKind = PK_STANDARD;
-                eEditMode = EM_PAGE;
+                eEditMode = EditMode::Page;
             }
             break;
     }
@@ -302,10 +302,10 @@ sal_Int32 OutlinerContainer::GetPageIndex (
 
     switch (eEditMode)
     {
-        case EM_PAGE:
+        case EditMode::Page:
             nPageCount = pDocument->GetSdPageCount (ePageKind);
             break;
-        case EM_MASTERPAGE:
+        case EditMode::MasterPage:
             nPageCount = pDocument->GetMasterSdPageCount(ePageKind);
             break;
         default:
@@ -368,7 +368,7 @@ IteratorImplBase::IteratorImplBase(SdDrawDocument* pDocument,
     else
     {
         maPosition.mePageKind = PK_STANDARD;
-        maPosition.meEditMode = EM_PAGE;
+        maPosition.meEditMode = EditMode::Page;
     }
 }
 
@@ -631,7 +631,7 @@ void ViewIteratorImpl::SetPage (sal_Int32 nPageIndex)
         maPosition.mnPageIndex = nPageIndex;
 
         sal_Int32 nPageCount;
-        if (maPosition.meEditMode == EM_PAGE)
+        if (maPosition.meEditMode == EditMode::Page)
             nPageCount = mpDocument->GetSdPageCount(maPosition.mePageKind);
         else
             nPageCount = mpDocument->GetMasterSdPageCount(
@@ -644,7 +644,7 @@ void ViewIteratorImpl::SetPage (sal_Int32 nPageIndex)
         // side is detected here and has to be reacted to by the caller.
         if (nPageIndex>=0 && nPageIndex < nPageCount)
         {
-            if (maPosition.meEditMode == EM_PAGE)
+            if (maPosition.meEditMode == EditMode::Page)
                 mpPage = mpDocument->GetSdPage (
                     (sal_uInt16)nPageIndex,
                     maPosition.mePageKind);
@@ -713,7 +713,7 @@ DocumentIteratorImpl::DocumentIteratorImpl (
     : ViewIteratorImpl (nPageIndex, pDocument, rpViewShellWeak, bDirectionIsForward,
         ePageKind, eEditMode)
 {
-    if (eEditMode == EM_PAGE)
+    if (eEditMode == EditMode::Page)
         mnPageCount = pDocument->GetSdPageCount (ePageKind);
     else
         mnPageCount = pDocument->GetMasterSdPageCount(ePageKind);
@@ -745,9 +745,9 @@ void DocumentIteratorImpl::GotoNextText()
         if (maPosition.mnPageIndex >= mnPageCount)
         {
             // Switch to master page.
-            if (maPosition.meEditMode == EM_PAGE)
+            if (maPosition.meEditMode == EditMode::Page)
             {
-                maPosition.meEditMode = EM_MASTERPAGE;
+                maPosition.meEditMode = EditMode::MasterPage;
                 SetPage (0);
             }
 
@@ -759,7 +759,7 @@ void DocumentIteratorImpl::GotoNextText()
                     bSetToOnePastLastPage = true;
                 else
                 {
-                    maPosition.meEditMode = EM_PAGE;
+                    maPosition.meEditMode = EditMode::Page;
                     if (maPosition.mePageKind == PK_STANDARD)
                         maPosition.mePageKind = PK_NOTES;
                     else if (maPosition.mePageKind == PK_NOTES)
@@ -774,9 +774,9 @@ void DocumentIteratorImpl::GotoNextText()
         if (maPosition.mnPageIndex < 0)
         {
             // Switch from master pages to draw pages.
-            if (maPosition.meEditMode == EM_MASTERPAGE)
+            if (maPosition.meEditMode == EditMode::MasterPage)
             {
-                maPosition.meEditMode = EM_PAGE;
+                maPosition.meEditMode = EditMode::Page;
                 bSetToOnePastLastPage = true;
             }
 
@@ -787,7 +787,7 @@ void DocumentIteratorImpl::GotoNextText()
                     SetPage (-1);
                 else
                 {
-                    maPosition.meEditMode = EM_MASTERPAGE;
+                    maPosition.meEditMode = EditMode::MasterPage;
                     if (maPosition.mePageKind == PK_HANDOUT)
                         maPosition.mePageKind = PK_NOTES;
                     else if (maPosition.mePageKind == PK_NOTES)
@@ -802,7 +802,7 @@ void DocumentIteratorImpl::GotoNextText()
     {
         // Get new page count;
         sal_Int32 nPageCount;
-        if (maPosition.meEditMode == EM_PAGE)
+        if (maPosition.meEditMode == EditMode::Page)
             nPageCount = mpDocument->GetSdPageCount (maPosition.mePageKind);
         else
             nPageCount = mpDocument->GetMasterSdPageCount(maPosition.mePageKind);
diff --git a/sd/source/ui/view/ToolBarManager.cxx b/sd/source/ui/view/ToolBarManager.cxx
index a0b2e4370970..d97d91ad8408 100644
--- a/sd/source/ui/view/ToolBarManager.cxx
+++ b/sd/source/ui/view/ToolBarManager.cxx
@@ -1057,7 +1057,7 @@ void ToolBarRules::MainViewShellChanged (const ViewShell& rMainViewShell)
                 = dynamic_cast<const DrawViewShell*>(&rMainViewShell);
             if (pDrawViewShell != nullptr)
             {
-                if (pDrawViewShell->GetEditMode() == EM_MASTERPAGE)
+                if (pDrawViewShell->GetEditMode() == EditMode::MasterPage)
                     mpToolBarManager->AddToolBar(
                         ToolBarManager::TBG_MASTER_MODE,
                         ToolBarManager::msMasterViewToolBar);
diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx
index 9c48fcc8cef3..249d86d5c4a6 100644
--- a/sd/source/ui/view/ViewShellBase.cxx
+++ b/sd/source/ui/view/ViewShellBase.cxx
@@ -1336,11 +1336,11 @@ void ViewShellBase::Implementation::GetSlotState (SfxItemSet& rSet)
                         case SID_DRAWINGMODE:
                         case SID_NORMAL_MULTI_PANE_GUI:
                         case SID_NOTES_MODE:
-                            bState = pShell->GetEditMode() == EM_PAGE;
+                            bState = pShell->GetEditMode() == EditMode::Page;
                             break;
                         case SID_SLIDE_MASTER_MODE:
                         case SID_NOTES_MASTER_MODE:
-                            bState = pShell->GetEditMode() == EM_MASTERPAGE;
+                            bState = pShell->GetEditMode() == EditMode::MasterPage;
                             break;
                     }
                 }
@@ -1386,7 +1386,7 @@ void CurrentPageSetter::operator() (bool)
             // Get the current page either from the DrawPagesSupplier or the
             // MasterPagesSupplier.
             Any aPage;
-            if (pFrameView->GetViewShEditModeOnLoad() == EM_PAGE)
+            if (pFrameView->GetViewShEditModeOnLoad() == EditMode::Page)
             {
                 Reference<drawing::XDrawPagesSupplier> xPagesSupplier (
                     mrBase.GetController()->getModel(), UNO_QUERY_THROW);
diff --git a/sd/source/ui/view/drawview.cxx b/sd/source/ui/view/drawview.cxx
index f3da2e75ce24..e800f6957705 100644
--- a/sd/source/ui/view/drawview.cxx
+++ b/sd/source/ui/view/drawview.cxx
@@ -134,7 +134,7 @@ bool DrawView::SetAttributes(const SfxItemSet& rSet,
     bool bOk = false;
 
     // is there a masterpage edit?
-    if ( mpDrawViewShell && mpDrawViewShell->GetEditMode() == EM_MASTERPAGE )
+    if ( mpDrawViewShell && mpDrawViewShell->GetEditMode() == EditMode::MasterPage )
     {
         SfxStyleSheetBasePool* pStShPool = mrDoc.GetStyleSheetPool();
         SdPage& rPage = *mpDrawViewShell->getCurrentPage();
@@ -430,7 +430,7 @@ bool DrawView::SetStyleSheet(SfxStyleSheet* pStyleSheet, bool bDontRemoveHardAtt
     bool bResult = true;
 
     // is there a masterpage edit?
-    if (mpDrawViewShell && mpDrawViewShell->GetEditMode() == EM_MASTERPAGE)
+    if (mpDrawViewShell && mpDrawViewShell->GetEditMode() == EditMode::MasterPage)
     {
         if (IsPresObjSelected(false))
         {
diff --git a/sd/source/ui/view/drtxtob.cxx b/sd/source/ui/view/drtxtob.cxx
index 0a0de09320b3..ef1926241799 100644
--- a/sd/source/ui/view/drtxtob.cxx
+++ b/sd/source/ui/view/drtxtob.cxx
@@ -256,7 +256,7 @@ void TextObjectBar::GetAttrState( SfxItemSet& rSet )
 
                 //fdo#78151 it doesn't make sense to promote or demote outline levels in master view.
                 const DrawViewShell* pDrawViewShell = dynamic_cast< DrawViewShell* >(mpViewShell);
-                const bool bInMasterView = pDrawViewShell && pDrawViewShell->GetEditMode() == EM_MASTERPAGE;
+                const bool bInMasterView = pDrawViewShell && pDrawViewShell->GetEditMode() == EditMode::MasterPage;
 
                 if (!bInMasterView)
                 {
diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx
index dfe0bdf3db0c..9d46be077b86 100644
--- a/sd/source/ui/view/drviews1.cxx
+++ b/sd/source/ui/view/drviews1.cxx
@@ -330,7 +330,7 @@ void DrawViewShell::ChangeEditMode(EditMode eEMode, bool bIsLayerModeActive)
 
         sal_uInt16 nActualPageNum = 0;
 
-        GetViewShellBase().GetDrawController().FireChangeEditMode (eEMode == EM_MASTERPAGE);
+        GetViewShellBase().GetDrawController().FireChangeEditMode (eEMode == EditMode::MasterPage);
         GetViewShellBase().GetDrawController().FireChangeLayerMode (bIsLayerModeActive);
 
         if ( mpDrawView->IsTextEdit() )
@@ -346,7 +346,7 @@ void DrawViewShell::ChangeEditMode(EditMode eEMode, bool bIsLayerModeActive)
         if (mePageKind == PK_HANDOUT)
         {
             // at handouts only allow MasterPage
-            eEMode = EM_MASTERPAGE;
+            eEMode = EditMode::MasterPage;
         }
 
         GetViewShellBase().GetDrawController().BroadcastContextChange();
@@ -363,9 +363,9 @@ void DrawViewShell::ChangeEditMode(EditMode eEMode, bool bIsLayerModeActive)
         // Determine whether to show the master view toolbar.  The master
         // page mode has to be active and the shell must not be a handout
         // view.
-        bool bShowMasterViewToolbar (meEditMode == EM_MASTERPAGE
+        bool bShowMasterViewToolbar (meEditMode == EditMode::MasterPage
              && GetShellType() != ViewShell::ST_HANDOUT);
-        bool bShowPresentationToolbar (meEditMode != EM_MASTERPAGE
+        bool bShowPresentationToolbar (meEditMode != EditMode::MasterPage
              && GetShellType() != ViewShell::ST_HANDOUT
              && GetShellType() != ViewShell::ST_DRAW);
 
@@ -385,7 +385,7 @@ void DrawViewShell::ChangeEditMode(EditMode eEMode, bool bIsLayerModeActive)
         if (comphelper::LibreOfficeKit::isActive())
             aFillColor = COL_TRANSPARENT;
 
-        if (meEditMode == EM_PAGE)
+        if (meEditMode == EditMode::Page)
         {
             /******************************************************************
             * PAGEMODE
@@ -484,7 +484,7 @@ void DrawViewShell::ChangeEditMode(EditMode eEMode, bool bIsLayerModeActive)
             maTabControl->Show();
             // Set the tab control only for draw pages.  For master page
             // this has been done already above.
-            if (meEditMode == EM_PAGE)
+            if (meEditMode == EditMode::Page)
                 maTabControl->SetCurPageId (nActualPageNum + 1);
         }
 
@@ -629,7 +629,7 @@ IMPL_LINK( DrawViewShell, TabSplitHdl, TabBar *, pTab, void )
 /// inherited from sd::ViewShell
 SdPage* DrawViewShell::getCurrentPage() const
 {
-    const sal_Int32 nPageCount = (meEditMode == EM_PAGE)?
+    const sal_Int32 nPageCount = (meEditMode == EditMode::Page)?
                                     GetDoc()->GetSdPageCount(mePageKind):
                                     GetDoc()->GetMasterSdPageCount(mePageKind);
 
@@ -638,11 +638,11 @@ SdPage* DrawViewShell::getCurrentPage() const
     if( (nPageCount < 0) || (nCurrentPage>=nPageCount) )
         nCurrentPage = 0; // play safe here
 
-    if (meEditMode == EM_PAGE)
+    if (meEditMode == EditMode::Page)
     {
         return GetDoc()->GetSdPage((sal_uInt16)nCurrentPage, mePageKind);
     }
-    else // EM_MASTERPAGE
+    else // EditMode::MasterPage
     {
         return GetDoc()->GetMasterSdPage((sal_uInt16)nCurrentPage, mePageKind);
     }
@@ -658,13 +658,13 @@ void DrawViewShell::ResetActualPage()
         return;
 
     sal_uInt16 nCurrentPage = maTabControl->GetCurPageId() - 1;
-    sal_uInt16 nPageCount   = (meEditMode == EM_PAGE)?GetDoc()->GetSdPageCount(mePageKind):GetDoc()->GetMasterSdPageCount(mePageKind);
+    sal_uInt16 nPageCount   = (meEditMode == EditMode::Page)?GetDoc()->GetSdPageCount(mePageKind):GetDoc()->GetMasterSdPageCount(mePageKind);
     if (nPageCount > 0)
         nCurrentPage = std::min((sal_uInt16)(nPageCount - 1), nCurrentPage);
     else
         nCurrentPage = 0;
 
-    if (meEditMode == EM_PAGE)
+    if (meEditMode == EditMode::Page)
     {
 
         // Update for TabControl
@@ -684,7 +684,7 @@ void DrawViewShell::ResetActualPage()
 
         maTabControl->SetCurPageId(nCurrentPage + 1);
     }
-    else // EM_MASTERPAGE
+    else // EditMode::MasterPage
     {
         SdPage* pActualPage = GetDoc()->GetMasterSdPage(nCurrentPage, mePageKind);
         maTabControl->Clear();
@@ -808,7 +808,7 @@ bool DrawViewShell::SwitchPage(sal_uInt16 nSelectedPage)
     {
         // Make sure that the given page index points to an existing page.  Move
         // the index into the valid range if necessary.
-        sal_uInt16 nPageCount = (meEditMode == EM_PAGE)
+        sal_uInt16 nPageCount = (meEditMode == EditMode::Page)
             ? GetDoc()->GetSdPageCount(mePageKind)
             : GetDoc()->GetMasterSdPageCount(mePageKind);
         if (nSelectedPage >= nPageCount)
@@ -825,7 +825,7 @@ bool DrawViewShell::SwitchPage(sal_uInt16 nSelectedPage)
         {
             SdPage* pNewPage = nullptr;
 
-            if (meEditMode == EM_MASTERPAGE)
+            if (meEditMode == EditMode::MasterPage)
             {
                 if( GetDoc()->GetMasterSdPageCount(mePageKind) > nSelectedPage )
                     pNewPage = GetDoc()->GetMasterSdPage(nSelectedPage, mePageKind);
@@ -874,7 +874,7 @@ bool DrawViewShell::SwitchPage(sal_uInt16 nSelectedPage)
 
         mpActualPage = nullptr;
 
-        if (meEditMode == EM_PAGE)
+        if (meEditMode == EditMode::Page)
         {
             mpActualPage = GetDoc()->GetSdPage(nSelectedPage, mePageKind);
         }
@@ -943,7 +943,7 @@ bool DrawViewShell::SwitchPage(sal_uInt16 nSelectedPage)
             VisAreaChanged(Rectangle(Point(), Size(1, 1)));
         }
 
-        if (meEditMode == EM_PAGE)
+        if (meEditMode == EditMode::Page)
         {
             /**********************************************************************
             * PAGEMODE
@@ -1175,7 +1175,7 @@ void DrawViewShell::ResetActualLayer()
 
             if ( aName != aBackgroundLayer )
             {
-                if (meEditMode == EM_MASTERPAGE)
+                if (meEditMode == EditMode::MasterPage)
                 {
                     // don't show page layer onto the masterpage
                     if (aName != aLayoutLayer   &&
@@ -1225,7 +1225,7 @@ void DrawViewShell::ResetActualLayer()
             }
             else
             {
-                nActiveLayer = ( meEditMode == EM_MASTERPAGE ) ? 2 : 0;
+                nActiveLayer = ( meEditMode == EditMode::MasterPage ) ? 2 : 0;
             }
 
             mpDrawView->SetActiveLayer( pLayerBar->GetPageText(nActiveLayer + 1) );
diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx
index db8d511c6ca3..60cd53336786 100644
--- a/sd/source/ui/view/drviews2.cxx
+++ b/sd/source/ui/view/drviews2.cxx
@@ -377,7 +377,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
         case SID_MODIFYPAGE:
         {
             if (mePageKind==PK_STANDARD || mePageKind==PK_NOTES ||
-                (mePageKind==PK_HANDOUT && meEditMode==EM_MASTERPAGE) )
+                (mePageKind==PK_HANDOUT && meEditMode==EditMode::MasterPage) )
             {
                 if ( mpDrawView->IsTextEdit() )
                 {
@@ -398,7 +398,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
 
         case SID_ASSIGN_LAYOUT:
         {
-            if (mePageKind==PK_STANDARD || mePageKind==PK_NOTES || (mePageKind==PK_HANDOUT && meEditMode==EM_MASTERPAGE))
+            if (mePageKind==PK_STANDARD || mePageKind==PK_NOTES || (mePageKind==PK_HANDOUT && meEditMode==EditMode::MasterPage))
             {
                 if ( mpDrawView->IsTextEdit() )
                     mpDrawView->SdrEndTextEdit();
@@ -421,7 +421,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
                 }
 
                 sal_uInt16 nPageId = maTabControl->GetCurPageId();
-                SdPage* pCurrentPage = ( GetEditMode() == EM_PAGE )
+                SdPage* pCurrentPage = ( GetEditMode() == EditMode::Page )
                     ? GetDoc()->GetSdPage( nPageId - 1, GetPageKind() )
                     : GetDoc()->GetMasterSdPage( nPageId - 1, GetPageKind() );
 
@@ -3091,7 +3091,7 @@ SdPage* DrawViewShell::CreateOrDuplicatePage (
     const sal_Int32 nInsertPosition)
 {
     SdPage* pNewPage = nullptr;
-    if (ePageKind == PK_STANDARD && meEditMode != EM_MASTERPAGE)
+    if (ePageKind == PK_STANDARD && meEditMode != EditMode::MasterPage)
     {
         if ( mpDrawView->IsTextEdit() )
         {
diff --git a/sd/source/ui/view/drviews3.cxx b/sd/source/ui/view/drviews3.cxx
index b7f41789b848..b42489f3af40 100644
--- a/sd/source/ui/view/drviews3.cxx
+++ b/sd/source/ui/view/drviews3.cxx
@@ -159,7 +159,7 @@ void  DrawViewShell::ExecCtrl(SfxRequest& rReq)
                         rReq.Ignore ();
                         break;
                     }
-                    else if (meEditMode != EM_MASTERPAGE)
+                    else if (meEditMode != EditMode::MasterPage)
                     {
                         if (! CHECK_RANGE (0, nWhatPage, GetDoc()->GetSdPageCount((PageKind)nWhatKind)))
                         {
@@ -255,7 +255,7 @@ void  DrawViewShell::ExecCtrl(SfxRequest& rReq)
             // turn on default layer of page
             mpDrawView->SetActiveLayer(SD_RESSTR(STR_LAYER_LAYOUT));
 
-            ChangeEditMode(EM_PAGE, mbIsLayerModeActive);
+            ChangeEditMode(EditMode::Page, mbIsLayerModeActive);
 
             Invalidate();
             rReq.Done ();
@@ -265,25 +265,23 @@ void  DrawViewShell::ExecCtrl(SfxRequest& rReq)
 
         case SID_LAYERMODE:  // BASIC
         {
-            const SfxItemSet *pArgs = rReq.GetArgs ();
+            const SfxItemSet *pArgs = rReq.GetArgs();
 
-            if ( pArgs && pArgs->Count () == 2)
+            if (pArgs && pArgs->Count() == 2)
             {
-                const SfxBoolItem* pWhatLayerMode = rReq.GetArg<SfxBoolItem>(ID_VAL_ISACTIVE);
                 const SfxUInt32Item* pWhatLayer = rReq.GetArg<SfxUInt32Item>(ID_VAL_WHATLAYER);
-
-                sal_Int32 nWhatLayer = (sal_Int32)pWhatLayer->GetValue ();
-                if (CHECK_RANGE (EM_PAGE, nWhatLayer, EM_MASTERPAGE))
+                EditMode nWhatLayer = (EditMode)pWhatLayer->GetValue();
+                if (nWhatLayer == EditMode::Page || nWhatLayer == EditMode::MasterPage)
                 {
-                    mbIsLayerModeActive = pWhatLayerMode->GetValue ();
-                    meEditMode = (EditMode) nWhatLayer;
+                    mbIsLayerModeActive = rReq.GetArg<SfxBoolItem>(ID_VAL_ISACTIVE)->GetValue();
+                    meEditMode = nWhatLayer;
                 }
             }
 
             ChangeEditMode(meEditMode, !mbIsLayerModeActive);
 
             Invalidate();
-            rReq.Done ();
+            rReq.Done();
 
             break;
         }
@@ -312,7 +310,7 @@ void  DrawViewShell::ExecCtrl(SfxRequest& rReq)
         case SID_MASTER_LAYOUTS:
         {
             SdPage* pPage = GetActualPage();
-            if (meEditMode == EM_MASTERPAGE)
+            if (meEditMode == EditMode::MasterPage)
                 // Use the master page of the current page.
                 pPage = static_cast<SdPage*>(&pPage->TRG_GetMasterPage());
 
diff --git a/sd/source/ui/view/drviews7.cxx b/sd/source/ui/view/drviews7.cxx
index be17178b3b43..c9ef3b687479 100644
--- a/sd/source/ui/view/drviews7.cxx
+++ b/sd/source/ui/view/drviews7.cxx
@@ -692,7 +692,7 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet )
         rSet.DisableItem(SID_ANIMATION_OBJECTS);
         rSet.DisableItem(SID_ANIMATION_EFFECTS);
 
-        if (meEditMode == EM_MASTERPAGE)
+        if (meEditMode == EditMode::MasterPage)
             rSet.DisableItem(SID_MODIFYPAGE);
 
         rSet.DisableItem(SID_SELECT_BACKGROUND);
@@ -721,7 +721,7 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet )
     }
     else
     {
-        if (meEditMode == EM_MASTERPAGE)
+        if (meEditMode == EditMode::MasterPage)
         {
             rSet.DisableItem(SID_INSERTPAGE);
             rSet.DisableItem(SID_DUPLICATE_PAGE);
@@ -741,7 +741,7 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet )
         rSet.DisableItem( SID_RENAMELAYER );
     }
 
-    if (meEditMode == EM_PAGE)
+    if (meEditMode == EditMode::Page)
     {
         /**********************************************************************
         * page mode
@@ -795,7 +795,7 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet )
         || SfxItemState::DEFAULT == rSet.GetItemState( SID_DELETE_MASTER_PAGE ) )
     {
         if (maTabControl->GetPageCount() == 1 ||
-            meEditMode == EM_MASTERPAGE     ||
+            meEditMode == EditMode::MasterPage     ||
             mePageKind == PK_NOTES          ||
             mePageKind == PK_HANDOUT        ||
             (GetShellType()!=ST_DRAW&&IsLayerModeActive()))
@@ -1545,7 +1545,7 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet )
         {
             SfxItemSet aMergedAttr(GetDoc()->GetPool(), XATTR_FILL_FIRST, XATTR_FILL_LAST, 0);
             SdStyleSheet* pStyleSheet = pPage->getPresentationStyle(HID_PSEUDOSHEET_BACKGROUND);
-            MergePageBackgroundFilling(pPage, pStyleSheet, meEditMode == EM_MASTERPAGE, aMergedAttr);
+            MergePageBackgroundFilling(pPage, pStyleSheet, meEditMode == EditMode::MasterPage, aMergedAttr);
             if (drawing::FillStyle_BITMAP == static_cast<const XFillStyleItem&>(aMergedAttr.Get(XATTR_FILLSTYLE)).GetValue())
             {
                 bDisableSaveBackground = false;
diff --git a/sd/source/ui/view/drviewsa.cxx b/sd/source/ui/view/drviewsa.cxx
index 3ce557923a26..ab80ea2adbbb 100644
--- a/sd/source/ui/view/drviewsa.cxx
+++ b/sd/source/ui/view/drviewsa.cxx
@@ -226,7 +226,7 @@ void DrawViewShell::Construct(DrawDocShell* pDocSh, PageKind eInitialPageKind)
     // to set it in order to resync frame view and this view.
     mpFrameView->SetPageKind(eInitialPageKind);
     mePageKind = eInitialPageKind;
-    meEditMode = EM_PAGE;
+    meEditMode = EditMode::Page;
     DocumentType eDocType = GetDoc()->GetDocumentType(); // RTTI does not work here
     switch (mePageKind)
     {
@@ -265,13 +265,13 @@ void DrawViewShell::Construct(DrawDocShell* pDocSh, PageKind eInitialPageKind)
 
     /* In order to set the correct EditMode of the FrameView, we select another
        one (small trick).  */
-    if (mpFrameView->GetViewShEditMode(/*mePageKind*/) == EM_PAGE)
+    if (mpFrameView->GetViewShEditMode(/*mePageKind*/) == EditMode::Page)
     {
-        meEditMode = EM_MASTERPAGE;
+        meEditMode = EditMode::MasterPage;
     }
     else
     {
-        meEditMode = EM_PAGE;
+        meEditMode = EditMode::Page;
     }
 
     // Use configuration of FrameView
@@ -775,7 +775,7 @@ void DrawViewShell::GetAnnotationState (SfxItemSet& rItemSet )
             eViewType = svx::sidebar::SelectionAnalyzer::ViewType::Notes;
             break;
         case PK_STANDARD:
-            if (meEditMode == EM_MASTERPAGE)
+            if (meEditMode == EditMode::MasterPage)
                 eViewType = svx::sidebar::SelectionAnalyzer::ViewType::Master;
             else
                 eViewType = svx::sidebar::SelectionAnalyzer::ViewType::Standard;
diff --git a/sd/source/ui/view/drviewsb.cxx b/sd/source/ui/view/drviewsb.cxx
index 0c4c7f05d05a..75406a095927 100644
--- a/sd/source/ui/view/drviewsb.cxx
+++ b/sd/source/ui/view/drviewsb.cxx
@@ -74,7 +74,7 @@ bool DrawViewShell::RenameSlide( sal_uInt16 nPageId, const OUString & rName  )
     SdPage* pPageToRename = nullptr;
     PageKind ePageKind = GetPageKind();
 
-    if( GetEditMode() == EM_PAGE )
+    if( GetEditMode() == EditMode::Page )
     {
         pPageToRename = GetDoc()->GetSdPage( nPageId - 1, ePageKind );
 
diff --git a/sd/source/ui/view/drviewse.cxx b/sd/source/ui/view/drviewse.cxx
index 6204e6edc4c0..5199a7188286 100644
--- a/sd/source/ui/view/drviewse.cxx
+++ b/sd/source/ui/view/drviewse.cxx
@@ -1002,7 +1002,7 @@ void DrawViewShell::FuSupport(SfxRequest& rReq)
             // turn on default layer of MasterPage
             mpDrawView->SetActiveLayer( SD_RESSTR(STR_LAYER_BCKGRNDOBJ) );
 
-            ChangeEditMode(EM_MASTERPAGE, mbIsLayerModeActive);
+            ChangeEditMode(EditMode::MasterPage, mbIsLayerModeActive);
 
             if(HasCurrentFunction(SID_BEZIER_EDIT))
                 GetViewFrame()->GetDispatcher()->Execute(SID_OBJECT_SELECT, SfxCallMode::ASYNCHRON);
@@ -1026,7 +1026,7 @@ void DrawViewShell::FuSupport(SfxRequest& rReq)
             // crash.  This seems to be some bug in the edit mode switching
             // and page switching methods.
             SwitchPage (0);
-            ChangeEditMode(EM_PAGE, IsLayerModeActive());
+            ChangeEditMode(EditMode::Page, IsLayerModeActive());
             Broadcast (
                 ViewShellHint(ViewShellHint::HINT_CHANGE_EDIT_MODE_END));
 
diff --git a/sd/source/ui/view/frmview.cxx b/sd/source/ui/view/frmview.cxx
index 52cfe4f277f7..7d9a63962a95 100644
--- a/sd/source/ui/view/frmview.cxx
+++ b/sd/source/ui/view/frmview.cxx
@@ -210,11 +210,11 @@ FrameView::FrameView(SdDrawDocument* pDrawDoc, FrameView* pFrameView /* = NULK *
         mePageKindOnLoad = PK_STANDARD;
         mnSelectedPage = 0;
         mnSelectedPageOnLoad = 0;
-        meEditMode = EM_PAGE;
-        // meStandardEditMode = EM_PAGE;
-        // meNotesEditMode = EM_PAGE;
-        // meHandoutEditMode = EM_MASTERPAGE;
-        SetViewShEditModeOnLoad(EM_PAGE);
+        meEditMode = EditMode::Page;
+        // meStandardEditMode = EditMode::Page;
+        // meNotesEditMode = EditMode::Page;
+        // meHandoutEditMode = EditMode::MasterPage;
+        SetViewShEditModeOnLoad(EditMode::Page);
         mbLayerMode = false;
         SetEliminatePolyPoints(false);
         mbDoubleClickTextEdit = false;
@@ -877,7 +877,7 @@ void FrameView::ReadUserDataSequence ( const css::uno::Sequence < css::beans::Pr
             }
         }
 
-        SetViewShEditModeOnLoad(EM_PAGE);
+        SetViewShEditModeOnLoad(EditMode::Page);
 
         const Fraction aSnapGridWidthX( aSnapGridWidthXNum, aSnapGridWidthXDom );
         const Fraction aSnapGridWidthY( aSnapGridWidthYNum, aSnapGridWidthYDom );
diff --git a/sd/source/ui/view/tabcontr.cxx b/sd/source/ui/view/tabcontr.cxx
index 34627e7faf92..308143eccd7a 100644
--- a/sd/source/ui/view/tabcontr.cxx
+++ b/sd/source/ui/view/tabcontr.cxx
@@ -182,7 +182,7 @@ sal_Int8 TabControl::AcceptDrop( const AcceptDropEvent& rEvt )
 
         if( bInternalMove )
         {
-            if( rEvt.mbLeaving || ( pDrViewSh->GetEditMode() == EM_MASTERPAGE ) )
+            if( rEvt.mbLeaving || ( pDrViewSh->GetEditMode() == EditMode::MasterPage ) )
                 HideDropPos();
             else
             {