From 63a54519f6cd3e0c22a1a24015002d07407ac37e Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Thu, 9 Jun 2016 21:25:12 +0100 Subject: Resolves: tdf#100181 quickstart crashes immediately without Quickstarter MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I0257651b3841dea596077cfacbf7d69a20b04252 Reviewed-on: https://gerrit.libreoffice.org/26134 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara (cherry picked from commit dfb2a8deab1324047a4ed81a131a1ef3552c3e8e) (cherry picked from commit dd02cca2e64b061ddd5003ad0485dcbfae7f5ddf) Reviewed-on: https://gerrit.libreoffice.org/26149 Reviewed-by: Markus Mohrhard --- sfx2/source/appl/shutdownicon.cxx | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/sfx2/source/appl/shutdownicon.cxx b/sfx2/source/appl/shutdownicon.cxx index 13e11cbf25f2..1802938687ce 100644 --- a/sfx2/source/appl/shutdownicon.cxx +++ b/sfx2/source/appl/shutdownicon.cxx @@ -122,19 +122,16 @@ css::uno::Sequence 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)); -- cgit