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>
Signed-off-by: Jan Holesovsky <kendy@collabora.com>

19 files changed, 132 insertions, 132 deletions

diff --git a/svx/source/dialog/contwnd.cxx b/svx/source/dialog/contwnd.cxx
index 691dc737dcb5..742e7c1dfb21 100644
--- a/svx/source/dialog/contwnd.cxx
+++ b/svx/source/dialog/contwnd.cxx
@@ -164,7 +164,7 @@ void ContourWindow::MouseMove( const MouseEvent& rMEvt )
 
         if ( aPipetteLink.IsSet() && Rectangle( Point(), GetGraphicSize() ).IsInside( aLogPt ) )
         {
-            SetPointer( POINTER_REFHAND );
+            SetPointer( PointerStyle::RefHand );
             aPipetteLink.Call( this );
         }
     }
diff --git a/svx/source/dialog/graphctl.cxx b/svx/source/dialog/graphctl.cxx
index 5d690ed8827b..17dcc15269cf 100644
--- a/svx/source/dialog/graphctl.cxx
+++ b/svx/source/dialog/graphctl.cxx
@@ -653,7 +653,7 @@ void GraphCtrl::MouseMove(const MouseEvent& rMEvt)
             !pView->PickHandle( aLogPos ) &&
             !pView->IsInsObjPoint() )
         {
-            SetPointer( POINTER_CROSS );
+            SetPointer( PointerStyle::Cross );
         }
         else
             SetPointer( pView->GetPreferredPointer( aLogPos, this ) );
diff --git a/svx/source/engine3d/dragmt3d.cxx b/svx/source/engine3d/dragmt3d.cxx
index 64ba1761f4ae..7e090c3fc941 100644
--- a/svx/source/engine3d/dragmt3d.cxx
+++ b/svx/source/engine3d/dragmt3d.cxx
@@ -425,7 +425,7 @@ void E3dDragRotate::MoveSdrDrag(const Point& rPnt)
 
 Pointer E3dDragRotate::GetSdrDragPointer() const
 {
-    return Pointer(POINTER_ROTATE);
+    return Pointer(PointerStyle::Rotate);
 }
 
 // E3dDragMove. This drag method is only required for translations inside
@@ -697,7 +697,7 @@ void E3dDragMove::MoveSdrDrag(const Point& rPnt)
 
 Pointer E3dDragMove::GetSdrDragPointer() const
 {
-    return Pointer(POINTER_MOVE);
+    return Pointer(PointerStyle::Move);
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/svdraw/svdcrtv.cxx b/svx/source/svdraw/svdcrtv.cxx
index 0c9db46473d7..cd9f8880cbac 100644
--- a/svx/source/svdraw/svdcrtv.cxx
+++ b/svx/source/svdraw/svdcrtv.cxx
@@ -201,7 +201,7 @@ void SdrCreateView::ImpClearVars()
     pCreatePV=NULL;
     bAutoTextEdit=false;
     b1stPointAsCenter=false;
-    aAktCreatePointer=Pointer(POINTER_CROSS);
+    aAktCreatePointer=Pointer(PointerStyle::Cross);
     bUseIncompatiblePathCreateInterface=false;
     bAutoClosePolys=true;
     nAutoCloseDistPix=5;
@@ -370,7 +370,7 @@ void SdrCreateView::SetCurrentObj(sal_uInt16 nIdent, sal_uInt32 nInvent)
             {
                 // Here the correct pointer needs to be used
                 // if the default is set to vertical writing
-                aAktCreatePointer = POINTER_TEXT;
+                aAktCreatePointer = PointerStyle::Text;
             }
             else
                 aAktCreatePointer = pObj->GetCreatePointer();
@@ -379,7 +379,7 @@ void SdrCreateView::SetCurrentObj(sal_uInt16 nIdent, sal_uInt32 nInvent)
         }
         else
         {
-            aAktCreatePointer = Pointer(POINTER_CROSS);
+            aAktCreatePointer = Pointer(PointerStyle::Cross);
         }
     }
 
diff --git a/svx/source/svdraw/svddrgmt.cxx b/svx/source/svdraw/svddrgmt.cxx
index 884a05fb9c6f..fd0077da5dd0 100644
--- a/svx/source/svdraw/svddrgmt.cxx
+++ b/svx/source/svdraw/svddrgmt.cxx
@@ -1176,7 +1176,7 @@ Pointer SdrDragMovHdl::GetSdrDragPointer() const
         return pHdl->GetPointer();
     }
 
-    return Pointer(POINTER_REFHAND);
+    return Pointer(PointerStyle::RefHand);
 }
 
 
@@ -1483,7 +1483,7 @@ Pointer SdrDragObjOwn::GetSdrDragPointer() const
         return pHdl->GetPointer();
     }
 
-    return Pointer(POINTER_MOVE);
+    return Pointer(PointerStyle::Move);
 }
 
 
