convert ActionDescriptionProvider::ActionType to scoped enum

and remove an unused constant

Change-Id: I8d46d16d3f575aa416bfc5a965986ee5dfb1f93c

chart2/source/controller/main/ChartController.cxx

@@ -1406,7 +1406,7 @@ void ChartController::executeDispatch_MoveSeries( bool bForward )
 
     UndoGuardWithSelection aUndoGuard(
         ActionDescriptionProvider::createDescription(
-            (bForward ? ActionDescriptionProvider::MOVE_TOTOP : ActionDescriptionProvider::MOVE_TOBOTTOM),
+            (bForward ? ActionDescriptionProvider::ActionType::MoveToTop : ActionDescriptionProvider::ActionType::MoveToBottom),
             SCH_RESSTR(STR_OBJECT_DATASERIES)),
         m_xUndoManager );
 

chart2/source/controller/main/ChartController_Position.cxx

@@ -125,7 +125,7 @@ void ChartController::executeDispatch_PositionAndSize()
 
     UndoGuard aUndoGuard(
         ActionDescriptionProvider::createDescription(
-            ActionDescriptionProvider::POS_SIZE,
+            ActionDescriptionProvider::ActionType::PosSize,
             ObjectNameProvider::getName( eObjectType)),
         m_xUndoManager );
 

chart2/source/controller/main/ChartController_Properties.cxx

