mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

The macOS SDK 10.15 has a tighter declaration of objc_msgSend()

Browse Source 
Change-Id: I51734b92965a9fa1f06aa18017d39b4b0d532456
This commit is contained in:
Tor Lillqvist
2019-06-05 01:17:56 +03:00
parent 4378eae8aa
commit 4d3628ca76
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
extensions/source/macosx/spotlight/OOoContentDataParser.m
View File

@@ -52,7 +52,7 @@
// So instead of this: // So instead of this:
// [parser setDelegate:self]; // [parser setDelegate:self];
// do this: // do this:
objc_msgSend(parser, @selector(setDelegate:), self); ((id (*)(id, SEL, ...))objc_msgSend)(parser, @selector(setDelegate:), self);
[parser setShouldResolveExternalEntities:NO]; [parser setShouldResolveExternalEntities:NO];
[parser parse]; [parser parse];

2
extensions/source/macosx/spotlight/OOoMetaDataParser.m
View File

@@ -95,7 +95,7 @@ static NSDictionary *metaXML2MDIKeys;
// So instead of this: // So instead of this:
// [parser setDelegate:self]; // [parser setDelegate:self];
// do this: // do this:
objc_msgSend(parser, @selector(setDelegate:), self); ((id (*)(id, SEL, ...))objc_msgSend)(parser, @selector(setDelegate:), self);
[parser setShouldResolveExternalEntities:NO]; [parser setShouldResolveExternalEntities:NO];
[parser parse]; [parser parse];

2
fpicker/source/aqua/SalAquaFilePicker.mm
View File

@@ -162,7 +162,7 @@ sal_Int16 SAL_CALL SalAquaFilePicker::execute()
// So instead of: // So instead of:
// [m_pDialog setDelegate:m_pDelegate]; // [m_pDialog setDelegate:m_pDelegate];
// do: // do:
objc_msgSend(m_pDialog, @selector(setDelegate:), m_pDelegate); ((id (*)(id, SEL, ...))objc_msgSend)(m_pDialog, @selector(setDelegate:), m_pDelegate);
int nStatus = runandwaitforresult(); int nStatus = runandwaitforresult();

4
sfx2/source/appl/shutdowniconaqua.mm
View File

@@ -351,7 +351,7 @@ static void appendRecentMenu( NSMenu* i_pMenu, NSMenu* i_pDockMenu, const OUStri
// confused. Anyway, to avoid warnings, instead of this: // confused. Anyway, to avoid warnings, instead of this:
// [pRecentMenu setDelegate: pRecentDelegate]; // [pRecentMenu setDelegate: pRecentDelegate];
// do this: // do this:
objc_msgSend(pRecentMenu, @selector(setDelegate:), pRecentDelegate); ((id (*)(id, SEL, ...))objc_msgSend)(pRecentMenu, @selector(setDelegate:), pRecentDelegate);
[pRecentMenu setAutoenablesItems: NO]; [pRecentMenu setAutoenablesItems: NO];
[pItem setSubmenu: pRecentMenu]; [pItem setSubmenu: pRecentMenu];
@@ -368,7 +368,7 @@ static void appendRecentMenu( NSMenu* i_pMenu, NSMenu* i_pDockMenu, const OUStri
// See above // See above
// [pRecentMenu setDelegate: pRecentDelegate]; // [pRecentMenu setDelegate: pRecentDelegate];
objc_msgSend(pRecentMenu, @selector(setDelegate:), pRecentDelegate); ((id (*)(id, SEL, ...))objc_msgSend)(pRecentMenu, @selector(setDelegate:), pRecentDelegate);
[pRecentMenu setAutoenablesItems: NO]; [pRecentMenu setAutoenablesItems: NO];
[pItem setSubmenu: pRecentMenu]; [pItem setSubmenu: pRecentMenu];