summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2016-06-09 21:25:12 +0100
committerCaolán McNamara <caolanm@redhat.com>2016-06-10 08:03:50 +0000
commitdfb2a8deab1324047a4ed81a131a1ef3552c3e8e (patch)
tree08c7a6dab0fc0cefef275ff881bf46524f7942b0
parentc3d837739b2ff14213b420ea613ce2fe1730a2cc (diff)
Resolves: tdf#100181 quickstart crashes immediately without Quickstarter
Change-Id: I0257651b3841dea596077cfacbf7d69a20b04252 Reviewed-on: https://gerrit.libreoffice.org/26134 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r--sfx2/source/appl/shutdownicon.cxx11
1 files changed, 2 insertions, 9 deletions
diff --git a/sfx2/source/appl/shutdownicon.cxx b/sfx2/source/appl/shutdownicon.cxx
index d515d40df609..3c6a1d25f856 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));