Pointer is pointless

since it is just a wrapper around PointerStyle

Change-Id: I51f065e0d4ad8bd91f5c84c5819048c720a19267
Reviewed-on: https://gerrit.libreoffice.org/67711
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

14 files changed, 38 insertions, 36 deletions

diff --git a/sd/inc/pch/precompiled_sdui.hxx b/sd/inc/pch/precompiled_sdui.hxx
index dd6dc1a1ce3c..1a323669d41d 100644
--- a/sd/inc/pch/precompiled_sdui.hxx
+++ b/sd/inc/pch/precompiled_sdui.hxx
@@ -165,7 +165,6 @@
 #include <vcl/outdev.hxx>
 #include <vcl/outdevmap.hxx>
 #include <vcl/outdevstate.hxx>
-#include <vcl/pointr.hxx>
 #include <vcl/print.hxx>
 #include <vcl/prntypes.hxx>
 #include <vcl/ptrstyle.hxx>
diff --git a/sd/source/ui/annotations/annotationwindow.cxx b/sd/source/ui/annotations/annotationwindow.cxx
index 69a03e0712ef..621ea1d45502 100644
--- a/sd/source/ui/annotations/annotationwindow.cxx
+++ b/sd/source/ui/annotations/annotationwindow.cxx
@@ -66,6 +66,7 @@
 #include <vcl/gradient.hxx>
 #include <vcl/cursor.hxx>
 #include <vcl/settings.hxx>
+#include <vcl/ptrstyle.hxx>
 
 #include <tools/helpers.hxx>
 
@@ -296,7 +297,7 @@ void AnnotationWindow::InitControls()
 {
     // actual window which holds the user text
     mpTextWindow = VclPtr<AnnotationTextWindow>::Create(this, WB_NODIALOGCONTROL);
-    mpTextWindow->SetPointer(Pointer(PointerStyle::Text));
+    mpTextWindow->SetPointer(PointerStyle::Text);
 
     // window control for author and date
     mpMeta = VclPtr<MultiLineEdit>::Create(this,0);
diff --git a/sd/source/ui/func/fuconuno.cxx b/sd/source/ui/func/fuconuno.cxx
index 0458a8724de8..a2f345c25e94 100644
--- a/sd/source/ui/func/fuconuno.cxx
+++ b/sd/source/ui/func/fuconuno.cxx
@@ -28,6 +28,7 @@
 #include <svx/fmglob.hxx>
 
 #include <svx/dialogs.hrc>
+#include <vcl/ptrstyle.hxx>
 
 #include <app.hrc>
 #include <strings.hrc>
@@ -117,7 +118,7 @@ void FuConstructUnoControl::Activate()
 {
     mpView->SetCurrentObj( nIdentifier, nInventor );
 
-    aNewPointer = Pointer(PointerStyle::DrawRect);
+    aNewPointer = 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 2ecc44fe0a20..265915ec671f 100644
--- a/sd/source/ui/func/fudraw.cxx
+++ b/sd/source/ui/func/fudraw.cxx
@@ -21,6 +21,7 @@
 
 #include <editeng/eeitem.hxx>
 #include <vcl/waitobj.hxx>
+#include <vcl/ptrstyle.hxx>
 #include <editeng/flditem.hxx>
 #include <svx/svdogrp.hxx>
 #include <svx/svdoole2.hxx>
@@ -478,7 +479,7 @@ void FuDraw::ForcePointer(const MouseEvent* pMEvt)
         {
             // water can mode
             bDefPointer = false;
-            mpWindow->SetPointer(Pointer(PointerStyle::Fill));
+            mpWindow->SetPointer(PointerStyle::Fill);
         }
     }
     else
@@ -489,7 +490,7 @@ void FuDraw::ForcePointer(const MouseEvent* pMEvt)
         {
             // water can mode
             bDefPointer = false;
-            mpWindow->SetPointer(Pointer(PointerStyle::Fill));
+            mpWindow->SetPointer(PointerStyle::Fill);
         }
         else if (!pHdl &&
                  mpViewShell->GetViewFrame()->HasChildWindow(SvxBmpMaskChildWindow::GetChildWindowId()))
@@ -500,7 +501,7 @@ void FuDraw::ForcePointer(const MouseEvent* pMEvt)
             if (pMask && pMask->IsEyedropping())
             {
                 bDefPointer = false;
-                mpWindow->SetPointer(Pointer(PointerStyle::RefHand));
+                mpWindow->SetPointer(PointerStyle::RefHand);
             }
         }
         else if (!mpView->IsAction())
