convert ToolBarGroup to scoped enum

Change-Id: I5d22dacca911211b1ebe20d86eb332db9de0cdba

sd/source/ui/func/fucon3d.cxx

@@ -76,7 +76,7 @@ void FuConstruct3dObject::DoExecute( SfxRequest& rReq )
 {
     FuConstruct::DoExecute( rReq );
     mpViewShell->GetViewShellBase().GetToolBarManager()->SetToolBar(
-        ToolBarManager::TBG_FUNCTION,
+        ToolBarManager::ToolBarGroup::Function,
         ToolBarManager::msDrawingObjectToolBar);
 }
 

sd/source/ui/func/fuconarc.cxx

@@ -70,7 +70,7 @@ void FuConstructArc::DoExecute( SfxRequest& rReq )
     FuConstruct::DoExecute( rReq );
 
     mpViewShell->GetViewShellBase().GetToolBarManager()->SetToolBar(
-        ToolBarManager::TBG_FUNCTION,
+        ToolBarManager::ToolBarGroup::Function,
         ToolBarManager::msDrawingObjectToolBar);
 
     const SfxItemSet *pArgs = rReq.GetArgs ();

sd/source/ui/func/fuconcs.cxx

@@ -99,7 +99,7 @@ void FuConstructCustomShape::DoExecute( SfxRequest& rReq )
     }
 
     mpViewShell->GetViewShellBase().GetToolBarManager()->SetToolBar(
-        ToolBarManager::TBG_FUNCTION,
+        ToolBarManager::ToolBarGroup::Function,
         ToolBarManager::msDrawingObjectToolBar);
 }
 

sd/source/ui/func/fuconrec.cxx

@@ -89,7 +89,7 @@ void FuConstructRectangle::DoExecute( SfxRequest& rReq )
     FuConstruct::DoExecute( rReq );
 
     mpViewShell->GetViewShellBase().GetToolBarManager()->SetToolBar(
-        ToolBarManager::TBG_FUNCTION,
+        ToolBarManager::ToolBarGroup::Function,
         ToolBarManager::msDrawingObjectToolBar);
 
     const SfxItemSet *pArgs = rReq.GetArgs ();

sd/source/ui/func/fuconuno.cxx

@@ -75,7 +75,7 @@ void FuConstructUnoControl::DoExecute( SfxRequest& rReq )
         nIdentifier = pIdentifierItem->GetValue();
 
     mpViewShell->GetViewShellBase().GetToolBarManager()->SetToolBar(
-        ToolBarManager::TBG_FUNCTION,
+        ToolBarManager::ToolBarGroup::Function,
         ToolBarManager::msDrawingObjectToolBar);
 }
 

sd/source/ui/func/fuediglu.cxx

@@ -65,7 +65,7 @@ void FuEditGluePoints::DoExecute( SfxRequest& rReq )
     FuDraw::DoExecute( rReq );
     mpView->SetInsGluePointMode(false);
     mpViewShell->GetViewShellBase().GetToolBarManager()->AddToolBar(
-        ToolBarManager::TBG_FUNCTION,
+        ToolBarManager::ToolBarGroup::Function,
         ToolBarManager::msGluePointsToolBar);
 }
 

sd/source/ui/func/futext.cxx

@@ -186,7 +186,7 @@ void FuText::disposing()
 void FuText::DoExecute( SfxRequest& )
 {
     mpViewShell->GetViewShellBase().GetToolBarManager()->SetToolBarShell(
-        ToolBarManager::TBG_FUNCTION,
+        ToolBarManager::ToolBarGroup::Function,
         RID_DRAW_TEXT_TOOLBOX);
 
     mpView->SetCurrentObj(OBJ_TEXT);
@@ -225,7 +225,7 @@ void FuText::DoExecute( SfxRequest& )
             SdrObject* pObj = rMarkList.GetMark(0)->GetMarkedSdrObj();
             if( pObj && (pObj->GetObjInventor() == SdrInventor::Default ) && (pObj->GetObjIdentifier() == OBJ_TABLE) )
             {
-                mpViewShell->GetViewShellBase().GetToolBarManager()->AddToolBarShell( ToolBarManager::TBG_FUNCTION, RID_DRAW_TABLE_TOOLBOX );
+                mpViewShell->GetViewShellBase().GetToolBarManager()->AddToolBarShell( ToolBarManager::ToolBarGroup::Function, RID_DRAW_TABLE_TOOLBOX );
             }
         }
     }