@@ -1757,11 +1757,11 @@ Pointer SdrDragMove::GetSdrDragPointer() const
 {
     if (IsDraggingPoints() || IsDraggingGluePoints())
     {
-        return Pointer(POINTER_MOVEPOINT);
+        return Pointer(PointerStyle::MovePoint);
     }
     else
     {
-        return Pointer(POINTER_MOVE);
+        return Pointer(PointerStyle::Move);
     }
 }
 
@@ -2099,7 +2099,7 @@ Pointer SdrDragResize::GetSdrDragPointer() const
         return pHdl->GetPointer();
     }
 
-    return Pointer(POINTER_MOVE);
+    return Pointer(PointerStyle::Move);
 }
 
 
@@ -2236,7 +2236,7 @@ bool SdrDragRotate::EndSdrDrag(bool bCopy)
 
 Pointer SdrDragRotate::GetSdrDragPointer() const
 {
-    return Pointer(POINTER_ROTATE);
+    return Pointer(PointerStyle::Rotate);
 }
 
 
@@ -2516,9 +2516,9 @@ bool SdrDragShear::EndSdrDrag(bool bCopy)
 Pointer SdrDragShear::GetSdrDragPointer() const
 {
     if (bVertical)
-        return Pointer(POINTER_VSHEAR);
+        return Pointer(PointerStyle::VShear);
     else
-        return Pointer(POINTER_HSHEAR);
+        return Pointer(PointerStyle::HShear);
 }
 
 
@@ -2649,7 +2649,7 @@ bool SdrDragMirror::EndSdrDrag(bool bCopy)
 
 Pointer SdrDragMirror::GetSdrDragPointer() const
 {
-    return Pointer(POINTER_MIRROR);
+    return Pointer(PointerStyle::Mirror);
 }
 
 
@@ -2810,7 +2810,7 @@ void SdrDragGradient::CancelSdrDrag()
 
 Pointer SdrDragGradient::GetSdrDragPointer() const
 {
-    return Pointer(POINTER_REFHAND);
+    return Pointer(PointerStyle::RefHand);
 }
 
 
@@ -3447,7 +3447,7 @@ bool SdrDragCrook::EndSdrDrag(bool bCopy)
 
 Pointer SdrDragCrook::GetSdrDragPointer() const
 {
-    return Pointer(POINTER_CROOK);
+    return Pointer(PointerStyle::Crook);
 }
 
 
@@ -3585,7 +3585,7 @@ bool SdrDragDistort::EndSdrDrag(bool bCopy)
 
 Pointer SdrDragDistort::GetSdrDragPointer() const
 {
-    return Pointer(POINTER_REFHAND);
+    return Pointer(PointerStyle::RefHand);
 }
 
 void SdrDragDistort::applyCurrentTransformationToSdrObject(SdrObject& rTarget)
