[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - vcl/osx

[Matthew Francis]

 vcl/osx/salframe.cxx |    1 -
 1 file changed, 1 deletion(-)

New commits:
commit 255884bd221d0521f5c99add4b9af8723668c300
Author: Matthew Francis <mjay.francis at gmail.com>
Date:   Mon Apr 20 12:33:48 2015 +0800

    tdf#71278 Fix cursor hiding in presentation mode
    
    The original commit was based on a misunderstanding. In fact, the call to
    GetSalData()->getCursor() at the end of AquaSalFrame::getCurrentCursor()
    already handles POINTER_NULL correctly, or at least in the same way as on
    other platforms. The cursor in presentation mode disappears after 10
    seconds - if this is to be changed, it should be changed for all platforms.
    
    (cherry picked from commit 58a3a99efec9d4bcb4ab61c41bf2feb707c8e1ef
    and commit b144821188aac238a38d647dff489fc53d9bf3f6)
    
    Change-Id: I6d468caa597afa39d17317a60b3dffc190165ac4
    Reviewed-on: https://gerrit.libreoffice.org/15395
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/osx/salframe.cxx b/vcl/osx/salframe.cxx
index 0f266db..4ff33e4 100644
--- a/vcl/osx/salframe.cxx
+++ b/vcl/osx/salframe.cxx
@@ -825,7 +825,6 @@ NSCursor* AquaSalFrame::getCurrentCursor() const
     case POINTER_WINDOW_WSIZE:
                             pCursor = [NSCursor resizeLeftRightCursor]; break;
     case POINTER_REFHAND:   pCursor = [NSCursor pointingHandCursor];    break;
-    case POINTER_NULL:      [NSCursor hide];                            break;
 
     default:
         pCursor = GetSalData()->getCursor( mePointerStyle );