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

5 files changed, 7 insertions, 7 deletions

diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index 050c254031f2..3e5021943c57 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -987,7 +987,7 @@ void ScInputHandler::ShowTip( const OUString& rText )
     {
         Point aPos;
         pTipVisibleParent = pActiveView->GetWindow();
-        Cursor* pCur = pActiveView->GetCursor();
+        vcl::Cursor* pCur = pActiveView->GetCursor();
         if (pCur)
             aPos = pTipVisibleParent->LogicToPixel( pCur->GetPos() );
         aPos = pTipVisibleParent->OutputToScreenPixel( aPos );
@@ -1008,7 +1008,7 @@ void ScInputHandler::ShowTipBelow( const OUString& rText )
     {
         Point aPos;
         pTipVisibleSecParent = pActiveView->GetWindow();
-        Cursor* pCur = pActiveView->GetCursor();
+        vcl::Cursor* pCur = pActiveView->GetCursor();
         if ( pCur )
         {
             Point aLogicPos = pCur->GetPos();
diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index a2e557ee272a..37cf7d53a977 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -2324,7 +2324,7 @@ void ScPosWnd::Modify()
             if (!pWin)
                 pWin = this;
             Point aPos;
-            Cursor* pCur = pWin->GetCursor();
+            vcl::Cursor* pCur = pWin->GetCursor();
             if (pCur)
                 aPos = pWin->LogicToPixel( pCur->GetPos() );
             aPos = pWin->OutputToScreenPixel( aPos );
diff --git a/sc/source/ui/drawfunc/futext3.cxx b/sc/source/ui/drawfunc/futext3.cxx
index 02bce31804f2..c9aa6204415e 100644
--- a/sc/source/ui/drawfunc/futext3.cxx
+++ b/sc/source/ui/drawfunc/futext3.cxx
@@ -114,7 +114,7 @@ void FuText::StopEditMode(bool /*bTextDirection*/)
     // or ScEndTextEdit (with drawview.hxx)
     pViewShell->SetDrawTextUndo( 0 );
 
-    Cursor* pCur = pWindow->GetCursor();
+    vcl::Cursor* pCur = pWindow->GetCursor();
     if( pCur && pCur->IsVisible() )
         pCur->Hide();
 
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 7055bef0f397..48e82b69785c 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -3041,7 +3041,7 @@ void ScGridWindow::Command( const CommandEvent& rCEvt )
 
             if ( !bMouse )
             {
-                Cursor* pCur = pEditView->GetCursor();
+                vcl::Cursor* pCur = pEditView->GetCursor();
                 if ( pCur )
                 {
                     Point aLogicPos = pCur->GetPos();
diff --git a/sc/source/ui/view/tabview3.cxx b/sc/source/ui/view/tabview3.cxx
index 50066ba15be2..8bba5896dc18 100644
--- a/sc/source/ui/view/tabview3.cxx
+++ b/sc/source/ui/view/tabview3.cxx
@@ -156,7 +156,7 @@ void ScTabView::HideAllCursors()
         if (pGridWin[i])
             if (pGridWin[i]->IsVisible())
             {
-                Cursor* pCur = pGridWin[i]->GetCursor();
+                vcl::Cursor* pCur = pGridWin[i]->GetCursor();
                 if (pCur)
                     if (pCur->IsVisible())
                         pCur->Hide();
@@ -1897,7 +1897,7 @@ void ScTabView::KillEditView( bool bNoPaint )
     for (i=0; i<4; i++)
         if (pGridWin[i] && pGridWin[i]->IsVisible())
         {
-            Cursor* pCur = pGridWin[i]->GetCursor();
+            vcl::Cursor* pCur = pGridWin[i]->GetCursor();
             if (pCur && pCur->IsVisible())
                 pCur->Hide();