@@ -702,7 +702,7 @@ void ChartController::executeDlg_ObjectProperties( const OUString& rSelectedObje
     OUString aObjectCID = lcl_getFormatCIDforSelectedCID( rSelectedObjectCID );
 
     UndoGuard aUndoGuard( ActionDescriptionProvider::createDescription(
-                ActionDescriptionProvider::FORMAT,
+                ActionDescriptionProvider::ActionType::Format,
                 ObjectNameProvider::getName( ObjectIdentifier::getObjectType( aObjectCID ))),
             m_xUndoManager );
 

chart2/source/controller/main/ChartController_Tools.cxx

@@ -99,7 +99,7 @@ bool lcl_deleteDataSeries(
         {
             UndoGuard aUndoGuard(
                 ActionDescriptionProvider::createDescription(
-                    ActionDescriptionProvider::DELETE, SCH_RESSTR( STR_OBJECT_DATASERIES )),
+                    ActionDescriptionProvider::ActionType::Delete, SCH_RESSTR( STR_OBJECT_DATASERIES )),
                 xUndoManager );
 
             Reference< chart2::XDiagram > xDiagram( ChartModelHelper::findDiagram( xModel ) );
@@ -138,7 +138,7 @@ bool lcl_deleteDataCurve(
         {
             UndoGuard aUndoGuard(
                 ActionDescriptionProvider::createDescription(
-                    ActionDescriptionProvider::DELETE, SCH_RESSTR( STR_OBJECT_CURVE )),
+                    ActionDescriptionProvider::ActionType::Delete, SCH_RESSTR( STR_OBJECT_CURVE )),
                 xUndoManager );
 
             xRegressionCurveContainer->removeRegressionCurve( xRegressionCurve );
@@ -615,7 +615,7 @@ bool ChartController::executeDispatch_Delete()
             {
                 UndoGuard aUndoGuard(
                     ActionDescriptionProvider::createDescription(
-                        ActionDescriptionProvider::DELETE, SCH_RESSTR( STR_OBJECT_TITLE )),
+                        ActionDescriptionProvider::ActionType::Delete, SCH_RESSTR( STR_OBJECT_TITLE )),
                     m_xUndoManager );
                 TitleHelper::removeTitle(
                     ObjectIdentifier::getTitleTypeForCID( aCID ), getModel() );
@@ -633,7 +633,7 @@ bool ChartController::executeDispatch_Delete()
                     {
                         UndoGuard aUndoGuard(
                             ActionDescriptionProvider::createDescription(
-                                ActionDescriptionProvider::DELETE, SCH_RESSTR( STR_OBJECT_LEGEND )),
+                                ActionDescriptionProvider::ActionType::Delete, SCH_RESSTR( STR_OBJECT_LEGEND )),
                             m_xUndoManager );
                         xLegendProp->setPropertyValue( "Show", uno::makeAny( false ));
                         bReturn = true;
@@ -679,7 +679,7 @@ bool ChartController::executeDispatch_Delete()
                 {
                     UndoGuard aUndoGuard(
                         ActionDescriptionProvider::createDescription(
-                            ActionDescriptionProvider::DELETE, SCH_RESSTR( STR_OBJECT_AVERAGE_LINE )),
+                            ActionDescriptionProvider::ActionType::Delete, SCH_RESSTR( STR_OBJECT_AVERAGE_LINE )),
                         m_xUndoManager );
                     RegressionCurveHelper::removeMeanValueLine( xRegCurveCnt );
                     bReturn = true;
@@ -704,7 +704,7 @@ bool ChartController::executeDispatch_Delete()
                     uno::Reference< frame::XModel > xModel( getModel() );
                     UndoGuard aUndoGuard(
                         ActionDescriptionProvider::createDescription(
-                            ActionDescriptionProvider::DELETE, SCH_RESSTR( STR_OBJECT_CURVE_EQUATION )),
+                            ActionDescriptionProvider::ActionType::Delete, SCH_RESSTR( STR_OBJECT_CURVE_EQUATION )),
                         m_xUndoManager );
                     {
                         ControllerLockGuardUNO aCtlLockGuard( xModel );
@@ -739,7 +739,7 @@ bool ChartController::executeDispatch_Delete()
                     uno::Reference< frame::XModel > xModel( getModel() );
                     UndoGuard aUndoGuard(
                         ActionDescriptionProvider::createDescription(
-                            ActionDescriptionProvider::DELETE, SCH_RESSTR( nId )),
+                            ActionDescriptionProvider::ActionType::Delete, SCH_RESSTR( nId )),
                         m_xUndoManager );
                     {
                         ControllerLockGuardUNO aCtlLockGuard( xModel );
@@ -762,7 +762,7 @@ bool ChartController::executeDispatch_Delete()
                 {
                     UndoGuard aUndoGuard(
                         ActionDescriptionProvider::createDescription(
-                        ActionDescriptionProvider::DELETE,
+                        ActionDescriptionProvider::ActionType::Delete,
                             SCH_RESSTR( aObjectType == OBJECTTYPE_DATA_LABEL ? STR_OBJECT_LABEL : STR_OBJECT_DATALABELS )),
                                 m_xUndoManager );
                     chart2::DataPointLabel aLabel;
@@ -939,7 +939,7 @@ void ChartController::impl_ShapeControllerDispatch( const util::URL& rURL, const
 void ChartController::impl_switchDiagramPositioningToExcludingPositioning()
 {
     UndoGuard aUndoGuard( ActionDescriptionProvider::createDescription(
-        ActionDescriptionProvider::POS_SIZE,
+        ActionDescriptionProvider::ActionType::PosSize,
         ObjectNameProvider::getName( OBJECTTYPE_DIAGRAM)),
         m_xUndoManager );
     ChartModel& rModel = dynamic_cast<ChartModel&>(*m_aModel->getModel().get());

chart2/source/controller/main/ChartController_Window.cxx

@@ -810,9 +810,9 @@ void ChartController::execute_MouseButtonUp( const MouseEvent& rMEvt )
                         if( pE3dObject )
                             aObjectRect = pE3dObject->GetScene()->GetSnapRect();
 
-                        ActionDescriptionProvider::ActionType eActionType(ActionDescriptionProvider::MOVE);
+                        ActionDescriptionProvider::ActionType eActionType(ActionDescriptionProvider::ActionType::Move);
                         if( !bIsMoveOnly && m_aSelection.isResizeableObjectSelected() )
-                            eActionType = ActionDescriptionProvider::RESIZE;
+                            eActionType = ActionDescriptionProvider::ActionType::Resize;
 
                         ObjectType eObjectType = ObjectIdentifier::getObjectType( m_aSelection.getSelectedCID() );
 
@@ -1749,9 +1749,9 @@ bool ChartController::impl_moveOrResizeObject(
 
         if( bResult )
         {
-            ActionDescriptionProvider::ActionType eActionType(ActionDescriptionProvider::MOVE);
+            ActionDescriptionProvider::ActionType eActionType(ActionDescriptionProvider::ActionType::Move);
             if( bNeedResize )
-                eActionType = ActionDescriptionProvider::RESIZE;
+                eActionType = ActionDescriptionProvider::ActionType::Resize;
 
             ObjectType eObjectType = ObjectIdentifier::getObjectType( rCID );
             UndoGuard aUndoGuard( ActionDescriptionProvider::createDescription(

chart2/source/controller/main/DragMethod_Base.hxx

@@ -32,7 +32,7 @@ class DragMethod_Base : public SdrDragMethod
 public:
     DragMethod_Base( DrawViewWrapper& rDrawViewWrapper, const OUString& rObjectCID
         , const css::uno::Reference< css::frame::XModel >& xChartModel
-        , ActionDescriptionProvider::ActionType eActionType = ActionDescriptionProvider::MOVE );
+        , ActionDescriptionProvider::ActionType eActionType = ActionDescriptionProvider::ActionType::Move );
     virtual ~DragMethod_Base();
 
     OUString getUndoDescription() const;

chart2/source/controller/main/DragMethod_RotateDiagram.cxx

@@ -47,7 +47,7 @@ DragMethod_RotateDiagram::DragMethod_RotateDiagram( DrawViewWrapper& rDrawViewWr
         , const OUString& rObjectCID
         , const Reference< frame::XModel >& xChartModel
         , RotationDirection eRotationDirection )
-    : DragMethod_Base( rDrawViewWrapper, rObjectCID, xChartModel, ActionDescriptionProvider::ROTATE )
+    : DragMethod_Base( rDrawViewWrapper, rObjectCID, xChartModel, ActionDescriptionProvider::ActionType::Rotate )
     , m_pScene(nullptr)
     , m_aReferenceRect(100,100,100,100)
     , m_aStartPos(0,0)

include/svx/ActionDescriptionProvider.hxx

@@ -33,19 +33,17 @@ The name of the object acted on and the type of action needs to be given as inpu
 class SVX_DLLPUBLIC ActionDescriptionProvider
 {
 public:
-    enum ActionType
+    enum class ActionType
     {
-        INSERT
-        , DELETE
-        , CUT
-        , MOVE
-        , RESIZE
-        , ROTATE
-        , TRANSFORM
-        , FORMAT
-        , MOVE_TOTOP
-        , MOVE_TOBOTTOM
-        , POS_SIZE
+        Insert
+        , Delete
+        , Move
+        , Resize
+        , Rotate
+        , Format
+        , MoveToTop
+        , MoveToBottom
+        , PosSize
     };
 
 public:

include/svx/svdstr.hrc

@@ -245,8 +245,7 @@
 
 #define STR_ExchangeBegin            (STR_EditEnd+1)
 #define STR_ExchangePaste            (STR_ExchangeBegin +0)
-#define STR_ExchangeClpCut           (STR_ExchangeBegin +1)
-#define STR_ExchangeEnd              (STR_ExchangeClpCut)
+#define STR_ExchangeEnd              (STR_ExchangePaste)
 
 #define STR_DragBegin                (STR_ExchangeEnd+1)
 #define STR_DragInsertPoint          (STR_DragBegin + 0)

svx/source/svdraw/ActionDescriptionProvider.cxx

@@ -28,37 +28,31 @@ OUString ActionDescriptionProvider::createDescription( ActionType eActionType
     sal_uInt16 nResID=0;
     switch( eActionType )
     {
-    case INSERT:
+    case ActionType::Insert:
         nResID=STR_UndoInsertObj;
         break;
-    case DELETE:
+    case ActionType::Delete:
         nResID= STR_EditDelete;
         break;
-    case CUT:
-        nResID= STR_ExchangeClpCut;
-        break;
-    case MOVE:
+    case ActionType::Move:
         nResID= STR_EditMove;
         break;
-    case RESIZE:
+    case ActionType::Resize:
         nResID= STR_EditResize;
         break;
-    case ROTATE:
+    case ActionType::Rotate:
         nResID= STR_EditRotate;
         break;
-    case TRANSFORM:
-        nResID= STR_EditTransform;
-        break;
-    case FORMAT:
+    case ActionType::Format:
         nResID= STR_EditSetAttributes;
         break;
-    case MOVE_TOTOP:
+    case ActionType::MoveToTop:
         nResID= STR_EditMovToTop;
         break;
-    case MOVE_TOBOTTOM:
+    case ActionType::MoveToBottom:
         nResID= STR_EditMovToBtm;
         break;
-    case POS_SIZE:
+    case ActionType::PosSize:
         nResID = STR_EditPosSize;
         break;
     }

svx/source/svdraw/svdstr.src

@@ -847,10 +847,6 @@ String STR_ExchangePaste
 {
     Text [ en-US ] = "Insert object(s)" ;
 };
-String STR_ExchangeClpCut
-{
-    Text [ en-US ] = "Cut %1" ;
-};
 String STR_DragInsertPoint
 {
     Text [ en-US ] = "Insert point to %1" ;