@@ -4068,7 +4068,7 @@ bool SdrDragCrop::EndSdrDrag(bool /*bCopy*/)
 
 Pointer SdrDragCrop::GetSdrDragPointer() const
 {
-    return Pointer(POINTER_CROP);
+    return Pointer(PointerStyle::Crop);
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/svdraw/svdhdl.cxx b/svx/source/svdraw/svdhdl.cxx
index f7d32624db90..c007892e64cc 100644
--- a/svx/source/svdraw/svdhdl.cxx
+++ b/svx/source/svdraw/svdhdl.cxx
@@ -856,16 +856,16 @@ bool SdrHdl::IsHdlHit(const Point& rPnt) const
 
 Pointer SdrHdl::GetPointer() const
 {
-    PointerStyle ePtr=POINTER_MOVE;
+    PointerStyle ePtr=PointerStyle::Move;
     const bool bSize=eKind>=HDL_UPLFT && eKind<=HDL_LWRGT;
     const bool bRot=pHdlList!=NULL && pHdlList->IsRotateShear();
     const bool bDis=pHdlList!=NULL && pHdlList->IsDistortShear();
     if (bSize && pHdlList!=NULL && (bRot || bDis)) {
         switch (eKind) {
             case HDL_UPLFT: case HDL_UPRGT:
-            case HDL_LWLFT: case HDL_LWRGT: ePtr=bRot ? POINTER_ROTATE : POINTER_REFHAND; break;
-            case HDL_LEFT : case HDL_RIGHT: ePtr=POINTER_VSHEAR; break;
-            case HDL_UPPER: case HDL_LOWER: ePtr=POINTER_HSHEAR; break;
+            case HDL_LWLFT: case HDL_LWRGT: ePtr=bRot ? PointerStyle::Rotate : PointerStyle::RefHand; break;
+            case HDL_LEFT : case HDL_RIGHT: ePtr=PointerStyle::VShear; break;
+            case HDL_UPPER: case HDL_LOWER: ePtr=PointerStyle::HShear; break;
             default:
                 break;
         }
@@ -890,33 +890,33 @@ Pointer SdrHdl::GetPointer() const
             while (nHdlAngle>=36000) nHdlAngle-=36000;
             nHdlAngle/=4500;
             switch ((sal_uInt8)nHdlAngle) {
-                case 0: ePtr=POINTER_ESIZE;  break;
-                case 1: ePtr=POINTER_NESIZE; break;
-                case 2: ePtr=POINTER_NSIZE;  break;
-                case 3: ePtr=POINTER_NWSIZE; break;
-                case 4: ePtr=POINTER_WSIZE;  break;
-                case 5: ePtr=POINTER_SWSIZE; break;
-                case 6: ePtr=POINTER_SSIZE;  break;
-                case 7: ePtr=POINTER_SESIZE; break;
+                case 0: ePtr=PointerStyle::ESize;  break;
+                case 1: ePtr=PointerStyle::NESize; break;
+                case 2: ePtr=PointerStyle::NSize;  break;
+                case 3: ePtr=PointerStyle::NWSize; break;
+                case 4: ePtr=PointerStyle::WSize;  break;
+                case 5: ePtr=PointerStyle::SWSize; break;
+                case 6: ePtr=PointerStyle::SSize;  break;
+                case 7: ePtr=PointerStyle::SESize; break;
             } // switch
         } else {
             switch (eKind) {
-                case HDL_UPLFT: ePtr=POINTER_NWSIZE;  break;
-                case HDL_UPPER: ePtr=POINTER_NSIZE;     break;
-                case HDL_UPRGT: ePtr=POINTER_NESIZE;  break;
-                case HDL_LEFT : ePtr=POINTER_WSIZE;     break;
-                case HDL_RIGHT: ePtr=POINTER_ESIZE;     break;
-                case HDL_LWLFT: ePtr=POINTER_SWSIZE;  break;
-                case HDL_LOWER: ePtr=POINTER_SSIZE;     break;
-                case HDL_LWRGT: ePtr=POINTER_SESIZE;  break;
-                case HDL_POLY : ePtr=POINTER_MOVEPOINT; break;
-                case HDL_CIRC : ePtr=POINTER_HAND;      break;
-                case HDL_REF1 : ePtr=POINTER_REFHAND;   break;
-                case HDL_REF2 : ePtr=POINTER_REFHAND;   break;
-                case HDL_BWGT : ePtr=POINTER_MOVEBEZIERWEIGHT; break;
-                case HDL_GLUE : ePtr=POINTER_MOVEPOINT; break;
-                case HDL_GLUE_DESELECTED : ePtr=POINTER_MOVEPOINT; break;
-                case HDL_CUSTOMSHAPE1 : ePtr=POINTER_HAND; break;
+                case HDL_UPLFT: ePtr=PointerStyle::NWSize;  break;
+                case HDL_UPPER: ePtr=PointerStyle::NSize;     break;
+                case HDL_UPRGT: ePtr=PointerStyle::NESize;  break;
+                case HDL_LEFT : ePtr=PointerStyle::WSize;     break;
+                case HDL_RIGHT: ePtr=PointerStyle::ESize;     break;
+                case HDL_LWLFT: ePtr=PointerStyle::SWSize;  break;
+                case HDL_LOWER: ePtr=PointerStyle::SSize;     break;
+                case HDL_LWRGT: ePtr=PointerStyle::SESize;  break;
+                case HDL_POLY : ePtr=PointerStyle::MovePoint; break;
+                case HDL_CIRC : ePtr=PointerStyle::Hand;      break;
+                case HDL_REF1 : ePtr=PointerStyle::RefHand;   break;
+                case HDL_REF2 : ePtr=PointerStyle::RefHand;   break;
+                case HDL_BWGT : ePtr=PointerStyle::MoveBezierWeight; break;
+                case HDL_GLUE : ePtr=PointerStyle::MovePoint; break;
+                case HDL_GLUE_DESELECTED : ePtr=PointerStyle::MovePoint; break;
+                case HDL_CUSTOMSHAPE1 : ePtr=PointerStyle::Hand; break;
                 default:
                     break;
             }
@@ -1362,7 +1362,7 @@ void SdrHdlLine::CreateB2dIAObject()
 
 Pointer SdrHdlLine::GetPointer() const
 {
-    return Pointer(POINTER_REFHAND);
+    return Pointer(PointerStyle::RefHand);
 }
 
 
@@ -1560,11 +1560,11 @@ Pointer ImpEdgeHdl::GetPointer() const
     if (pEdge==NULL)
         return SdrHdl::GetPointer();
     if (nObjHdlNum<=1)
-        return Pointer(POINTER_MOVEPOINT);
+        return Pointer(PointerStyle::MovePoint);
     if (IsHorzDrag())
-        return Pointer(POINTER_ESIZE);
+        return Pointer(PointerStyle::ESize);
     else
-        return Pointer(POINTER_SSIZE);
+        return Pointer(PointerStyle::SSize);
 }
 
 bool ImpEdgeHdl::IsHorzDrag() const
@@ -1662,11 +1662,11 @@ Pointer ImpMeasureHdl::GetPointer() const
 {
     switch (nObjHdlNum)
     {
-        case 0: case 1: return Pointer(POINTER_HAND);
-        case 2: case 3: return Pointer(POINTER_MOVEPOINT);
+        case 0: case 1: return Pointer(PointerStyle::Hand);
+        case 2: case 3: return Pointer(PointerStyle::MovePoint);
         case 4: case 5: return SdrHdl::GetPointer(); // will then be rotated appropriately
     } // switch
-    return Pointer(POINTER_NOTALLOWED);
+    return Pointer(PointerStyle::NotAllowed);
 }
 
 
diff --git a/svx/source/svdraw/svdhlpln.cxx b/svx/source/svdraw/svdhlpln.cxx
index 0aa9fb1261a3..0204b580e7c7 100644
--- a/svx/source/svdraw/svdhlpln.cxx
+++ b/svx/source/svdraw/svdhlpln.cxx
@@ -30,9 +30,9 @@
 Pointer SdrHelpLine::GetPointer() const
 {
     switch (eKind) {
-        case SDRHELPLINE_VERTICAL  : return Pointer(POINTER_ESIZE);
-        case SDRHELPLINE_HORIZONTAL: return Pointer(POINTER_SSIZE);
-        default                    : return Pointer(POINTER_MOVE);
+        case SDRHELPLINE_VERTICAL  : return Pointer(PointerStyle::ESize);
+        case SDRHELPLINE_HORIZONTAL: return Pointer(PointerStyle::SSize);
+        default                    : return Pointer(PointerStyle::Move);
     } // switch
 }
 
diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx
index 59c86253942d..b6d382745d57 100644
--- a/svx/source/svdraw/svdobj.cxx
+++ b/svx/source/svdraw/svdobj.cxx
@@ -1423,7 +1423,7 @@ basegfx::B2DPolyPolygon SdrObject::TakeCreatePoly(const SdrDragStat& rDrag) cons
 
 Pointer SdrObject::GetCreatePointer() const
 {
-    return Pointer(POINTER_CROSS);
+    return Pointer(PointerStyle::Cross);
 }
 
 // transformations
@@ -1864,7 +1864,7 @@ SdrObject* SdrObject::CheckMacroHit(const SdrObjMacroHitRec& rRec) const
 
 Pointer SdrObject::GetMacroPointer(const SdrObjMacroHitRec&) const
 {
-    return Pointer(POINTER_REFHAND);
+    return Pointer(PointerStyle::RefHand);
 }
 
 void SdrObject::PaintMacro(OutputDevice& rOut, const Rectangle& , const SdrObjMacroHitRec& ) const
diff --git a/svx/source/svdraw/svdocapt.cxx b/svx/source/svdraw/svdocapt.cxx
index 8c37b809ae1d..342f392c8f80 100644
--- a/svx/source/svdraw/svdocapt.cxx
+++ b/svx/source/svdraw/svdocapt.cxx
@@ -597,7 +597,7 @@ basegfx::B2DPolyPolygon SdrCaptionObj::TakeCreatePoly(const SdrDragStat& /*rDrag
 
 Pointer SdrCaptionObj::GetCreatePointer() const
 {
-    return Pointer(POINTER_DRAW_CAPTION);
+    return Pointer(PointerStyle::DrawCaption);
 }
 
 void SdrCaptionObj::NbcMove(const Size& rSiz)
diff --git a/svx/source/svdraw/svdocirc.cxx b/svx/source/svdraw/svdocirc.cxx
index 0434d6918a2a..c0677ccc2c54 100644
--- a/svx/source/svdraw/svdocirc.cxx
+++ b/svx/source/svdraw/svdocirc.cxx
@@ -795,13 +795,13 @@ basegfx::B2DPolyPolygon SdrCircObj::TakeCreatePoly(const SdrDragStat& rDrag) con
 Pointer SdrCircObj::GetCreatePointer() const
 {
     switch (meCircleKind) {
-        case OBJ_CIRC: return Pointer(POINTER_DRAW_ELLIPSE);
-        case OBJ_SECT: return Pointer(POINTER_DRAW_PIE);
-        case OBJ_CARC: return Pointer(POINTER_DRAW_ARC);
-        case OBJ_CCUT: return Pointer(POINTER_DRAW_CIRCLECUT);
+        case OBJ_CIRC: return Pointer(PointerStyle::DrawEllipse);
+        case OBJ_SECT: return Pointer(PointerStyle::DrawPie);
+        case OBJ_CARC: return Pointer(PointerStyle::DrawArc);
+        case OBJ_CCUT: return Pointer(PointerStyle::DrawCircleCut);
         default: break;
     } // switch
-    return Pointer(POINTER_CROSS);
+    return Pointer(PointerStyle::Cross);
 }
 
 void SdrCircObj::NbcMove(const Size& aSiz)
diff --git a/svx/source/svdraw/svdoedge.cxx b/svx/source/svdraw/svdoedge.cxx
index 55d6968838d4..ed8c82003ca0 100644
--- a/svx/source/svdraw/svdoedge.cxx
+++ b/svx/source/svdraw/svdoedge.cxx
@@ -2094,7 +2094,7 @@ basegfx::B2DPolyPolygon SdrEdgeObj::TakeCreatePoly(const SdrDragStat& /*rStatDra
 
 Pointer SdrEdgeObj::GetCreatePointer() const
 {
-    return Pointer(POINTER_DRAW_CONNECT);
+    return Pointer(PointerStyle::DrawConnect);
 }
 
 bool SdrEdgeObj::ImpFindConnector(const Point& rPt, const SdrPageView& rPV, SdrObjConnection& rCon, const SdrEdgeObj* pThis, OutputDevice* pOut)
diff --git a/svx/source/svdraw/svdomeas.cxx b/svx/source/svdraw/svdomeas.cxx
index be529e4fa46e..5479193a0199 100644
--- a/svx/source/svdraw/svdomeas.cxx
+++ b/svx/source/svdraw/svdomeas.cxx
@@ -1024,7 +1024,7 @@ basegfx::B2DPolyPolygon SdrMeasureObj::TakeCreatePoly(const SdrDragStat& /*rDrag
 
 Pointer SdrMeasureObj::GetCreatePointer() const
 {
-    return Pointer(POINTER_CROSS);
+    return Pointer(PointerStyle::Cross);
 }
 
 void SdrMeasureObj::NbcMove(const Size& rSiz)
diff --git a/svx/source/svdraw/svdopath.cxx b/svx/source/svdraw/svdopath.cxx
index 71d3c15ea6a4..b570e7ffccb2 100644
--- a/svx/source/svdraw/svdopath.cxx
+++ b/svx/source/svdraw/svdopath.cxx
@@ -1630,20 +1630,20 @@ basegfx::B2DPolyPolygon ImpPathForDragAndCreate::TakeDragPolyPolygon(const SdrDr
 Pointer ImpPathForDragAndCreate::GetCreatePointer() const
 {
     switch (meObjectKind) {
-        case OBJ_LINE    : return Pointer(POINTER_DRAW_LINE);
-        case OBJ_POLY    : return Pointer(POINTER_DRAW_POLYGON);
-        case OBJ_PLIN    : return Pointer(POINTER_DRAW_POLYGON);
-        case OBJ_PATHLINE: return Pointer(POINTER_DRAW_BEZIER);
-        case OBJ_PATHFILL: return Pointer(POINTER_DRAW_BEZIER);
-        case OBJ_FREELINE: return Pointer(POINTER_DRAW_FREEHAND);
-        case OBJ_FREEFILL: return Pointer(POINTER_DRAW_FREEHAND);
-        case OBJ_SPLNLINE: return Pointer(POINTER_DRAW_FREEHAND);
-        case OBJ_SPLNFILL: return Pointer(POINTER_DRAW_FREEHAND);
-        case OBJ_PATHPOLY: return Pointer(POINTER_DRAW_POLYGON);
-        case OBJ_PATHPLIN: return Pointer(POINTER_DRAW_POLYGON);
+        case OBJ_LINE    : return Pointer(PointerStyle::DrawLine);
+        case OBJ_POLY    : return Pointer(PointerStyle::DrawPolygon);
+        case OBJ_PLIN    : return Pointer(PointerStyle::DrawPolygon);
+        case OBJ_PATHLINE: return Pointer(PointerStyle::DrawBezier);
+        case OBJ_PATHFILL: return Pointer(PointerStyle::DrawBezier);
+        case OBJ_FREELINE: return Pointer(PointerStyle::DrawFreehand);
+        case OBJ_FREEFILL: return Pointer(PointerStyle::DrawFreehand);
+        case OBJ_SPLNLINE: return Pointer(PointerStyle::DrawFreehand);
+        case OBJ_SPLNFILL: return Pointer(PointerStyle::DrawFreehand);
+        case OBJ_PATHPOLY: return Pointer(PointerStyle::DrawPolygon);
+        case OBJ_PATHPLIN: return Pointer(PointerStyle::DrawPolygon);
         default: break;
     } // switch
-    return Pointer(POINTER_CROSS);
+    return Pointer(PointerStyle::Cross);
 }
 
 SdrPathObjGeoData::SdrPathObjGeoData()
diff --git a/svx/source/svdraw/svdorect.cxx b/svx/source/svdraw/svdorect.cxx
index 7e33566f3513..19e87c9134ec 100644
--- a/svx/source/svdraw/svdorect.cxx
+++ b/svx/source/svdraw/svdorect.cxx
@@ -488,8 +488,8 @@ basegfx::B2DPolyPolygon SdrRectObj::TakeCreatePoly(const SdrDragStat& rDrag) con
 
 Pointer SdrRectObj::GetCreatePointer() const
 {
-    if (IsTextFrame()) return Pointer(POINTER_DRAW_TEXT);
-    return Pointer(POINTER_DRAW_RECT);
+    if (IsTextFrame()) return Pointer(PointerStyle::DrawText);
+    return Pointer(PointerStyle::DrawRect);
 }
 
 void SdrRectObj::NbcMove(const Size& rSiz)
diff --git a/svx/source/svdraw/svdotxdr.cxx b/svx/source/svdraw/svdotxdr.cxx
index 4bfeff4098d4..d28fc2e74708 100644
--- a/svx/source/svdraw/svdotxdr.cxx
+++ b/svx/source/svdraw/svdotxdr.cxx
@@ -244,8 +244,8 @@ basegfx::B2DPolyPolygon SdrTextObj::TakeCreatePoly(const SdrDragStat& rDrag) con
 
 Pointer SdrTextObj::GetCreatePointer() const
 {
-    if (IsTextFrame()) return Pointer(POINTER_DRAW_TEXT);
-    return Pointer(POINTER_CROSS);
+    if (IsTextFrame()) return Pointer(PointerStyle::DrawText);
+    return Pointer(PointerStyle::Cross);
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/svdraw/svdsnpv.cxx b/svx/source/svdraw/svdsnpv.cxx
index 5d108d102ab0..070f4c40397e 100644
--- a/svx/source/svdraw/svdsnpv.cxx
+++ b/svx/source/svdraw/svdsnpv.cxx
@@ -591,13 +591,13 @@ Pointer SdrSnapView::GetDraggedHelpLinePointer() const
     {
         switch(mpHelpLineOverlay->GetHelpLineKind())
         {
-            case SDRHELPLINE_VERTICAL  : return Pointer(POINTER_ESIZE);
-            case SDRHELPLINE_HORIZONTAL: return Pointer(POINTER_SSIZE);
-            default                    : return Pointer(POINTER_MOVE);
+            case SDRHELPLINE_VERTICAL  : return Pointer(PointerStyle::ESize);
+            case SDRHELPLINE_HORIZONTAL: return Pointer(PointerStyle::SSize);
+            default                    : return Pointer(PointerStyle::Move);
         }
     }
 
-    return Pointer(POINTER_MOVE);
+    return Pointer(PointerStyle::Move);
 }
 
 void SdrSnapView::MovDragHelpLine(const Point& rPnt)
diff --git a/svx/source/svdraw/svdview.cxx b/svx/source/svdraw/svdview.cxx
index b79f39f26197..9b8952c59711 100644
--- a/svx/source/svdraw/svdview.cxx
+++ b/svx/source/svdraw/svdview.cxx
@@ -957,11 +957,11 @@ Pointer SdrView::GetPreferredPointer(const Point& rMousePos, const OutputDevice*
     if (mpCurrentSdrDragMethod)
     {
         if ((IsDraggingPoints() || IsDraggingGluePoints()) && IsMouseHideWhileDraggingPoints())
-            return Pointer(POINTER_NULL);
+            return Pointer(PointerStyle::Null);
 
         return mpCurrentSdrDragMethod->GetSdrDragPointer();
     }
-    if (IsMarkObj() || IsMarkPoints() || IsMarkGluePoints() || IsSetPageOrg()) return Pointer(POINTER_ARROW);
+    if (IsMarkObj() || IsMarkPoints() || IsMarkGluePoints() || IsSetPageOrg()) return Pointer(PointerStyle::Arrow);
     if (IsDragHelpLine()) return GetDraggedHelpLinePointer();
     if (IsMacroObj()) {
         SdrObjMacroHitRec aHitRec;
@@ -981,19 +981,19 @@ Pointer SdrView::GetPreferredPointer(const Point& rMousePos, const OutputDevice*
         if(!pOut || IsTextEditInSelectionMode())
         {
             if(pTextEditOutliner->IsVertical())
-                return Pointer(POINTER_TEXT_VERTICAL);
+                return Pointer(PointerStyle::TextVertical);
             else
-                return Pointer(POINTER_TEXT);
+                return Pointer(PointerStyle::Text);
         }
         // Outliner should return something here...
         Point aPos(pOut->LogicToPixel(rMousePos));
         Pointer aPointer(pTextEditOutlinerView->GetPointer(aPos));
-        if (aPointer==POINTER_ARROW)
+        if (aPointer==PointerStyle::Arrow)
         {
             if(pTextEditOutliner->IsVertical())
-                aPointer = POINTER_TEXT_VERTICAL;
+                aPointer = PointerStyle::TextVertical;
             else
-                aPointer = POINTER_TEXT;
+                aPointer = PointerStyle::Text;
         }
         return aPointer;
     }
@@ -1011,17 +1011,17 @@ Pointer SdrView::GetPreferredPointer(const Point& rMousePos, const OutputDevice*
         case SDREVENT_BEGCREATEOBJ:
             return aAktCreatePointer;
         case SDREVENT_MARKOBJ:
-            return Pointer(POINTER_MOVE);
+            return Pointer(PointerStyle::Move);
         case SDREVENT_BEGMARK:
-            return Pointer(POINTER_ARROW);
+            return Pointer(PointerStyle::Arrow);
         case SDREVENT_MARKPOINT:
         case SDREVENT_MARKGLUEPOINT:
-            return Pointer(POINTER_MOVEPOINT);
+            return Pointer(PointerStyle::MovePoint);
         case SDREVENT_BEGINSOBJPOINT:
         case SDREVENT_BEGINSGLUEPOINT:
-            return Pointer(POINTER_CROSS);
+            return Pointer(PointerStyle::Cross);
         case SDREVENT_EXECUTEURL:
-            return Pointer(POINTER_REFHAND);
+            return Pointer(PointerStyle::RefHand);
         case SDREVENT_BEGMACROOBJ:
         {
             SdrObjMacroHitRec aHitRec;
@@ -1039,11 +1039,11 @@ Pointer SdrView::GetPreferredPointer(const Point& rMousePos, const OutputDevice*
     switch(eHit)
     {
         case SDRHIT_CELL:
-            return Pointer(POINTER_ARROW);
+            return Pointer(PointerStyle::Arrow);
         case SDRHIT_HELPLINE :
             return aVEvt.pPV->GetHelpLines()[aVEvt.nHlplIdx].GetPointer();
         case SDRHIT_GLUEPOINT:
-            return Pointer(POINTER_MOVEPOINT);
+            return Pointer(PointerStyle::MovePoint);
         case SDRHIT_TEXTEDIT :
         case SDRHIT_TEXTEDITOBJ:
         {
@@ -1052,9 +1052,9 @@ Pointer SdrView::GetPreferredPointer(const Point& rMousePos, const OutputDevice*
             {
                 OutlinerParaObject* pParaObj = pText->GetOutlinerParaObject();
                 if(pParaObj && pParaObj->IsVertical())
-                    return Pointer(POINTER_TEXT_VERTICAL);
+                    return Pointer(PointerStyle::TextVertical);
             }
-            return Pointer(POINTER_TEXT);
+            return Pointer(PointerStyle::Text);
         }
         default: break;
     }
@@ -1068,13 +1068,13 @@ Pointer SdrView::GetPreferredPointer(const Point& rMousePos, const OutputDevice*
         bool bVertex=pHdl!=NULL && pHdl->IsVertexHdl();
         bool bMov=eHdl==HDL_MOVE;
         if (bMov && (eDragMode==SDRDRAG_MOVE || eDragMode==SDRDRAG_RESIZE || bMarkedHitMovesAlways)) {
-            if (!IsMoveAllowed()) return Pointer(POINTER_ARROW); // because double click or drag & drop is possible
-            return Pointer(POINTER_MOVE);
+            if (!IsMoveAllowed()) return Pointer(PointerStyle::Arrow); // because double click or drag & drop is possible
+            return Pointer(PointerStyle::Move);
         }
         switch (eDragMode) {
             case SDRDRAG_ROTATE: {
                 if ((bCorner || bMov) && !IsRotateAllowed(true))
-                    return Pointer(POINTER_NOTALLOWED);
+                    return Pointer(PointerStyle::NotAllowed);
 
                 // are 3D objects selected?
                 bool b3DObjSelected = false;
@@ -1086,19 +1086,19 @@ Pointer SdrView::GetPreferredPointer(const Point& rMousePos, const OutputDevice*
                 // If we have a 3D object, go on despite !IsShearAllowed,
                 // because then we have a rotation instead of a shear.
                 if (bVertex && !IsShearAllowed() && !b3DObjSelected)
-                    return Pointer(POINTER_NOTALLOWED);
+                    return Pointer(PointerStyle::NotAllowed);
                 if (bMov)
-                    return Pointer(POINTER_ROTATE);
+                    return Pointer(PointerStyle::Rotate);
             } break;
             case SDRDRAG_SHEAR: case SDRDRAG_DISTORT: {
                 if (bCorner) {
-                    if (!IsDistortAllowed(true) && !IsDistortAllowed(false)) return Pointer(POINTER_NOTALLOWED);
-                    else return Pointer(POINTER_REFHAND);
+                    if (!IsDistortAllowed(true) && !IsDistortAllowed(false)) return Pointer(PointerStyle::NotAllowed);
+                    else return Pointer(PointerStyle::RefHand);
                 }
-                if (bVertex && !IsShearAllowed()) return Pointer(POINTER_NOTALLOWED);
+                if (bVertex && !IsShearAllowed()) return Pointer(PointerStyle::NotAllowed);
                 if (bMov) {
-                    if (!IsMoveAllowed()) return Pointer(POINTER_ARROW); // because double click or drag & drop is possible
-                    return Pointer(POINTER_MOVE);
+                    if (!IsMoveAllowed()) return Pointer(PointerStyle::Arrow); // because double click or drag & drop is possible
+                    return Pointer(PointerStyle::Move);
                 }
             } break;
             case SDRDRAG_MIRROR: {
@@ -1117,54 +1117,54 @@ Pointer SdrView::GetPreferredPointer(const Point& rMousePos, const OutputDevice*
                     if (!IsMirrorAllowed(true,true)) bNo=true; // any mirroring is forbidden
                     if (!IsMirrorAllowed(false,false) && !b45) bNo=true; // mirroring freely is forbidden
                     if (!IsMirrorAllowed(true,false) && !b90) bNo=true;  // mirroring horizontally/vertically is allowed
-                    if (bNo) return Pointer(POINTER_NOTALLOWED);
+                    if (bNo) return Pointer(PointerStyle::NotAllowed);
                     if (b90) {
-                        return Pointer(POINTER_MIRROR);
+                        return Pointer(PointerStyle::Mirror);
                     }
-                    return Pointer(POINTER_MIRROR);
+                    return Pointer(PointerStyle::Mirror);
                 }
             } break;
 
             case SDRDRAG_TRANSPARENCE:
             {
                 if(!IsTransparenceAllowed())
-                    return Pointer(POINTER_NOTALLOWED);
+                    return Pointer(PointerStyle::NotAllowed);
 
-                return Pointer(POINTER_REFHAND);
+                return Pointer(PointerStyle::RefHand);
             }
 
             case SDRDRAG_GRADIENT:
             {
                 if(!IsGradientAllowed())
-                    return Pointer(POINTER_NOTALLOWED);
+                    return Pointer(PointerStyle::NotAllowed);
 
-                return Pointer(POINTER_REFHAND);
+                return Pointer(PointerStyle::RefHand);
             }
 
             case SDRDRAG_CROOK: {
                 if (bCorner || bVertex || bMov) {
-                    if (!IsCrookAllowed(true) && !IsCrookAllowed(false)) return Pointer(POINTER_NOTALLOWED);
-                    return Pointer(POINTER_CROOK);
+                    if (!IsCrookAllowed(true) && !IsCrookAllowed(false)) return Pointer(PointerStyle::NotAllowed);
+                    return Pointer(PointerStyle::Crook);
                 }
             }
 
             case SDRDRAG_CROP:
             {
-                return Pointer(POINTER_CROP);
+                return Pointer(PointerStyle::Crop);
             }
 
             default: {
-                if ((bCorner || bVertex) && !IsResizeAllowed(true)) return Pointer(POINTER_NOTALLOWED);
+                if ((bCorner || bVertex) && !IsResizeAllowed(true)) return Pointer(PointerStyle::NotAllowed);
             }
         }
         if (pHdl!=NULL) return pHdl->GetPointer();
         if (bMov) {
-            if (!IsMoveAllowed()) return Pointer(POINTER_ARROW); // because double click or drag & drop is possible
-            return Pointer(POINTER_MOVE);
+            if (!IsMoveAllowed()) return Pointer(PointerStyle::Arrow); // because double click or drag & drop is possible
+            return Pointer(PointerStyle::Move);
         }
     }
     if (eEditMode==SDREDITMODE_CREATE) return aAktCreatePointer;
-    return Pointer(POINTER_ARROW);
+    return Pointer(PointerStyle::Arrow);
 }
 
 #define STR_NOTHING "nothing"
diff --git a/svx/source/table/svdotable.cxx b/svx/source/table/svdotable.cxx
index 52b1edde6f25..a308c34f03de 100644
--- a/svx/source/table/svdotable.cxx
+++ b/svx/source/table/svdotable.cxx
@@ -2437,7 +2437,7 @@ basegfx::B2DPolyPolygon SdrTableObj::TakeCreatePoly(const SdrDragStat& rDrag) co
 
 Pointer SdrTableObj::GetCreatePointer() const
 {
-    return Pointer(POINTER_CROSS);
+    return Pointer(PointerStyle::Cross);
 }
 
 
diff --git a/svx/source/table/tablehandles.cxx b/svx/source/table/tablehandles.cxx
index 8b6453f76143..8ffde7ce0282 100644
--- a/svx/source/table/tablehandles.cxx
+++ b/svx/source/table/tablehandles.cxx
@@ -84,9 +84,9 @@ void TableEdgeHdl::SetEdge( sal_Int32 nEdge, sal_Int32 nStart, sal_Int32 nEnd, T
 Pointer TableEdgeHdl::GetPointer() const
 {
     if( mbHorizontal )
-        return POINTER_VSPLIT;
+        return PointerStyle::VSplit;
     else
-        return POINTER_HSPLIT;
+        return PointerStyle::HSplit;
 }
 
 sal_Int32 TableEdgeHdl::GetValidDragOffset( const SdrDragStat& rDrag ) const
@@ -257,7 +257,7 @@ TableBorderHdl::TableBorderHdl(
 
 Pointer TableBorderHdl::GetPointer() const
 {
-    return POINTER_MOVE;
+    return PointerStyle::Move;
 }
 
 // create marker for this kind