convert SdrViewContext to scoped enum

Change-Id: Ic41d522cdb7f80614bd5f269fe1d63f022d8dd84

6 files changed, 23 insertions, 21 deletions

diff --git a/include/svx/svdview.hxx b/include/svx/svdview.hxx
index 10f4e689cdfe..4ae82e72df25 100644
--- a/include/svx/svdview.hxx
+++ b/include/svx/svdview.hxx
@@ -51,12 +51,14 @@
 
 class SvxURLField;
 
-enum SdrViewContext {SDRCONTEXT_STANDARD,
-                     SDRCONTEXT_POINTEDIT,
-                     SDRCONTEXT_GLUEPOINTEDIT,
-                     SDRCONTEXT_GRAPHIC,
-                     SDRCONTEXT_MEDIA,
-                     SDRCONTEXT_TABLE};
+enum class SdrViewContext {
+    Standard,
+    PointEdit,
+    GluePointEdit,
+    Graphic,
+    Media,
+    Table
+};
 
 enum class SdrEventKind {
     NONE,
diff --git a/sd/source/ui/animations/motionpathtag.cxx b/sd/source/ui/animations/motionpathtag.cxx
index 7ba090ed5365..37e6f74b9a52 100644
--- a/sd/source/ui/animations/motionpathtag.cxx
+++ b/sd/source/ui/animations/motionpathtag.cxx
@@ -839,7 +839,7 @@ bool MotionPathTag::getContext( SdrViewContext& rContext )
 {
     if( mpPathObj && isSelected() && !mrView.IsFrameDragSingles() )
     {
-        rContext = SDRCONTEXT_POINTEDIT;
+        rContext = SdrViewContext::PointEdit;
         return true;
     }
     else
diff --git a/sd/source/ui/view/ToolBarManager.cxx b/sd/source/ui/view/ToolBarManager.cxx
index 1e8a91cdeb36..1b05892fb2f6 100644
--- a/sd/source/ui/view/ToolBarManager.cxx
+++ b/sd/source/ui/view/ToolBarManager.cxx
@@ -1086,22 +1086,22 @@ void ToolBarRules::SelectionHasChanged (
 
     switch (rView.GetContext())
     {
-        case SDRCONTEXT_GRAPHIC:
+        case SdrViewContext::Graphic:
             if( !bTextEdit )
                 mpToolBarManager->SetToolBarShell(ToolBarManager::TBG_FUNCTION, RID_DRAW_GRAF_TOOLBOX);
             break;
 
-        case SDRCONTEXT_MEDIA:
+        case SdrViewContext::Media:
             if( !bTextEdit )
                 mpToolBarManager->SetToolBarShell(ToolBarManager::TBG_FUNCTION, RID_DRAW_MEDIA_TOOLBOX);
             break;
 
-        case SDRCONTEXT_TABLE:
+        case SdrViewContext::Table:
             mpToolBarManager->SetToolBarShell(ToolBarManager::TBG_FUNCTION, RID_DRAW_TABLE_TOOLBOX);
             bTextEdit = true;
             break;
 
-        case SDRCONTEXT_STANDARD:
+        case SdrViewContext::Standard:
         default:
             if( !bTextEdit )
             {
@@ -1135,7 +1135,7 @@ void ToolBarRules::SelectionHasChanged (
         mpToolBarManager->AddToolBarShell(ToolBarManager::TBG_FUNCTION, RID_SVX_FONTWORK_BAR);
 
     // Switch on additional context-sensitive tool bars.
-    if (rView.GetContext() == SDRCONTEXT_POINTEDIT)
+    if (rView.GetContext() == SdrViewContext::PointEdit)
         mpToolBarManager->AddToolBarShell(ToolBarManager::TBG_FUNCTION, RID_BEZIER_TOOLBOX);
 }
 
diff --git a/sd/source/ui/view/sdview.cxx b/sd/source/ui/view/sdview.cxx
index ddaf809ca7f8..80cb4f18baf7 100644
--- a/sd/source/ui/view/sdview.cxx
+++ b/sd/source/ui/view/sdview.cxx
@@ -1137,7 +1137,7 @@ void View::updateHandles()
 
 SdrViewContext View::GetContext() const
 {
-    SdrViewContext eContext = SDRCONTEXT_STANDARD;
+    SdrViewContext eContext = SdrViewContext::Standard;
     if( maSmartTags.getContext( eContext ) )
         return eContext;
     else
diff --git a/svx/source/svdraw/svdview.cxx b/svx/source/svdraw/svdview.cxx
index 74a95487549c..d6f583cf38e2 100644
--- a/svx/source/svdraw/svdview.cxx
+++ b/svx/source/svdraw/svdview.cxx
@@ -1296,7 +1296,7 @@ OUString SdrView::GetStatusText()
 SdrViewContext SdrView::GetContext() const
 {
     if( IsGluePointEditMode() )
-        return SDRCONTEXT_GLUEPOINTEDIT;
+        return SdrViewContext::GluePointEdit;
 
     const size_t nMarkCount = GetMarkedObjectCount();
 
@@ -1308,7 +1308,7 @@ SdrViewContext SdrView::GetContext() const
                 bPath=false;
 
         if( bPath )
-            return SDRCONTEXT_POINTEDIT;
+            return SdrViewContext::PointEdit;
     }
 
     if( GetMarkedObjectCount() )
@@ -1334,14 +1334,14 @@ SdrViewContext SdrView::GetContext() const
         }
 
         if( bGraf )
-            return SDRCONTEXT_GRAPHIC;
+            return SdrViewContext::Graphic;
         else if( bMedia )
-            return SDRCONTEXT_MEDIA;
+            return SdrViewContext::Media;
         else if( bTable )
-            return SDRCONTEXT_TABLE;
+            return SdrViewContext::Table;
     }
 
-    return SDRCONTEXT_STANDARD;
+    return SdrViewContext::Standard;
 }
 
 void SdrView::MarkAll()
@@ -1398,7 +1398,7 @@ void SdrView::DeleteMarked()
         {
             DeleteMarkedGluePoints();
         }
-        else if (GetContext()==SDRCONTEXT_POINTEDIT && HasMarkedPoints())
+        else if (GetContext()==SdrViewContext::PointEdit && HasMarkedPoints())
         {
             DeleteMarkedPoints();
         }
diff --git a/sw/source/uibase/wrtsh/wrtsh1.cxx b/sw/source/uibase/wrtsh/wrtsh1.cxx
index 3bf746294f72..c096eec78fdc 100644
--- a/sw/source/uibase/wrtsh/wrtsh1.cxx
+++ b/sw/source/uibase/wrtsh/wrtsh1.cxx
@@ -1381,7 +1381,7 @@ SelectionType SwWrtShell::GetSelectionType() const
 
             if (_rView.IsBezierEditMode())
                 nCnt |= nsSelectionType::SEL_BEZ;
-            else if( GetDrawView()->GetContext() == SDRCONTEXT_MEDIA )
+            else if( GetDrawView()->GetContext() == SdrViewContext::Media )
                 nCnt |= nsSelectionType::SEL_MEDIA;
 
             if (svx::checkForSelectedCustomShapes(