convert POINTER constants to scoped enum

Change-Id: Iea29ce5fd6c620535197d3ca8538335078430e19
Reviewed-on: https://gerrit.libreoffice.org/15825
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>

8 files changed, 21 insertions, 21 deletions

diff --git a/sc/source/ui/drawfunc/fuconarc.cxx b/sc/source/ui/drawfunc/fuconarc.cxx
index f1994f109050..c916a5177cf9 100644
--- a/sc/source/ui/drawfunc/fuconarc.cxx
+++ b/sc/source/ui/drawfunc/fuconarc.cxx
@@ -136,22 +136,22 @@ void FuConstArc::Activate()
     switch (aSfxRequest.GetSlot() )
     {
         case SID_DRAW_ARC:
-            aNewPointer = Pointer( POINTER_DRAW_ARC );
+            aNewPointer = Pointer( PointerStyle::DrawArc );
             aObjKind = OBJ_CARC;
             break;
 
         case SID_DRAW_PIE:
-            aNewPointer = Pointer( POINTER_DRAW_PIE );
+            aNewPointer = Pointer( PointerStyle::DrawPie );
             aObjKind = OBJ_SECT;
             break;
 
         case SID_DRAW_CIRCLECUT:
-            aNewPointer = Pointer( POINTER_DRAW_CIRCLECUT );
+            aNewPointer = Pointer( PointerStyle::DrawCircleCut );
             aObjKind = OBJ_CCUT;
             break;
 
         default:
-            aNewPointer = Pointer( POINTER_CROSS );
+            aNewPointer = Pointer( PointerStyle::Cross );
             aObjKind = OBJ_CARC;
             break;
     }
diff --git a/sc/source/ui/drawfunc/fuconcustomshape.cxx b/sc/source/ui/drawfunc/fuconcustomshape.cxx
index e64b107a3e78..d48f6da8937a 100644
--- a/sc/source/ui/drawfunc/fuconcustomshape.cxx
+++ b/sc/source/ui/drawfunc/fuconcustomshape.cxx
@@ -155,7 +155,7 @@ void FuConstCustomShape::Activate()
 {
     pView->SetCurrentObj( OBJ_CUSTOMSHAPE, SdrInventor );
 
-    aNewPointer = Pointer( POINTER_DRAW_RECT );
+    aNewPointer = Pointer( PointerStyle::DrawRect );
     aOldPointer = pWindow->GetPointer();
     pViewShell->SetActivePointer( aNewPointer );
 
diff --git a/sc/source/ui/drawfunc/fuconpol.cxx b/sc/source/ui/drawfunc/fuconpol.cxx
index 33a456ff4182..2132b081d9eb 100644
--- a/sc/source/ui/drawfunc/fuconpol.cxx
+++ b/sc/source/ui/drawfunc/fuconpol.cxx
@@ -206,7 +206,7 @@ void FuConstPolygon::Activate()
 
     FuConstruct::Activate();
 
-    aNewPointer = Pointer( POINTER_DRAW_POLYGON );
+    aNewPointer = Pointer( PointerStyle::DrawPolygon );
     aOldPointer = pWindow->GetPointer();
     pViewShell->SetActivePointer( aNewPointer );
 }
diff --git a/sc/source/ui/drawfunc/fuconrec.cxx b/sc/source/ui/drawfunc/fuconrec.cxx
index d0282f2abfd1..e93322753be3 100644
--- a/sc/source/ui/drawfunc/fuconrec.cxx
+++ b/sc/source/ui/drawfunc/fuconrec.cxx
@@ -169,28 +169,28 @@ void FuConstRectangle::Activate()
     switch (aSfxRequest.GetSlot() )
     {
         case SID_DRAW_LINE:
-            aNewPointer = Pointer( POINTER_DRAW_LINE );
+            aNewPointer = Pointer( PointerStyle::DrawLine );
             aObjKind = OBJ_LINE;
             break;
 
         case SID_DRAW_RECT:
-            aNewPointer = Pointer( POINTER_DRAW_RECT );
+            aNewPointer = Pointer( PointerStyle::DrawRect );
             aObjKind = OBJ_RECT;
             break;
 
         case SID_DRAW_ELLIPSE:
-            aNewPointer = Pointer( POINTER_DRAW_ELLIPSE );
+            aNewPointer = Pointer( PointerStyle::DrawEllipse );
             aObjKind = OBJ_CIRC;
             break;
 
         case SID_DRAW_CAPTION:
         case SID_DRAW_CAPTION_VERTICAL:
-            aNewPointer = Pointer( POINTER_DRAW_CAPTION );
+            aNewPointer = Pointer( PointerStyle::DrawCaption );
             aObjKind = OBJ_CAPTION;
             break;
 
         default:
-            aNewPointer = Pointer( POINTER_CROSS );
+            aNewPointer = Pointer( PointerStyle::Cross );
             aObjKind = OBJ_RECT;
             break;
     }
