From 3e5aa33ef4ea8f5839e358dd62acdc09fe64dda8 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Thu, 16 Mar 2017 17:05:09 +0100 Subject: [PATCH] Revert "Don't package unoinfo in case of Mac OS X like app structure" This reverts commit 3a663f7a4580b97518aee4e0c797b549c67ef1a5. Whatever that commit was supposed to be good for, not packaging unoinfo on macOS breaks functionality, see e.g. comment 10 to "XMessageBox#execute() in Java fails to draw a window on macOS Sierra". --- scp2/source/ooo/common_brand.scp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp index b4c260f17432..7d2a1239b538 100644 --- a/scp2/source/ooo/common_brand.scp +++ b/scp2/source/ooo/common_brand.scp @@ -475,7 +475,7 @@ File gid_Brand_File_Desktophelper_Txt End #endif -#if !defined WNT && !defined MACOSX +#if !defined WNT File gid_Brand_File_Bin_Unoinfo BIN_FILE_BODY; Dir = gid_Brand_Dir_Program;