From b144821188aac238a38d647dff489fc53d9bf3f6 Mon Sep 17 00:00:00 2001
From: Matthew Francis <mjay.francis@gmail.com>
Date: Wed, 15 Apr 2015 13:57:48 +0800
Subject: tdf#71278 Revert both the previous cursor commit and the commit it
fixed
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.
Reverts:
commit 58a3a99efec9d4bcb4ab61c41bf2feb707c8e1ef
Author: Matthew Francis <mjay.francis@gmail.com>
Date: Sun Apr 12 23:10:58 2015 +0800
tdf#71278 Set an invisible cursor rather than hiding the cursor
commit 8d351c59d4393aa37ab38139b3a741f15a49dbfe
Author: jorendc <joren.libreoffice@telenet.be>
Date: Sun Apr 14 00:33:19 2013 +0200
fdo#31082 cursor visible during impress presentation
Change-Id: Ie40882661dc1a2f4857027ff04393874042e04ec
Reviewed-on: https://gerrit.libreoffice.org/15316
Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
---
vcl/osx/salframe.cxx | 13 -------------
1 file changed, 13 deletions(-)
diff --git a/vcl/osx/salframe.cxx b/vcl/osx/salframe.cxx
index 202c2eefe1cb..da85f00ca705 100644
--- a/vcl/osx/salframe.cxx
+++ b/vcl/osx/salframe.cxx
@@ -802,18 +802,6 @@ void AquaSalFrame::ToTop(sal_uInt16 nFlags)
NSCursor* AquaSalFrame::getCurrentCursor() const
{
- /* Create invisible cursor */
- static NSCursor *invisibleCursor = NULL;
- if (!invisibleCursor) {
- NSImage *cursorImage = [[[NSImage alloc] initWithSize:NSMakeSize (16, 16)] autorelease];
- [cursorImage lockFocus];
- [[NSColor clearColor] set];
- NSRectFill( NSMakeRect( 0, 0, 16, 16 ) );
- [cursorImage unlockFocus];
- invisibleCursor = [[NSCursor alloc] initWithImage:cursorImage
- hotSpot:NSZeroPoint];
- }
-
NSCursor* pCursor = nil;
switch( mePointerStyle )
{
@@ -837,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: pCursor = invisibleCursor; break;
default:
pCursor = GetSalData()->getCursor( mePointerStyle );
--
cgit