From 6850d15eb8affeb9206da452fbd46e6a3682fdf6 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Tue, 21 Jul 2020 13:30:42 +0300 Subject: Revert "tdf#125578 force webhelp as workaround for Safari sandboxing..." That change also prevented local help from being displayed in the built-in viewer on macOS. But we do want local help in Collabora Office on macOS from this branch. at least for now. Also: Revert "loplugin:nullptr (macOS)", revert "loplugin:cstylecast (macOS)". This reverts commit ffed2de3e412ff35979ecea92c3d49eefe0fcc5d. This reverts commit d2d6b2d785ccdfb67473c5b97bcac9bd25d3407b. This reverts commit 44893662d510c4173e55ba27af02d0258a697a5d. Change-Id: I98805b4c39dc01c7d8e9d7f8f09abc61a103480c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99134 Tested-by: Jenkins CollaboraOffice Reviewed-by: Tor Lillqvist --- fpicker/source/aqua/SalAquaFilePicker.mm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'fpicker') diff --git a/fpicker/source/aqua/SalAquaFilePicker.mm b/fpicker/source/aqua/SalAquaFilePicker.mm index ac54fca0cc98..3ddad83529c4 100644 --- a/fpicker/source/aqua/SalAquaFilePicker.mm +++ b/fpicker/source/aqua/SalAquaFilePicker.mm @@ -160,8 +160,7 @@ sal_Int16 SAL_CALL SalAquaFilePicker::execute() // So instead of: // [m_pDialog setDelegate:m_pDelegate]; // do: - reinterpret_cast(objc_msgSend)( - m_pDialog, @selector(setDelegate:), m_pDelegate); + ((id (*)(id, SEL, ...))objc_msgSend)(m_pDialog, @selector(setDelegate:), m_pDelegate); int nStatus = runandwaitforresult(); -- cgit