diff --git a/sc/source/ui/drawfunc/fuconstr.cxx b/sc/source/ui/drawfunc/fuconstr.cxx
index 94a86b523232..34002b8273ca 100644
--- a/sc/source/ui/drawfunc/fuconstr.cxx
+++ b/sc/source/ui/drawfunc/fuconstr.cxx
@@ -193,7 +193,7 @@ bool FuConstruct::MouseMove(const MouseEvent& rMEvt)
         }
         else if ( pView->IsMarkedHit(aPnt) )
         {
-            pViewShell->SetActivePointer(Pointer(POINTER_MOVE));
+            pViewShell->SetActivePointer(Pointer(PointerStyle::Move));
         }
         else
         {
diff --git a/sc/source/ui/drawfunc/fuconuno.cxx b/sc/source/ui/drawfunc/fuconuno.cxx
index 83e8c18ed06f..3c9828d4bba6 100644
--- a/sc/source/ui/drawfunc/fuconuno.cxx
+++ b/sc/source/ui/drawfunc/fuconuno.cxx
@@ -138,7 +138,7 @@ void FuConstUnoControl::Activate()
 {
     pView->SetCurrentObj( nIdentifier, nInventor );
 
-    aNewPointer = Pointer( POINTER_DRAW_RECT );
+    aNewPointer = Pointer( PointerStyle::DrawRect );
     aOldPointer = pWindow->GetPointer();
     pViewShell->SetActivePointer( aNewPointer );
 
diff --git a/sc/source/ui/drawfunc/fudraw.cxx b/sc/source/ui/drawfunc/fudraw.cxx
index 25bfd25fc3f8..2817e527b8e5 100644
--- a/sc/source/ui/drawfunc/fudraw.cxx
+++ b/sc/source/ui/drawfunc/fudraw.cxx
@@ -50,8 +50,8 @@
 FuDraw::FuDraw(ScTabViewShell* pViewSh, vcl::Window* pWin, ScDrawView* pViewP,
                SdrModel* pDoc, SfxRequest& rReq) :
     FuPoor      (pViewSh, pWin, pViewP, pDoc, rReq),
-    aNewPointer ( POINTER_ARROW ),
-    aOldPointer ( POINTER_ARROW )
+    aNewPointer ( PointerStyle::Arrow ),
+    aOldPointer ( PointerStyle::Arrow )
 {
 }
 
@@ -748,7 +748,7 @@ void FuDraw::ForcePointer(const MouseEvent* pMEvt)
 
         if ( pView->IsTextEdit() )
         {
-            pViewShell->SetActivePointer(Pointer(POINTER_TEXT));        // can't be ?
+            pViewShell->SetActivePointer(Pointer(PointerStyle::Text));        // can't be ?
         }
         else if ( pHdl )
         {
@@ -757,13 +757,13 @@ void FuDraw::ForcePointer(const MouseEvent* pMEvt)
         }
         else if ( pView->IsMarkedHit(aPnt) )
         {
-            pViewShell->SetActivePointer( Pointer(POINTER_MOVE) );
+            pViewShell->SetActivePointer( Pointer(PointerStyle::Move) );
         }
         else if ( !bAlt && ( !pMEvt || !pMEvt->GetButtons() )
                         && lcl_UrlHit( pView, aPosPixel, pWindow ) )
         {
             //  could be suppressed with ALT
-            pWindow->SetPointer( Pointer( POINTER_REFHAND ) );          // Text-URL / ImageMap
+            pWindow->SetPointer( Pointer( PointerStyle::RefHand ) );          // Text-URL / ImageMap
         }
         else if ( !bAlt && pView->PickObj(aPnt, pView->getHitTolLog(), pObj, pPV, SdrSearchOptions::PICKMACRO) )
         {
@@ -772,9 +772,9 @@ void FuDraw::ForcePointer(const MouseEvent* pMEvt)
             pViewShell->SetActivePointer( pObj->GetMacroPointer(aHitRec) );
         }
         else if ( !bAlt && pInfo && (!pInfo->GetMacro().isEmpty() || !pInfo->GetHlink().isEmpty()) )
-            pWindow->SetPointer( Pointer( POINTER_REFHAND ) );
+            pWindow->SetPointer( Pointer( PointerStyle::RefHand ) );
         else if ( IsDetectiveHit( aPnt ) )
-            pViewShell->SetActivePointer( Pointer( POINTER_DETECTIVE ) );
+            pViewShell->SetActivePointer( Pointer( PointerStyle::Detective ) );
         else
             pViewShell->SetActivePointer( aNewPointer );            //! in Gridwin?
     }
diff --git a/sc/source/ui/drawfunc/futext.cxx b/sc/source/ui/drawfunc/futext.cxx
index 17d50953da40..4bec72d4e398 100644
--- a/sc/source/ui/drawfunc/futext.cxx
+++ b/sc/source/ui/drawfunc/futext.cxx
@@ -596,7 +596,7 @@ void FuText::Activate()
         pView->SetCreateMode();
     }
 
-    aNewPointer = Pointer(POINTER_TEXT);
+    aNewPointer = Pointer(PointerStyle::Text);
 
     aOldPointer = pWindow->GetPointer();
     pViewShell->SetActivePointer( aNewPointer );