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>

5 files changed, 16 insertions, 16 deletions

diff --git a/sd/source/ui/func/fuconuno.cxx b/sd/source/ui/func/fuconuno.cxx
index 74dac4c7f3d9..df901883103d 100644
--- a/sd/source/ui/func/fuconuno.cxx
+++ b/sd/source/ui/func/fuconuno.cxx
@@ -131,7 +131,7 @@ void FuConstructUnoControl::Activate()
 {
     mpView->SetCurrentObj( nIdentifier, nInventor );
 
-    aNewPointer = Pointer(POINTER_DRAW_RECT);
+    aNewPointer = Pointer(PointerStyle::DrawRect);
     aOldPointer = mpWindow->GetPointer();
     mpWindow->SetPointer( aNewPointer );
 
diff --git a/sd/source/ui/func/fudraw.cxx b/sd/source/ui/func/fudraw.cxx
index 013a5117a55a..a00a513190ff 100644
--- a/sd/source/ui/func/fudraw.cxx
+++ b/sd/source/ui/func/fudraw.cxx
@@ -511,7 +511,7 @@ void FuDraw::ForcePointer(const MouseEvent* pMEvt)
         {
             // water can mode
             bDefPointer = false;
-            mpWindow->SetPointer(Pointer(POINTER_FILL));
+            mpWindow->SetPointer(Pointer(PointerStyle::Fill));
         }
     }
     else
@@ -522,7 +522,7 @@ void FuDraw::ForcePointer(const MouseEvent* pMEvt)
         {
             // water can mode
             bDefPointer = false;
-            mpWindow->SetPointer(Pointer(POINTER_FILL));
+            mpWindow->SetPointer(Pointer(PointerStyle::Fill));
         }
         else if (!pHdl &&
                  mpViewShell->GetViewFrame()->HasChildWindow(SvxBmpMaskChildWindow::GetChildWindowId()))
@@ -533,7 +533,7 @@ void FuDraw::ForcePointer(const MouseEvent* pMEvt)
             if (pMask && pMask->IsEyedropping())
             {
                 bDefPointer = false;
-                mpWindow->SetPointer(Pointer(POINTER_REFHAND));
+                mpWindow->SetPointer(Pointer(PointerStyle::RefHand));
             }
         }
         else if (!mpView->IsAction())
@@ -559,7 +559,7 @@ void FuDraw::ForcePointer(const MouseEvent* pMEvt)
                 SdrObject* pObject = rMarkList.GetMark(0)->GetMarkedSdrObj();
                 if ((pObject->ISA(E3dObject)) && (rMarkList.GetMarkCount() == 1))
                 {
-                    mpWindow->SetPointer(Pointer(POINTER_ROTATE));
+                    mpWindow->SetPointer(Pointer(PointerStyle::Rotate));
                     bDefPointer = false;     // Otherwise it'll be calles Joes routine and the mousepointer will reconfigurate again
                 }
             }
@@ -584,7 +584,7 @@ void FuDraw::ForcePointer(const MouseEvent* pMEvt)
                 {
                     pObj = NULL;
                     bDefPointer = false;
-                    mpWindow->SetPointer(Pointer(POINTER_ARROW));
+                    mpWindow->SetPointer(Pointer(PointerStyle::Arrow));
                 }
             }
 
@@ -680,7 +680,7 @@ bool FuDraw::SetPointer(SdrObject* pObj, const Point& rPos)
                     {
                         // Animation object
                         bSet = true;
-                        mpWindow->SetPointer(Pointer(POINTER_REFHAND));
+                        mpWindow->SetPointer(Pointer(PointerStyle::RefHand));
                     }
             }
             else if (bImageMapInfo &&
@@ -690,7 +690,7 @@ bool FuDraw::SetPointer(SdrObject* pObj, const Point& rPos)
                 * ImageMap
                 ******************************************************/
                 bSet = true;
-                mpWindow->SetPointer(Pointer(POINTER_REFHAND));
+                mpWindow->SetPointer(Pointer(PointerStyle::RefHand));
             }
         }
     }
