fdo#82577, fdo#82579: Handle Cursor

Put the vcl Cursor in the vcl namespace. Avoids collision with the Xlib Cursor
typedef and some ancient Carbon (?) Cursor typedef on OS X.

Change-Id: I7af770c522b5774c87f58cc079ced9fc1bcc88b0

3 files changed, 9 insertions, 9 deletions

diff --git a/editeng/source/editeng/editview.cxx b/editeng/source/editeng/editview.cxx
index 1fc355911daa..a908480e74d0 100644
--- a/editeng/source/editeng/editview.cxx
+++ b/editeng/source/editeng/editview.cxx
@@ -321,7 +321,7 @@ const Pointer& EditView::GetPointer() const
     return pImpEditView->GetPointer();
 }
 
-Cursor* EditView::GetCursor() const
+vcl::Cursor* EditView::GetCursor() const
 {
     return pImpEditView->pCursor;
 }
diff --git a/editeng/source/editeng/impedit.cxx b/editeng/source/editeng/impedit.cxx
index 8a484fe06244..e45abb4213b3 100644
--- a/editeng/source/editeng/impedit.cxx
+++ b/editeng/source/editeng/impedit.cxx
@@ -948,7 +948,7 @@ Pair ImpEditView::Scroll( long ndX, long ndY, sal_uInt8 nRangeCheck )
 
     if ( nRealDiffX || nRealDiffY )
     {
-        Cursor* pCrsr = GetCursor();
+        vcl::Cursor* pCrsr = GetCursor();
         bool bVisCursor = pCrsr->IsVisible();
         pCrsr->Hide();
         pOutWin->Update();
diff --git a/editeng/source/editeng/impedit.hxx b/editeng/source/editeng/impedit.hxx
index 6a193892e23d..11935c3dd8bc 100644
--- a/editeng/source/editeng/impedit.hxx
+++ b/editeng/source/editeng/impedit.hxx
@@ -212,7 +212,7 @@ class ImpEditView : public vcl::unohelper::DragAndDropClient
 
 private:
     EditView*           pEditView;
-    Cursor*             pCursor;
+    vcl::Cursor*        pCursor;
     Color*              pBackgroundColor;
     EditEngine*         pEditEngine;
     Window*             pOutWin;
@@ -318,8 +318,8 @@ public:
     inline void     SetPointer( const Pointer& rPointer );
     inline const Pointer&   GetPointer();
 
-    inline void     SetCursor( const Cursor& rCursor );
-    inline Cursor*  GetCursor();
+    inline void     SetCursor( const vcl::Cursor& rCursor );
+    inline vcl::Cursor*     GetCursor();
 
     void            AddDragAndDropListeners();
     void            RemoveDragAndDropListeners();
@@ -1199,16 +1199,16 @@ inline const Pointer& ImpEditView::GetPointer()
     return *pPointer;
 }
 
-inline void ImpEditView::SetCursor( const Cursor& rCursor )
+inline void ImpEditView::SetCursor( const vcl::Cursor& rCursor )
 {
     delete pCursor;
-    pCursor = new Cursor( rCursor );
+    pCursor = new vcl::Cursor( rCursor );
 }
 
-inline Cursor* ImpEditView::GetCursor()
+inline vcl::Cursor* ImpEditView::GetCursor()
 {
     if ( !pCursor )
-        pCursor = new Cursor;
+        pCursor = new vcl::Cursor;
     return pCursor;
 }