[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - vcl/inc vcl/osx vcl/source

[Tor Lillqvist]

 vcl/inc/salinst.hxx       |    4 ++++
 vcl/osx/salinst.cxx       |    3 +++
 vcl/source/app/svmain.cxx |    4 ++++
 3 files changed, 11 insertions(+)

New commits:
commit 42a5a054b70c7850ca47074c2d5dd249de3202b4
Author: Tor Lillqvist <tml at collabora.com>
Date:   Thu Feb 22 12:40:26 2018 +0200

    tdf#103690: Set up notifications only after VCL has been initialised
    
    On some Macs, it seems that LibreOffice (or any app?) gets an
    NSApplicationDidChangeScreenParametersNotification as soon as it has
    started and asked for such a notification. Our handler for that
    notification assumes that VCL is initialised. Thus we should not ask
    for such notifications before VCL has been initialised.
    
    I could not reproduce the reported crash with an unmodified
    LibreOffice, only after inserting a sleep after the notifications had
    been set up. But I am fairly sure this change fixes the problem.
    
    Change-Id: I18d342eb7dc0c77cb7fc8623756bead65a1bd329
    Reviewed-on: https://gerrit.libreoffice.org/50164
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Tor Lillqvist <tml at collabora.com>
    Reviewed-on: https://gerrit.libreoffice.org/50197
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>
    Tested-by: Michael Meeks <michael.meeks at collabora.com>

diff --git a/vcl/inc/salinst.hxx b/vcl/inc/salinst.hxx
index f33d9d4d912a..805ee035f077 100644
--- a/vcl/inc/salinst.hxx
+++ b/vcl/inc/salinst.hxx
@@ -194,6 +194,10 @@ void DeInitSalData();                       // called from Application-Dtor
 
 void InitSalMain();
 
+#ifdef MACOSX
+void postInitVCLinitNSApp();
+#endif
+
 #endif // INCLUDED_VCL_INC_SALINST_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/osx/salinst.cxx b/vcl/osx/salinst.cxx
index 80b6fec66cc0..f3fd09cf8d44 100644
--- a/vcl/osx/salinst.cxx
+++ b/vcl/osx/salinst.cxx
@@ -157,7 +157,10 @@ static void initNSApp()
 
     // activate our delegate methods
     [NSApp setDelegate: NSApp];
+}
 
+void postInitVCLinitNSApp()
+{
     [[NSNotificationCenter defaultCenter] addObserver: NSApp
                                           selector: @selector(systemColorsChanged:)
                                           name: NSSystemColorsDidChangeNotification
diff --git a/vcl/source/app/svmain.cxx b/vcl/source/app/svmain.cxx
index e4b1468eecec..2d33836aea62 100644
--- a/vcl/source/app/svmain.cxx
+++ b/vcl/source/app/svmain.cxx
@@ -187,6 +187,10 @@ int ImplSVMain()
 
     bool bInit = isInitVCL() || InitVCL();
 
+#ifdef MACOSX
+    postInitVCLinitNSApp();
+#endif
+
     if( bInit )
     {
         // call application main