diff --git a/sd/source/ui/func/fudspord.cxx b/sd/source/ui/func/fudspord.cxx
index c8b70fec4226..3f4f3a11b218 100644
--- a/sd/source/ui/func/fudspord.cxx
+++ b/sd/source/ui/func/fudspord.cxx
@@ -125,7 +125,7 @@ bool FuDisplayOrder::MouseButtonUp(const MouseEvent& rMEvt)
 void FuDisplayOrder::Activate()
 {
     maPtr = mpWindow->GetPointer();
-    mpWindow->SetPointer( Pointer( POINTER_REFHAND ) );
+    mpWindow->SetPointer( Pointer( PointerStyle::RefHand ) );
 }
 
 void FuDisplayOrder::Deactivate()
diff --git a/sd/source/ui/func/fuformatpaintbrush.cxx b/sd/source/ui/func/fuformatpaintbrush.cxx
index 5177664529b2..380bcef2bd1f 100644
--- a/sd/source/ui/func/fuformatpaintbrush.cxx
+++ b/sd/source/ui/func/fuformatpaintbrush.cxx
@@ -155,7 +155,7 @@ bool FuFormatPaintBrush::MouseMove(const MouseEvent& rMEvt)
         if ( mpView->IsTextEdit() )
         {
             bReturn = FuText::MouseMove( rMEvt );
-            mpWindow->SetPointer(Pointer(POINTER_FILL));
+            mpWindow->SetPointer(Pointer(PointerStyle::Fill));
         }
         else
         {
@@ -165,9 +165,9 @@ bool FuFormatPaintBrush::MouseMove(const MouseEvent& rMEvt)
             bool bOverMarkableObject = mpView->PickObj( mpWindow->PixelToLogic( rMEvt.GetPosPixel() ),nHitLog, pObj, pPV, SdrSearchOptions::PICKMARKABLE);
 
             if(bOverMarkableObject && HasContentForThisType(pObj->GetObjInventor(),pObj->GetObjIdentifier()) )
-                mpWindow->SetPointer(Pointer(POINTER_FILL));
+                mpWindow->SetPointer(Pointer(PointerStyle::Fill));
             else
-                mpWindow->SetPointer(Pointer(POINTER_ARROW));
+                mpWindow->SetPointer(Pointer(PointerStyle::Arrow));
         }
     }
     return bReturn;
diff --git a/sd/source/ui/func/fuzoom.cxx b/sd/source/ui/func/fuzoom.cxx
index daf1f168cb93..782c32e5ab44 100644
--- a/sd/source/ui/func/fuzoom.cxx
+++ b/sd/source/ui/func/fuzoom.cxx
@@ -91,9 +91,9 @@ bool FuZoom::MouseButtonDown(const MouseEvent& rMEvt)
 bool FuZoom::MouseMove(const MouseEvent& rMEvt)
 {
     if (rMEvt.IsShift())
-        mpWindow->SetPointer(Pointer(POINTER_HAND));
+        mpWindow->SetPointer(Pointer(PointerStyle::Hand));
     else if (nSlotId != SID_ZOOM_PANNING)
-        mpWindow->SetPointer(Pointer(POINTER_MAGNIFY));
+        mpWindow->SetPointer(Pointer(PointerStyle::Magnify));
 
     if (bStartDrag)
     {
@@ -198,11 +198,11 @@ void FuZoom::Activate()
 
     if (nSlotId == SID_ZOOM_PANNING)
     {
-        mpWindow->SetPointer(Pointer(POINTER_HAND));
+        mpWindow->SetPointer(Pointer(PointerStyle::Hand));
     }
     else
     {
-        mpWindow->SetPointer(Pointer(POINTER_MAGNIFY));
+        mpWindow->SetPointer(Pointer(PointerStyle::Magnify));
     }
 }