From 35ec045f6e4626c0544aaffbe489dfc142ff2aa8 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Wed, 10 Jan 2018 19:48:15 +0200 Subject: Don't try to preload the KDE4 shell backend as that crashes Change-Id: I1c1ff4ec7cda00a76bdeb018366afed2187c7ef8 --- cppuhelper/source/servicemanager.cxx | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'cppuhelper') diff --git a/cppuhelper/source/servicemanager.cxx b/cppuhelper/source/servicemanager.cxx index a466b65ecb36..9f734214b38b 100644 --- a/cppuhelper/source/servicemanager.cxx +++ b/cppuhelper/source/servicemanager.cxx @@ -1838,6 +1838,13 @@ void cppuhelper::ServiceManager::preloadImplementations() { if (iterator->second->info->loader == "com.sun.star.loader.SharedLibrary" && iterator->second->status != Data::Implementation::STATUS_LOADED) { + // Blacklist some components that are known to fail + if (iterator->second->info->name == "com.sun.star.comp.configuration.backend.KDE4Backend") + { + SAL_INFO("cppuhelper.preload", "Skipping " << iterator->second->info->name); + continue; + } + // load component library SAL_INFO("cppuhelper.preload", "Loading " << aUri << " for " << iterator->second->info->name); osl::Module aModule(aUri, SAL_LOADMODULE_NOW | SAL_LOADMODULE_GLOBAL); -- cgit