apple_remote/inc/apple_remote/RemoteControl.h | 3 +++
apple_remote/inc/apple_remote/RemoteMainController.h | 3 +++
apple_remote/source/AppleRemote.h | 3 +++
apple_remote/source/AppleRemote.m | 3 +++
apple_remote/source/GlobalKeyboardDevice.h | 3 +++
apple_remote/source/GlobalKeyboardDevice.m | 3 +++
apple_remote/source/HIDRemoteControlDevice.h | 3 +++
apple_remote/source/HIDRemoteControlDevice.m | 2 ++
apple_remote/source/KeyspanFrontRowControl.h | 3 +++
apple_remote/source/KeyspanFrontRowControl.m | 3 +++
apple_remote/source/MultiClickRemoteBehavior.h | 3 +++
apple_remote/source/MultiClickRemoteBehavior.m | 3 +++
apple_remote/source/RemoteControl.m | 5 +++--
apple_remote/source/RemoteControlContainer.h | 3 +++
apple_remote/source/RemoteControlContainer.m | 3 +++
apple_remote/source/RemoteMainController.m | 3 +++
16 files changed, 47 insertions(+), 2 deletions(-)
New commits:
commit fbd82ae8835adf40930be35e7cf14ce812786224
Author: Tor Lillqvist <t...@iki.fi>
Date: Tue May 8 00:03:53 2012 +0300
Bin a line of apparently meaningless and wrong Mac OS X code
When LibreOffice is compiled against the 10.6 SDK and run under gdb,
the apple_remote code caused "cannot init a class object" exception
messages to be printed.
Upon closer inspection this was caused by the call to [super init] in
the sendDistributedNotification class method of the RemoteControl
class.
As far as I understand, calling [super init] and assigning its return
value to self, even, is pointless and wrong in a class method.
This code apparently has not been causing any harm when built against
the 10.4 SDK. This is probably just accidental thanks to a more
lenient Objective-C runtime getting used?
When built against the 10.6 SDK, though, the resulting Objective-C
exception seemed to make input event handling non-functional. After
this fix LibreOffice built this way works better.
Change-Id: I I I383611753f3f83a9efa4694b1900c8b66ed1a8e3
diff --git a/apple_remote/source/RemoteControl.m
b/apple_remote/source/RemoteControl.m
index 49aacd4..36f7ffe 100644
--- a/apple_remote/source/RemoteControl.m
+++ b/apple_remote/source/RemoteControl.m
@@ -103,7 +103,6 @@ NSString* kTargetApplicationIdentifier =
@"TargetBundleIdentifier";
+ (void) sendDistributedNotification: (NSString*) notificationName
targetBundleIdentifier: (NSString*) targetIdentifier
{
- if ( (self = [super init]) ) {
NSDictionary* userInfo = [NSDictionary dictionaryWithObjectsAndKeys:
[NSString stringWithCString:[self remoteControlDeviceName]
encoding:NSASCIIStringEncoding],
kRemoteControlDeviceName /* key =
RemoteControlDeviceName -> OK */,
[[NSBundle mainBundle] bundleIdentifier] /* value
= org.openoffice.script -> OK */,
@@ -129,7 +128,6 @@ NSString* kTargetApplicationIdentifier =
@"TargetBundleIdentifier";
object:nil
userInfo:userInfo
deliverImmediately:YES];
- }
}
+ (void) sendFinishedNotifcationForAppIdentifier: (NSString*) identifier {
commit 8701f5ef0591bdb7746f19fe94ba27632e983347
Author: Tor Lillqvist <t...@iki.fi>
Date: Mon May 7 23:57:21 2012 +0300
Add Emacs and vim mode lines
Change-Id: I8ccb7be448faf42904eb6246a4f5a06ff8028ffc
diff --git a/apple_remote/inc/apple_remote/RemoteControl.h
b/apple_remote/inc/apple_remote/RemoteControl.h
index 4476af2..cffc631 100644
--- a/apple_remote/inc/apple_remote/RemoteControl.h
+++ b/apple_remote/inc/apple_remote/RemoteControl.h
@@ -1,3 +1,4 @@
+/* -*- Mode: ObjC; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
*/
/*****************************************************************************
* RemoteControl.h
* RemoteControlWrapper
@@ -118,3 +119,5 @@ typedef enum _RemoteControlEventIdentifier {
+ (const char*) remoteControlDeviceName;
@end
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/apple_remote/inc/apple_remote/RemoteMainController.h
b/apple_remote/inc/apple_remote/RemoteMainController.h
index 1674540..4949877 100644
--- a/apple_remote/inc/apple_remote/RemoteMainController.h
+++ b/apple_remote/inc/apple_remote/RemoteMainController.h
@@ -1,3 +1,4 @@
+/* -*- Mode: ObjC; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
*/
/*****************************************************************************
* RemoteMainController.h
*
@@ -57,3 +58,5 @@ typedef int NSColorRenderingIntent;
- (MultiClickRemoteBehavior*) remoteBehavior;
@end
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/apple_remote/source/AppleRemote.h
b/apple_remote/source/AppleRemote.h
index 509ddaa..692a1a6 100644
--- a/apple_remote/source/AppleRemote.h
+++ b/apple_remote/source/AppleRemote.h
@@ -1,3 +1,4 @@
+/* -*- Mode: ObjC; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
*/
/*****************************************************************************
* RemoteControlWrapper.h
* RemoteControlWrapper
@@ -48,3 +49,5 @@ typedef int NSColorRenderingIntent;
}
@end
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/apple_remote/source/AppleRemote.m
b/apple_remote/source/AppleRemote.m
index 95d8835..c1a87c3 100644
--- a/apple_remote/source/AppleRemote.m
+++ b/apple_remote/source/AppleRemote.m
@@ -1,3 +1,4 @@
+/* -*- Mode: ObjC; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
*/
/*****************************************************************************
* RemoteControlWrapper.m
* RemoteControlWrapper
@@ -126,3 +127,5 @@ const char* AppleRemoteDeviceName = "AppleIRController";
}
@end
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/apple_remote/source/GlobalKeyboardDevice.h
b/apple_remote/source/GlobalKeyboardDevice.h
index 6a8a052..752b1ee 100644
--- a/apple_remote/source/GlobalKeyboardDevice.h
+++ b/apple_remote/source/GlobalKeyboardDevice.h
@@ -1,3 +1,4 @@
+/* -*- Mode: ObjC; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
*/
/*****************************************************************************
* GlobalKeyboardDevice.h
* RemoteControlWrapper
@@ -51,3 +52,5 @@
@end
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/apple_remote/source/GlobalKeyboardDevice.m
b/apple_remote/source/GlobalKeyboardDevice.m
index 2fd6156..27322d2 100644
--- a/apple_remote/source/GlobalKeyboardDevice.m
+++ b/apple_remote/source/GlobalKeyboardDevice.m
@@ -1,3 +1,4 @@
+/* -*- Mode: ObjC; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
*/
/*****************************************************************************
* GlobalKeyboardDevice.m
* RemoteControlWrapper
@@ -251,3 +252,5 @@ static OSStatus hotKeyEventHandler(EventHandlerCallRef
inHandlerRef, EventRef in
}
@end
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/apple_remote/source/HIDRemoteControlDevice.h
b/apple_remote/source/HIDRemoteControlDevice.h
index d193472..be975fb 100644
--- a/apple_remote/source/HIDRemoteControlDevice.h
+++ b/apple_remote/source/HIDRemoteControlDevice.h
@@ -1,3 +1,4 @@
+/* -*- Mode: ObjC; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
*/
/*****************************************************************************
* HIDRemoteControlDevice.h
* RemoteControlWrapper
@@ -64,3 +65,5 @@
+ (BOOL) isRemoteAvailable;
@end
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/apple_remote/source/HIDRemoteControlDevice.m
b/apple_remote/source/HIDRemoteControlDevice.m
index a42a914..8883a18 100644
--- a/apple_remote/source/HIDRemoteControlDevice.m
+++ b/apple_remote/source/HIDRemoteControlDevice.m
@@ -1,3 +1,4 @@
+/* -*- Mode: ObjC; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
*/
/*****************************************************************************
* HIDRemoteControlDevice.m
* RemoteControlWrapper
@@ -533,3 +534,4 @@ static void QueueCallbackFunction(void* target, IOReturn
result, void* refcon,
@end
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/apple_remote/source/KeyspanFrontRowControl.h
b/apple_remote/source/KeyspanFrontRowControl.h
index 2469b58..d313ab0 100644
--- a/apple_remote/source/KeyspanFrontRowControl.h
+++ b/apple_remote/source/KeyspanFrontRowControl.h
@@ -1,3 +1,4 @@
+/* -*- Mode: ObjC; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
*/
/*****************************************************************************
* KeyspanFrontRowControl.h
* RemoteControlWrapper
@@ -50,3 +51,5 @@ typedef int NSColorRenderingIntent;
}
@end
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/apple_remote/source/KeyspanFrontRowControl.m
b/apple_remote/source/KeyspanFrontRowControl.m
index dd86475..0978738 100644
--- a/apple_remote/source/KeyspanFrontRowControl.m
+++ b/apple_remote/source/KeyspanFrontRowControl.m
@@ -1,3 +1,4 @@
+/* -*- Mode: ObjC; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
*/
/*****************************************************************************
* KeyspanFrontRowControl.m
* RemoteControlWrapper
@@ -95,3 +96,5 @@
}
@end
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/apple_remote/source/MultiClickRemoteBehavior.h
b/apple_remote/source/MultiClickRemoteBehavior.h
index 9cf2e7f..77320ea 100644
--- a/apple_remote/source/MultiClickRemoteBehavior.h
+++ b/apple_remote/source/MultiClickRemoteBehavior.h
@@ -1,3 +1,4 @@
+/* -*- Mode: ObjC; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
*/
/*****************************************************************************
* MultiClickRemoteBehavior.h
* RemoteControlWrapper
@@ -90,3 +91,5 @@
- (void) remoteButton: (RemoteControlEventIdentifier)buttonIdentifier
pressedDown: (BOOL) pressedDown clickCount: (unsigned int) count;
@end
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/apple_remote/source/MultiClickRemoteBehavior.m
b/apple_remote/source/MultiClickRemoteBehavior.m
index d0fd34c..1d624a7 100644
--- a/apple_remote/source/MultiClickRemoteBehavior.m
+++ b/apple_remote/source/MultiClickRemoteBehavior.m
@@ -1,3 +1,4 @@
+/* -*- Mode: ObjC; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
*/
/*****************************************************************************
* MultiClickRemoteBehavior.m
* RemoteControlWrapper
@@ -211,3 +212,5 @@ const NSTimeInterval HOLD_RECOGNITION_TIME_INTERVAL = 0.4;
}
@end
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/apple_remote/source/RemoteControl.m
b/apple_remote/source/RemoteControl.m
index f82a7e7..49aacd4 100644
--- a/apple_remote/source/RemoteControl.m
+++ b/apple_remote/source/RemoteControl.m
@@ -1,3 +1,4 @@
+/* -*- Mode: ObjC; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
*/
/*****************************************************************************
* RemoteControl.m
* RemoteControlWrapper
@@ -149,3 +150,5 @@ NSString* kTargetApplicationIdentifier =
@"TargetBundleIdentifier";
}
@end
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/apple_remote/source/RemoteControlContainer.h
b/apple_remote/source/RemoteControlContainer.h
index db70ee6..c3361f4 100644
--- a/apple_remote/source/RemoteControlContainer.h
+++ b/apple_remote/source/RemoteControlContainer.h
@@ -1,3 +1,4 @@
+/* -*- Mode: ObjC; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
*/
/*****************************************************************************
* RemoteControlContainer.h
* RemoteControlWrapper
@@ -38,3 +39,5 @@
- (unsigned int) count;
@end
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/apple_remote/source/RemoteControlContainer.m
b/apple_remote/source/RemoteControlContainer.m
index 04a4c6c..0ebf898 100644
--- a/apple_remote/source/RemoteControlContainer.m
+++ b/apple_remote/source/RemoteControlContainer.m
@@ -1,3 +1,4 @@
+/* -*- Mode: ObjC; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
*/
/*****************************************************************************
* RemoteControlContainer.m
* RemoteControlWrapper
@@ -142,3 +143,5 @@
}
@end
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/apple_remote/source/RemoteMainController.m
b/apple_remote/source/RemoteMainController.m
index b7ed211..f926236 100644
--- a/apple_remote/source/RemoteMainController.m
+++ b/apple_remote/source/RemoteMainController.m
@@ -1,3 +1,4 @@
+/* -*- Mode: ObjC; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
*/
/*****************************************************************************
* RemoteMainController.m
*
@@ -167,3 +168,5 @@
}
@end
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
