[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - sfx2/source

[Caolán McNamara]

 sfx2/source/appl/shutdownicon.cxx |   11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

New commits:
commit 63a54519f6cd3e0c22a1a24015002d07407ac37e
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Jun 9 21:25:12 2016 +0100

    Resolves: tdf#100181 quickstart crashes immediately without Quickstarter
    
    Change-Id: I0257651b3841dea596077cfacbf7d69a20b04252
    Reviewed-on: https://gerrit.libreoffice.org/26134
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>
    (cherry picked from commit dfb2a8deab1324047a4ed81a131a1ef3552c3e8e)
    (cherry picked from commit dd02cca2e64b061ddd5003ad0485dcbfae7f5ddf)
    Reviewed-on: https://gerrit.libreoffice.org/26149
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>

diff --git a/sfx2/source/appl/shutdownicon.cxx b/sfx2/source/appl/shutdownicon.cxx
index 13e11cb..1802938 100644
--- a/sfx2/source/appl/shutdownicon.cxx
+++ b/sfx2/source/appl/shutdownicon.cxx
@@ -122,19 +122,16 @@ css::uno::Sequence<OUString> SAL_CALL ShutdownIcon::getSupportedServiceNames()
 bool ShutdownIcon::bModalMode = false;
 ShutdownIcon* ShutdownIcon::pShutdownIcon = nullptr;
 
-#if !defined( ENABLE_QUICKSTART_APPLET )
-// To remove conditionals
 extern "C" {
     static void disabled_initSystray() { }
     static void disabled_deInitSystray() { }
 }
-#endif
 
 namespace {
 
 boost::logic::tribool loaded(boost::logic::indeterminate);
-oslGenericFunction pInitSystray(nullptr);
-oslGenericFunction pDeInitSystray(nullptr);
+oslGenericFunction pInitSystray = disabled_initSystray;
+oslGenericFunction pDeInitSystray = disabled_deInitSystray;
 
 bool LoadModule()
 {
@@ -170,10 +167,6 @@ bool LoadModule()
             loaded = true;
         }
 #  endif // UNX
-#else
-        pInitSystray = disabled_initSystray;
-        pDeInitSystray = disabled_deInitSystray;
-        loaded = false;
 #endif // ENABLE_QUICKSTART_APPLET
     }
     assert(!boost::logic::indeterminate(loaded));