@@ -526,7 +527,7 @@ void FuDraw::ForcePointer(const MouseEvent* pMEvt)
                 SdrObject* pObject = rMarkList.GetMark(0)->GetMarkedSdrObj();
                 if ((dynamic_cast<const E3dObject* >(pObject) !=  nullptr) && (rMarkList.GetMarkCount() == 1))
                 {
-                    mpWindow->SetPointer(Pointer(PointerStyle::Rotate));
+                    mpWindow->SetPointer(PointerStyle::Rotate);
                     bDefPointer = false;     // Otherwise it'll be called Joe's routine and the mousepointer will reconfigurate again
                 }
             }
@@ -551,7 +552,7 @@ void FuDraw::ForcePointer(const MouseEvent* pMEvt)
                 {
                     pObj = nullptr;
                     bDefPointer = false;
-                    mpWindow->SetPointer(Pointer(PointerStyle::Arrow));
+                    mpWindow->SetPointer(PointerStyle::Arrow);
                 }
             }
 
@@ -648,7 +649,7 @@ bool FuDraw::SetPointer(SdrObject* pObj, const Point& rPos)
                     {
                         // Animation object
                         bSet = true;
-                        mpWindow->SetPointer(Pointer(PointerStyle::RefHand));
+                        mpWindow->SetPointer(PointerStyle::RefHand);
                     }
             }
             else if (bImageMapInfo &&
@@ -658,7 +659,7 @@ bool FuDraw::SetPointer(SdrObject* pObj, const Point& rPos)
                 * ImageMap
                 ******************************************************/
                 bSet = true;
-                mpWindow->SetPointer(Pointer(PointerStyle::RefHand));
+                mpWindow->SetPointer(PointerStyle::RefHand);
             }
         }
     }
diff --git a/sd/source/ui/func/fudspord.cxx b/sd/source/ui/func/fudspord.cxx
index 369fb95423f8..2157ba57b9ba 100644
--- a/sd/source/ui/func/fudspord.cxx
+++ b/sd/source/ui/func/fudspord.cxx
@@ -20,7 +20,7 @@
 #include <fudspord.hxx>
 
 #include <svx/svxids.hrc>
-#include <vcl/pointr.hxx>
+#include <vcl/ptrstyle.hxx>
 
 #include <app.hrc>
 #include <fupoor.hxx>
@@ -119,7 +119,7 @@ bool FuDisplayOrder::MouseButtonUp(const MouseEvent& rMEvt)
 void FuDisplayOrder::Activate()
 {
     maPtr = mpWindow->GetPointer();
-    mpWindow->SetPointer( Pointer( PointerStyle::RefHand ) );
+    mpWindow->SetPointer( PointerStyle::RefHand );
 }
 
 void FuDisplayOrder::Deactivate()
diff --git a/sd/source/ui/func/fuformatpaintbrush.cxx b/sd/source/ui/func/fuformatpaintbrush.cxx
index 3781cf0322de..3af7592c1fbb 100644
--- a/sd/source/ui/func/fuformatpaintbrush.cxx
+++ b/sd/source/ui/func/fuformatpaintbrush.cxx
@@ -30,6 +30,7 @@
 #include <editeng/outliner.hxx>
 #include <editeng/eeitem.hxx>
 #include <editeng/editeng.hxx>
+#include <vcl/ptrstyle.hxx>
 
 #include <sdmod.hxx>
 
@@ -152,7 +153,7 @@ bool FuFormatPaintBrush::MouseMove(const MouseEvent& rMEvt)
         if ( mpView->IsTextEdit() )
         {
             bReturn = FuText::MouseMove( rMEvt );
-            mpWindow->SetPointer(Pointer(PointerStyle::Fill));
+            mpWindow->SetPointer(PointerStyle::Fill);
         }
         else
         {
@@ -160,9 +161,9 @@ bool FuFormatPaintBrush::MouseMove(const MouseEvent& rMEvt)
             SdrPageView* pPV=nullptr;
             SdrObject* pObj = mpView->PickObj(mpWindow->PixelToLogic( rMEvt.GetPosPixel() ),nHitLog, pPV, SdrSearchOptions::PICKMARKABLE);
             if (pObj && HasContentForThisType(pObj->GetObjInventor(),pObj->GetObjIdentifier()) )
-                mpWindow->SetPointer(Pointer(PointerStyle::Fill));
+                mpWindow->SetPointer(PointerStyle::Fill);
             else
-                mpWindow->SetPointer(Pointer(PointerStyle::Arrow));
+                mpWindow->SetPointer(PointerStyle::Arrow);
         }
     }
     return bReturn;
