Kaydet (Commit) dfb2a8de authored tarafından Caolán McNamara's avatar Caolán McNamara

Resolves: tdf#100181 quickstart crashes immediately without Quickstarter

Change-Id: I0257651b3841dea596077cfacbf7d69a20b04252
Reviewed-on: https://gerrit.libreoffice.org/26134Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst c3d83773
...@@ -122,19 +122,16 @@ css::uno::Sequence<OUString> SAL_CALL ShutdownIcon::getSupportedServiceNames() ...@@ -122,19 +122,16 @@ css::uno::Sequence<OUString> SAL_CALL ShutdownIcon::getSupportedServiceNames()
bool ShutdownIcon::bModalMode = false; bool ShutdownIcon::bModalMode = false;
ShutdownIcon* ShutdownIcon::pShutdownIcon = nullptr; ShutdownIcon* ShutdownIcon::pShutdownIcon = nullptr;
#if !defined( ENABLE_QUICKSTART_APPLET )
// To remove conditionals
extern "C" { extern "C" {
static void disabled_initSystray() { } static void disabled_initSystray() { }
static void disabled_deInitSystray() { } static void disabled_deInitSystray() { }
} }
#endif
namespace { namespace {
boost::logic::tribool loaded(boost::logic::indeterminate); boost::logic::tribool loaded(boost::logic::indeterminate);
oslGenericFunction pInitSystray(nullptr); oslGenericFunction pInitSystray = disabled_initSystray;
oslGenericFunction pDeInitSystray(nullptr); oslGenericFunction pDeInitSystray = disabled_deInitSystray;
bool LoadModule() bool LoadModule()
{ {
...@@ -170,10 +167,6 @@ bool LoadModule() ...@@ -170,10 +167,6 @@ bool LoadModule()
loaded = true; loaded = true;
} }
# endif // UNX # endif // UNX
#else
pInitSystray = disabled_initSystray;
pDeInitSystray = disabled_deInitSystray;
loaded = false;
#endif // ENABLE_QUICKSTART_APPLET #endif // ENABLE_QUICKSTART_APPLET
} }
assert(!boost::logic::indeterminate(loaded)); assert(!boost::logic::indeterminate(loaded));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment