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>

4 files changed, 15 insertions, 14 deletions

diff --git a/chart2/inc/pch/precompiled_chartcontroller.hxx b/chart2/inc/pch/precompiled_chartcontroller.hxx
index 1131205f270f..d74343b59568 100644
--- a/chart2/inc/pch/precompiled_chartcontroller.hxx
+++ b/chart2/inc/pch/precompiled_chartcontroller.hxx
@@ -151,7 +151,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/chart2/source/controller/main/ChartController_Window.cxx b/chart2/source/controller/main/ChartController_Window.cxx
index d8e7b3744352..d2c7dfbd69a3 100644
--- a/chart2/source/controller/main/ChartController_Window.cxx
+++ b/chart2/source/controller/main/ChartController_Window.cxx
@@ -75,6 +75,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/weld.hxx>
+#include <vcl/ptrstyle.hxx>
 #include <svtools/acceleratorexecute.hxx>
 #include <tools/diagnose_ex.h>
 #include <sal/log.hxx>
@@ -1864,7 +1865,7 @@ void ChartController::impl_SetMousePointer( const MouseEvent & rEvent )
     SdrObject* pObject = m_pDrawViewWrapper->getHitObject(aMousePos);
     if (pObject && pObject->GetName().startsWith("FieldButton"))
     {
-        pChartWindow->SetPointer(Pointer(PointerStyle::Arrow));
+        pChartWindow->SetPointer(PointerStyle::Arrow);
         return;
     }
 
@@ -1888,13 +1889,13 @@ void ChartController::impl_SetMousePointer( const MouseEvent & rEvent )
 
     if( pHitSelectionHdl )
     {
-        Pointer aPointer = m_pDrawViewWrapper->GetPreferredPointer(
+        PointerStyle aPointer = m_pDrawViewWrapper->GetPreferredPointer(
             aMousePos, pChartWindow, nModifier, bLeftDown );
         bool bForceArrowPointer = false;
 
         ObjectIdentifier aOID( m_aSelection.getSelectedOID() );
 
-        switch( aPointer.GetStyle())
+        switch( aPointer)
         {
             case PointerStyle::NSize:
             case PointerStyle::SSize:
@@ -1922,7 +1923,7 @@ void ChartController::impl_SetMousePointer( const MouseEvent & rEvent )
         }
 
         if( bForceArrowPointer )
-            pChartWindow->SetPointer( Pointer( PointerStyle::Arrow ));
+            pChartWindow->SetPointer( PointerStyle::Arrow );
         else
             pChartWindow->SetPointer( aPointer );
 
@@ -1974,7 +1975,7 @@ void ChartController::impl_SetMousePointer( const MouseEvent & rEvent )
                 }
                 break;
         }
-        pChartWindow->SetPointer( Pointer( ePointerStyle ) );
+        pChartWindow->SetPointer( ePointerStyle );
         return;
     }
 
@@ -1986,7 +1987,7 @@ void ChartController::impl_SetMousePointer( const MouseEvent & rEvent )
     {
         if( aHitObjectCID == m_aSelection.getSelectedCID() )
         {
-            pChartWindow->SetPointer( Pointer( PointerStyle::Arrow ));
+            pChartWindow->SetPointer( PointerStyle::Arrow );
             return;
         }
     }
@@ -2001,7 +2002,7 @@ void ChartController::impl_SetMousePointer( const MouseEvent & rEvent )
         if( (m_eDragMode == SdrDragMode::Rotate)
             && SelectionHelper::isRotateableObject( aHitObjectCID
                 , getModel() ) )
-            pChartWindow->SetPointer( Pointer( PointerStyle::Rotate ) );
+            pChartWindow->SetPointer( PointerStyle::Rotate );
         else
         {
             ObjectType eHitObjectType = ObjectIdentifier::getObjectType( aHitObjectCID );
@@ -2010,7 +2011,7 @@ void ChartController::impl_SetMousePointer( const MouseEvent & rEvent )
                 if( !ObjectIdentifier::areSiblings(aHitObjectCID,m_aSelection.getSelectedCID())
                     && !ObjectIdentifier::areIdenticalObjects(aHitObjectCID,m_aSelection.getSelectedCID()) )
                 {
-                    pChartWindow->SetPointer( Pointer( PointerStyle::Arrow ));
+                    pChartWindow->SetPointer( PointerStyle::Arrow );
                     return;
                 }
             }
@@ -2018,7 +2019,7 @@ void ChartController::impl_SetMousePointer( const MouseEvent & rEvent )
         }
     }
     else
-        pChartWindow->SetPointer( Pointer( PointerStyle::Arrow ));
+        pChartWindow->SetPointer( PointerStyle::Arrow );
 }
 
 css::uno::Reference<css::uno::XInterface> const & ChartController::getChartView()
diff --git a/chart2/source/controller/main/DragMethod_Base.cxx b/chart2/source/controller/main/DragMethod_Base.cxx
index d4f2971465cb..0ea306632448 100644
--- a/chart2/source/controller/main/DragMethod_Base.cxx
+++ b/chart2/source/controller/main/DragMethod_Base.cxx
@@ -25,6 +25,7 @@
 
 #include <svx/ActionDescriptionProvider.hxx>
 #include <com/sun/star/frame/XModel.hpp>
+#include <vcl/ptrstyle.hxx>
 
 namespace chart
 {
@@ -64,12 +65,12 @@ void DragMethod_Base::TakeSdrDragComment(OUString& rStr) const
 {
     rStr = getUndoDescription();
 }
-Pointer DragMethod_Base::GetSdrDragPointer() const
+PointerStyle DragMethod_Base::GetSdrDragPointer() const
 {
     if( IsDraggingPoints() || IsDraggingGluePoints() )
-        return Pointer(PointerStyle::MovePoint);
+        return PointerStyle::MovePoint;
     else
-        return Pointer(PointerStyle::Move);
+        return PointerStyle::Move;
 }
 } //namespace chart
 
diff --git a/chart2/source/controller/main/DragMethod_Base.hxx b/chart2/source/controller/main/DragMethod_Base.hxx
index d9fc78d72be9..03494044b032 100644
--- a/chart2/source/controller/main/DragMethod_Base.hxx
+++ b/chart2/source/controller/main/DragMethod_Base.hxx
@@ -40,7 +40,7 @@ public:
     OUString getUndoDescription() const;
 
     virtual void TakeSdrDragComment(OUString& rStr) const override;
-    virtual Pointer GetSdrDragPointer() const override;
+    virtual PointerStyle GetSdrDragPointer() const override;
 
 protected:
     css::uno::Reference< css::frame::XModel > getChartModel() const;