summaryrefslogtreecommitdiff
path: root/cppuhelper/source
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2018-01-10 19:48:15 +0200
committerTor Lillqvist <tml@collabora.com>2018-01-10 19:50:45 +0200
commit35ec045f6e4626c0544aaffbe489dfc142ff2aa8 (patch)
tree0571243f4534cf809ccbf9389c96c8cdca8a9d6a /cppuhelper/source
parentf9f830ac319aebd940ebcae97e51c24cda54508f (diff)
Don't try to preload the KDE4 shell backend as that crashes
Change-Id: I1c1ff4ec7cda00a76bdeb018366afed2187c7ef8
Diffstat (limited to 'cppuhelper/source')
-rw-r--r--cppuhelper/source/servicemanager.cxx7
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);