diff --git a/sd/source/ui/func/fuzoom.cxx b/sd/source/ui/func/fuzoom.cxx
index e71452847a9d..fc4489989298 100644
--- a/sd/source/ui/func/fuzoom.cxx
+++ b/sd/source/ui/func/fuzoom.cxx
@@ -24,6 +24,7 @@
 #include <sfx2/viewfrm.hxx>
 #include <app.hrc>
 #include <svx/svdpagv.hxx>
+#include <vcl/ptrstyle.hxx>
 
 #include <FrameView.hxx>
 #include <ViewShell.hxx>
@@ -90,9 +91,9 @@ bool FuZoom::MouseButtonDown(const MouseEvent& rMEvt)
 bool FuZoom::MouseMove(const MouseEvent& rMEvt)
 {
     if (rMEvt.IsShift())
-        mpWindow->SetPointer(Pointer(PointerStyle::Hand));
+        mpWindow->SetPointer(PointerStyle::Hand);
     else if (nSlotId != SID_ZOOM_PANNING)
-        mpWindow->SetPointer(Pointer(PointerStyle::Magnify));
+        mpWindow->SetPointer(PointerStyle::Magnify);
 
     if (bStartDrag)
     {
@@ -197,11 +198,11 @@ void FuZoom::Activate()
 
     if (nSlotId == SID_ZOOM_PANNING)
     {
-        mpWindow->SetPointer(Pointer(PointerStyle::Hand));
+        mpWindow->SetPointer(PointerStyle::Hand);
     }
     else
     {
-        mpWindow->SetPointer(Pointer(PointerStyle::Magnify));
+        mpWindow->SetPointer(PointerStyle::Magnify);
     }
 }
 
diff --git a/sd/source/ui/inc/fudraw.hxx b/sd/source/ui/inc/fudraw.hxx
index 64bcde950f80..11158738ff82 100644
--- a/sd/source/ui/inc/fudraw.hxx
+++ b/sd/source/ui/inc/fudraw.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_SD_SOURCE_UI_INC_FUDRAW_HXX
 #define INCLUDED_SD_SOURCE_UI_INC_FUDRAW_HXX
 
-#include <vcl/pointr.hxx>
 #include "fupoor.hxx"
 
 struct SdrViewEvent;
@@ -70,8 +69,8 @@ protected:
 
     virtual ~FuDraw() override;
 
-    Pointer aNewPointer;
-    Pointer aOldPointer;
+    PointerStyle aNewPointer;
+    PointerStyle aOldPointer;
     bool    bMBDown;
     bool    bDragHelpLine;
     sal_uInt16  nHelpLine;
diff --git a/sd/source/ui/inc/fudspord.hxx b/sd/source/ui/inc/fudspord.hxx
index 38534115b31b..8984cd5dee22 100644
--- a/sd/source/ui/inc/fudspord.hxx
+++ b/sd/source/ui/inc/fudspord.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_SD_SOURCE_UI_INC_FUDSPORD_HXX
 
 #include "fupoor.hxx"
-#include <vcl/pointr.hxx>
 
 class SdrDropMarkerOverlay;
 class SdrObject;
@@ -47,7 +46,7 @@ private:
     virtual ~FuDisplayOrder() override;
     void implClearOverlay();
 
-    Pointer                 maPtr;
+    PointerStyle            maPtr;
     SdrObject*              mpRefObj;
     std::unique_ptr<SdrDropMarkerOverlay> mpOverlay;
 
diff --git a/sd/source/ui/inc/fuzoom.hxx b/sd/source/ui/inc/fuzoom.hxx
index 1dfefb204735..50d15b029ce7 100644
--- a/sd/source/ui/inc/fuzoom.hxx
+++ b/sd/source/ui/inc/fuzoom.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_SD_SOURCE_UI_INC_FUZOOM_HXX
 #define INCLUDED_SD_SOURCE_UI_INC_FUZOOM_HXX
 
-#include <vcl/pointr.hxx>
 #include "fupoor.hxx"
 
 namespace sd {
@@ -51,7 +50,7 @@ private:
     ::tools::Rectangle   aZoomRect;
     bool        bVisible;
     bool        bStartDrag;
-    Pointer     aPtr;
+    PointerStyle aPtr;
 
     FuZoom (
         ViewShell* pViewSh,
diff --git a/sd/source/ui/inc/unomodel.hxx b/sd/source/ui/inc/unomodel.hxx
index b072bf303d6c..d13109d0667e 100644
--- a/sd/source/ui/inc/unomodel.hxx
+++ b/sd/source/ui/inc/unomodel.hxx
@@ -260,7 +260,7 @@ public:
     /// @see vcl::ITiledRenderable::isMimeTypeSupported().
     virtual bool isMimeTypeSupported() override;
     /// @see vcl::ITiledRenderable::getPointer().
-    virtual Pointer getPointer() override;
+    virtual PointerStyle getPointer() override;
     /// @see vcl::ITiledRenderable::getPostIts().
     virtual OUString getPostIts() override;
 
diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
index 4a3b066665b1..22b7019a7b9d 100644
--- a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
@@ -61,6 +61,7 @@
 #include <sfx2/dispatch.hxx>
 #include <svx/svdpagv.hxx>
 #include <svx/svxids.hrc>
+#include <vcl/ptrstyle.hxx>
 #include <boost/optional.hpp>
 #include <sdmod.hxx>
 
@@ -254,7 +255,7 @@ protected:
 private:
     SelectionMode meSelectionMode;
     Point maSecondCorner;
-    Pointer const maSavedPointer;
+    PointerStyle const maSavedPointer;
     bool mbAutoScrollInstalled;
     sal_Int32 mnAnchorIndex;
     sal_Int32 mnSecondIndex;
@@ -1253,8 +1254,7 @@ MultiSelectionModeHandler::MultiSelectionModeHandler (
 void MultiSelectionModeHandler::Initialize(const sal_uInt32 nEventCode)
 {
 #endif
-    const Pointer aSelectionPointer (PointerStyle::Text);
-    mrSlideSorter.GetContentWindow()->SetPointer(aSelectionPointer);
+    mrSlideSorter.GetContentWindow()->SetPointer(PointerStyle::Text);
     SetSelectionModeFromModifier(nEventCode);
 }
 
diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx
index 457afdffdefa..927f33e44eef 100644
--- a/sd/source/ui/unoidl/unomodel.cxx
+++ b/sd/source/ui/unoidl/unomodel.cxx
@@ -2667,16 +2667,16 @@ bool SdXImpressDocument::isMimeTypeSupported()
     return EditEngine::HasValidData(aDataHelper.GetTransferable());
 }
 
-Pointer SdXImpressDocument::getPointer()
+PointerStyle SdXImpressDocument::getPointer()
 {
     SolarMutexGuard aGuard;
     DrawViewShell* pViewShell = GetViewShell();
     if (!pViewShell)
-        return Pointer();
+        return PointerStyle::Arrow;
 
     Window* pWindow = pViewShell->GetActiveWindow();
     if (!pWindow)
-        return Pointer();
+        return PointerStyle::Arrow;
 
     return pWindow->GetPointer();
 }
diff --git a/sd/source/ui/view/viewoverlaymanager.cxx b/sd/source/ui/view/viewoverlaymanager.cxx
index e4c450a10f29..0a23a60119cc 100644
--- a/sd/source/ui/view/viewoverlaymanager.cxx
+++ b/sd/source/ui/view/viewoverlaymanager.cxx
@@ -27,6 +27,7 @@
 
 #include <vcl/help.hxx>
 #include <vcl/lazydelete.hxx>
+#include <vcl/ptrstyle.hxx>
 
 #include <svx/sdrpagewindow.hxx>
 #include <svx/sdrpaintwindow.hxx>
@@ -141,7 +142,7 @@ public:
     virtual ~ImageButtonHdl() override;
     virtual void CreateB2dIAObject() override;
     virtual bool IsFocusHdl() const override;
-    virtual Pointer GetPointer() const override;
+    virtual PointerStyle GetPointer() const override;
     virtual bool isMarkable() const override;
 
     virtual void onMouseEnter(const MouseEvent& rMEvt) override;
@@ -298,9 +299,9 @@ bool ImageButtonHdl::isMarkable() const
     return false;
 }
 
-Pointer ImageButtonHdl::GetPointer() const
+PointerStyle ImageButtonHdl::GetPointer() const
 {
-    return Pointer( PointerStyle::Arrow );
+    return PointerStyle::Arrow;
 }
 
 ChangePlaceholderTag::ChangePlaceholderTag( ::sd::View& rView, SdrObject& rPlaceholderObj )