[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - scp2/source

[Stephan Bergmann]

 scp2/source/ooo/common_brand.scp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 5c3e5d79afb520a21f696c8f302928bd5c993837
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Mar 16 17:05:09 2017 +0100

    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.
    <https://bugs.documentfoundation.org/show_bug.cgi?id=106292#c10> comment 10 to
    "XMessageBox#execute() in Java fails to draw a window on macOS Sierra".
    
    (cherry picked from commit 3e5aa33ef4ea8f5839e358dd62acdc09fe64dda8)
    
    Change-Id: I51cb79d157887bfcaf2dce6900675439d33d0be0
    Reviewed-on: https://gerrit.libreoffice.org/35315
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    Tested-by: Michael Stahl <mstahl at redhat.com>

diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index 7cd77331f7ea..2072358993da 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -512,7 +512,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;