diff options
author | Tor Lillqvist <tml@collabora.com> | 2018-01-10 19:48:15 +0200 |
---|---|---|
committer | Andras Timar <andras.timar@collabora.com> | 2018-03-21 12:11:47 +0100 |
commit | 9fcf520293d20640c873df8e833f405d0449e259 (patch) | |
tree | f013b7ba42bcb7bb197b8b1275430fd09db996e2 /cppuhelper | |
parent | aa2296a4e1d73c8c7d94525edc2e13a369b25315 (diff) |
Don't try to preload the KDE4 shell backend as that crashes
Change-Id: I1c1ff4ec7cda00a76bdeb018366afed2187c7ef8
(cherry picked from commit 35ec045f6e4626c0544aaffbe489dfc142ff2aa8)
Diffstat (limited to 'cppuhelper')
-rw-r--r-- | cppuhelper/source/servicemanager.cxx | 7 |
1 files changed, 7 insertions, 0 deletions
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); |