sd/source/ui/inc/ToolBarManager.hxx

@@ -93,7 +93,7 @@ public:
     void MainViewShellChanged (const ViewShell& rMainViewShell);
 
     /** Call this method when the selection has changed to update the more
-        temporary tool bars (those in the TBG_FUNCTION group.)
+        temporary tool bars (those in the ToolBarGroup::Function group.)
     */
     void SelectionHasChanged (
         const ViewShell& rViewShell,
@@ -119,15 +119,12 @@ public:
 
     /** The set of tool bar groups.
     */
-    enum ToolBarGroup {
-        TBG_FIRST,
-
-        TBG_PERMANENT = TBG_FIRST,
-        TBG_FUNCTION,
-        TBG_COMMON_TASK,
-        TBG_MASTER_MODE,
-
-        TBG_LAST = TBG_MASTER_MODE
+    enum class ToolBarGroup {
+        Permanent,
+        Function,
+        CommonTask,
+        MasterMode,
+        LAST = MasterMode
     };
 
     /** Reset the set of visible object bars in the specified group.  Tool

sd/source/ui/view/ToolBarManager.cxx

@@ -28,6 +28,7 @@
 #include <com/sun/star/ui/UIElementType.hpp>
 
 #include <osl/mutex.hxx>
+#include <o3tl/enumrange.hxx>
 #include <rtl/ref.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/docfile.hxx>
@@ -193,16 +194,16 @@ public:
     void Update (ViewShellBase& rBase);
 
     /** Reset all tool bars in all groups and add tool bars and tool bar
-        shells to the TBG_PERMANENT group for the specified ViewShell type.
+        shells to the ToolBarGroup::Permanent group for the specified ViewShell type.
     */
     void MainViewShellChanged (ViewShell::ShellType nShellType);
 
     /** Reset all tool bars in all groups and add tool bars and tool bar
-        shells to the TBG_PERMANENT group for the specified ViewShell.
+        shells to the ToolBarGroup::Permanent group for the specified ViewShell.
     */
     void MainViewShellChanged (const ViewShell& rMainViewShell);
 
-    /** Reset all tool bars in the TBG_FUNCTION group and add tool bars and tool bar
+    /** Reset all tool bars in the ToolBarGroup::Function group and add tool bars and tool bar
         shells to this group for the current selection.
     */
     void SelectionHasChanged (
@@ -604,8 +605,8 @@ void ToolBarManager::Implementation::ResetToolBars (ToolBarGroup eGroup)
 void ToolBarManager::Implementation::ResetAllToolBars()
 {
     SAL_INFO("sd.view", OSL_THIS_FUNC << ": resetting all tool bars");
-    for (int i=TBG_FIRST; i<=TBG_LAST; ++i)
-        ResetToolBars((ToolBarGroup)i);
+    for (auto i : o3tl::enumrange<ToolBarGroup>())
+        ResetToolBars(i);
 }
 
 void ToolBarManager::Implementation::AddToolBar (
@@ -980,48 +981,48 @@ void ToolBarRules::MainViewShellChanged (ViewShell::ShellType nShellType)
         case ::sd::ViewShell::ST_NOTES:
         case ::sd::ViewShell::ST_HANDOUT:
             mpToolBarManager->AddToolBar(
-                ToolBarManager::TBG_PERMANENT,
+                ToolBarManager::ToolBarGroup::Permanent,
                 ToolBarManager::msToolBar);
             mpToolBarManager->AddToolBar(
-                ToolBarManager::TBG_PERMANENT,
+                ToolBarManager::ToolBarGroup::Permanent,
                 ToolBarManager::msOptionsToolBar);
             mpToolBarManager->AddToolBar(
-                ToolBarManager::TBG_PERMANENT,
+                ToolBarManager::ToolBarGroup::Permanent,
                 ToolBarManager::msViewerToolBar);
             break;
 
         case ::sd::ViewShell::ST_DRAW:
             mpToolBarManager->AddToolBar(
-                ToolBarManager::TBG_PERMANENT,
+                ToolBarManager::ToolBarGroup::Permanent,
                 ToolBarManager::msToolBar);
             mpToolBarManager->AddToolBar(
-                ToolBarManager::TBG_PERMANENT,
+                ToolBarManager::ToolBarGroup::Permanent,
                 ToolBarManager::msOptionsToolBar);
             mpToolBarManager->AddToolBar(
-                ToolBarManager::TBG_PERMANENT,
+                ToolBarManager::ToolBarGroup::Permanent,
                 ToolBarManager::msViewerToolBar);
             break;
 
         case ViewShell::ST_OUTLINE:
             mpToolBarManager->AddToolBar(
-                ToolBarManager::TBG_PERMANENT,
+                ToolBarManager::ToolBarGroup::Permanent,
                 ToolBarManager::msOutlineToolBar);
             mpToolBarManager->AddToolBar(
-                ToolBarManager::TBG_PERMANENT,
+                ToolBarManager::ToolBarGroup::Permanent,
                 ToolBarManager::msViewerToolBar);
             mpToolBarManager->AddToolBarShell(
-                ToolBarManager::TBG_PERMANENT, RID_DRAW_TEXT_TOOLBOX);
+                ToolBarManager::ToolBarGroup::Permanent, RID_DRAW_TEXT_TOOLBOX);
             break;
 
         case ViewShell::ST_SLIDE_SORTER:
             mpToolBarManager->AddToolBar(
-                ToolBarManager::TBG_PERMANENT,
+                ToolBarManager::ToolBarGroup::Permanent,
                 ToolBarManager::msViewerToolBar);
             mpToolBarManager->AddToolBar(
-                ToolBarManager::TBG_PERMANENT,
+                ToolBarManager::ToolBarGroup::Permanent,
                 ToolBarManager::msSlideSorterToolBar);
             mpToolBarManager->AddToolBar(
-                ToolBarManager::TBG_PERMANENT,
+                ToolBarManager::ToolBarGroup::Permanent,
                 ToolBarManager::msSlideSorterObjectBar);
             break;
 
@@ -1051,11 +1052,11 @@ void ToolBarRules::MainViewShellChanged (const ViewShell& rMainViewShell)
             {
                 if (pDrawViewShell->GetEditMode() == EditMode::MasterPage)
                     mpToolBarManager->AddToolBar(
-                        ToolBarManager::TBG_MASTER_MODE,
+                        ToolBarManager::ToolBarGroup::MasterMode,
                         ToolBarManager::msMasterViewToolBar);
                 else if ( rMainViewShell.GetShellType() != ::sd::ViewShell::ST_DRAW )
                     mpToolBarManager->AddToolBar(
-                        ToolBarManager::TBG_COMMON_TASK,
+                        ToolBarManager::ToolBarGroup::CommonTask,
                         ToolBarManager::msCommonTaskToolBar);
             }
             break;
@@ -1074,22 +1075,22 @@ void ToolBarRules::SelectionHasChanged (
     mpToolBarManager->LockViewShellManager();
     bool bTextEdit = rView.IsTextEdit();
 
-    mpToolBarManager->ResetToolBars(ToolBarManager::TBG_FUNCTION);
+    mpToolBarManager->ResetToolBars(ToolBarManager::ToolBarGroup::Function);
 
     switch (rView.GetContext())
     {
         case SdrViewContext::Graphic:
             if( !bTextEdit )
-                mpToolBarManager->SetToolBarShell(ToolBarManager::TBG_FUNCTION, RID_DRAW_GRAF_TOOLBOX);
+                mpToolBarManager->SetToolBarShell(ToolBarManager::ToolBarGroup::Function, RID_DRAW_GRAF_TOOLBOX);
             break;
 
         case SdrViewContext::Media:
             if( !bTextEdit )
-                mpToolBarManager->SetToolBarShell(ToolBarManager::TBG_FUNCTION, RID_DRAW_MEDIA_TOOLBOX);
+                mpToolBarManager->SetToolBarShell(ToolBarManager::ToolBarGroup::Function, RID_DRAW_MEDIA_TOOLBOX);
             break;
 
         case SdrViewContext::Table:
-            mpToolBarManager->SetToolBarShell(ToolBarManager::TBG_FUNCTION, RID_DRAW_TABLE_TOOLBOX);
+            mpToolBarManager->SetToolBarShell(ToolBarManager::ToolBarGroup::Function, RID_DRAW_TABLE_TOOLBOX);
             bTextEdit = true;
             break;
 
@@ -1104,7 +1105,7 @@ void ToolBarRules::SelectionHasChanged (
                     case ::sd::ViewShell::ST_NOTES:
                     case ::sd::ViewShell::ST_HANDOUT:
                         mpToolBarManager->SetToolBar(
-                            ToolBarManager::TBG_FUNCTION,
+                            ToolBarManager::ToolBarGroup::Function,
                             ToolBarManager::msDrawingObjectToolBar);
                         break;
                     default:
@@ -1115,20 +1116,20 @@ void ToolBarRules::SelectionHasChanged (
     }
 
     if( bTextEdit )
-        mpToolBarManager->AddToolBarShell(ToolBarManager::TBG_FUNCTION, RID_DRAW_TEXT_TOOLBOX);
+        mpToolBarManager->AddToolBarShell(ToolBarManager::ToolBarGroup::Function, RID_DRAW_TEXT_TOOLBOX);
 
     SdrView* pView = &const_cast<SdrView&>(rView);
     // Check if the extrusion tool bar and the fontwork tool bar have to
     // be activated.
     if (svx::checkForSelectedCustomShapes(pView, true /* bOnlyExtruded */ ))
-        mpToolBarManager->AddToolBarShell(ToolBarManager::TBG_FUNCTION, RID_SVX_EXTRUSION_BAR);
+        mpToolBarManager->AddToolBarShell(ToolBarManager::ToolBarGroup::Function, RID_SVX_EXTRUSION_BAR);
     sal_uInt32 nCheckStatus = 0;
     if (svx::checkForSelectedFontWork(pView, nCheckStatus))
-        mpToolBarManager->AddToolBarShell(ToolBarManager::TBG_FUNCTION, RID_SVX_FONTWORK_BAR);
+        mpToolBarManager->AddToolBarShell(ToolBarManager::ToolBarGroup::Function, RID_SVX_FONTWORK_BAR);
 
     // Switch on additional context-sensitive tool bars.
     if (rView.GetContext() == SdrViewContext::PointEdit)
-        mpToolBarManager->AddToolBarShell(ToolBarManager::TBG_FUNCTION, RID_BEZIER_TOOLBOX);
+        mpToolBarManager->AddToolBarShell(ToolBarManager::ToolBarGroup::Function, RID_BEZIER_TOOLBOX);
 }
 
 void ToolBarRules::SubShellAdded (
@@ -1250,9 +1251,8 @@ bool ToolBarList::RemoveToolBar (
 
 void ToolBarList::MakeRequestedToolBarList (NameList& rRequestedToolBars) const
 {
-    for (int i=sd::ToolBarManager::TBG_FIRST; i<=sd::ToolBarManager::TBG_LAST; ++i)
+    for (auto eGroup : o3tl::enumrange<sd::ToolBarManager::ToolBarGroup>())
     {
-        ::sd::ToolBarManager::ToolBarGroup eGroup = (::sd::ToolBarManager::ToolBarGroup)i;
         Groups::const_iterator iGroup (maGroups.find(eGroup));
         if (iGroup != maGroups.end())
             ::std::copy(

sd/source/ui/view/drviews1.cxx

@@ -375,9 +375,9 @@ void DrawViewShell::ChangeEditMode(EditMode eEMode, bool bIsLayerModeActive)
             && IsMainViewShell())
         {
             if ( !bShowMasterViewToolbar )
-                GetViewShellBase().GetToolBarManager()->ResetToolBars(ToolBarManager::TBG_MASTER_MODE);
+                GetViewShellBase().GetToolBarManager()->ResetToolBars(ToolBarManager::ToolBarGroup::MasterMode);
             if ( !bShowPresentationToolbar )
-                GetViewShellBase().GetToolBarManager()->ResetToolBars(ToolBarManager::TBG_COMMON_TASK);
+                GetViewShellBase().GetToolBarManager()->ResetToolBars(ToolBarManager::ToolBarGroup::CommonTask);
         }
 
         ConfigureAppBackgroundColor();
@@ -463,11 +463,11 @@ void DrawViewShell::ChangeEditMode(EditMode eEMode, bool bIsLayerModeActive)
         {
             if (bShowMasterViewToolbar)
                 GetViewShellBase().GetToolBarManager()->SetToolBar(
-                    ToolBarManager::TBG_MASTER_MODE,
+                    ToolBarManager::ToolBarGroup::MasterMode,
                     ToolBarManager::msMasterViewToolBar);
             if (bShowPresentationToolbar)
                 GetViewShellBase().GetToolBarManager()->SetToolBar(
-                    ToolBarManager::TBG_COMMON_TASK,
+                    ToolBarManager::ToolBarGroup::CommonTask,
                     ToolBarManager::msCommonTaskToolBar);
         }