[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - extensions/source fpicker/source sfx2/source

[Tor Lillqvist (via logerrit)]

 extensions/source/macosx/spotlight/OOoContentDataParser.m |    2 +-
 extensions/source/macosx/spotlight/OOoMetaDataParser.m    |    2 +-
 fpicker/source/aqua/SalAquaFilePicker.mm                  |    2 +-
 sfx2/source/appl/shutdowniconaqua.mm                      |    4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit b0994c2576b052df0d63aaaed5d205c171f8b1b3
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Wed Jun 5 01:17:56 2019 +0300
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Wed Oct 30 19:32:48 2019 +0100

    The macOS SDK 10.15 has a tighter declaration of objc_msgSend()
    
    Change-Id: I51734b92965a9fa1f06aa18017d39b4b0d532456
    (cherry picked from commit 4d3628ca769ce07c93e8c4629075eeb7c8dc317e)
    Reviewed-on: https://gerrit.libreoffice.org/81740
    Tested-by: Jenkins
    Reviewed-by: Tor Lillqvist <tml at collabora.com>
    Tested-by: Tor Lillqvist <tml at collabora.com>

diff --git a/extensions/source/macosx/spotlight/OOoContentDataParser.m b/extensions/source/macosx/spotlight/OOoContentDataParser.m
index 89d92a8c126a..d3ecf16ffaab 100644
--- a/extensions/source/macosx/spotlight/OOoContentDataParser.m
+++ b/extensions/source/macosx/spotlight/OOoContentDataParser.m
@@ -52,7 +52,7 @@
     // So instead of this:
     // [parser setDelegate:self];
     // do this:
-    objc_msgSend(parser, @selector(setDelegate:), self);
+    ((id (*)(id, SEL, ...))objc_msgSend)(parser, @selector(setDelegate:), self);
 
     [parser setShouldResolveExternalEntities:NO];
     [parser parse];
diff --git a/extensions/source/macosx/spotlight/OOoMetaDataParser.m b/extensions/source/macosx/spotlight/OOoMetaDataParser.m
index 4d2b95d72fff..2b4dac82c555 100644
--- a/extensions/source/macosx/spotlight/OOoMetaDataParser.m
+++ b/extensions/source/macosx/spotlight/OOoMetaDataParser.m
@@ -95,7 +95,7 @@ static NSDictionary *metaXML2MDIKeys;
     // So instead of this:
     // [parser setDelegate:self];
     // do this:
-    objc_msgSend(parser, @selector(setDelegate:), self);
+    ((id (*)(id, SEL, ...))objc_msgSend)(parser, @selector(setDelegate:), self);
 
     [parser setShouldResolveExternalEntities:NO];
     [parser parse];
diff --git a/fpicker/source/aqua/SalAquaFilePicker.mm b/fpicker/source/aqua/SalAquaFilePicker.mm
index c46cd9cb8739..71a2940dec9e 100644
--- a/fpicker/source/aqua/SalAquaFilePicker.mm
+++ b/fpicker/source/aqua/SalAquaFilePicker.mm
@@ -162,7 +162,7 @@ sal_Int16 SAL_CALL SalAquaFilePicker::execute()
     // So instead of:
     // [m_pDialog setDelegate:m_pDelegate];
     // do:
-    objc_msgSend(m_pDialog, @selector(setDelegate:), m_pDelegate);
+    ((id (*)(id, SEL, ...))objc_msgSend)(m_pDialog, @selector(setDelegate:), m_pDelegate);
 
     int nStatus = runandwaitforresult();
 
diff --git a/sfx2/source/appl/shutdowniconaqua.mm b/sfx2/source/appl/shutdowniconaqua.mm
index ea040e4c6212..741e89c639c7 100644
--- a/sfx2/source/appl/shutdowniconaqua.mm
+++ b/sfx2/source/appl/shutdowniconaqua.mm
@@ -351,7 +351,7 @@ static void appendRecentMenu( NSMenu* i_pMenu, NSMenu* i_pDockMenu, const OUStri
     // confused. Anyway, to avoid warnings, instead of this:
     // [pRecentMenu setDelegate: pRecentDelegate];
     // do this:
-    objc_msgSend(pRecentMenu, @selector(setDelegate:), pRecentDelegate);
+    ((id (*)(id, SEL, ...))objc_msgSend)(pRecentMenu, @selector(setDelegate:), pRecentDelegate);
 
     [pRecentMenu setAutoenablesItems: NO];
     [pItem setSubmenu: pRecentMenu];
@@ -368,7 +368,7 @@ static void appendRecentMenu( NSMenu* i_pMenu, NSMenu* i_pDockMenu, const OUStri
 
         // See above
         // [pRecentMenu setDelegate: pRecentDelegate];
-        objc_msgSend(pRecentMenu, @selector(setDelegate:), pRecentDelegate);
+        ((id (*)(id, SEL, ...))objc_msgSend)(pRecentMenu, @selector(setDelegate:), pRecentDelegate);
 
         [pRecentMenu setAutoenablesItems: NO];
         [pItem setSubmenu: pRecentMenu];