diff options
author | Michael Meeks <michael.meeks@collabora.com> | 2019-11-20 16:38:14 +0000 |
---|---|---|
committer | Aron Budea <aron.budea@collabora.com> | 2019-11-22 17:30:54 +0100 |
commit | 1ce19c030f95edd2cf301abdc14313c98d347829 (patch) | |
tree | a8aed973970bd047cd1d42d9b7e4abd36a3c5c70 /cppuhelper | |
parent | 520b18dd21cbcd923def62b042f20f234447fea1 (diff) |
preload: cleanup failed module load warnings and rename them.
Change-Id: Iafa89df6f724fa6b64712d970502091e38300dad
Reviewed-on: https://gerrit.libreoffice.org/83341
Tested-by: Jenkins
Reviewed-by: Aron Budea <aron.budea@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/83474
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Diffstat (limited to 'cppuhelper')
-rw-r--r-- | cppuhelper/source/servicemanager.cxx | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/cppuhelper/source/servicemanager.cxx b/cppuhelper/source/servicemanager.cxx index a2f78cf9b41f..999165758e46 100644 --- a/cppuhelper/source/servicemanager.cxx +++ b/cppuhelper/source/servicemanager.cxx @@ -1792,6 +1792,7 @@ void cppuhelper::ServiceManager::preloadImplementations() { std::vector<OUString> aReported; std::vector<OUString> aDisabled; OUStringBuffer aDisabledMsg; + OUStringBuffer aMissingMsg; /// Allow external callers & testers to disable certain components const char *pDisable = getenv("UNODISABLELIBRARY"); @@ -1814,6 +1815,7 @@ void cppuhelper::ServiceManager::preloadImplementations() { rEntry.second->status == Data::Implementation::STATUS_LOADED) continue; + OUString simplified; try { const OUString &aLibrary = rEntry.second->info->uri; @@ -1821,7 +1823,8 @@ void cppuhelper::ServiceManager::preloadImplementations() { if (aLibrary.isEmpty()) continue; - OUString simplified = simplifyModule(aLibrary); + simplified = simplifyModule(aLibrary); + bool bDisabled = std::find(aDisabled.begin(), aDisabled.end(), simplified) != aDisabled.end(); @@ -1866,8 +1869,8 @@ void cppuhelper::ServiceManager::preloadImplementations() { if (!aModule.is()) { - std::cerr << ":failed" << std::endl; - std::cerr.flush(); + aMissingMsg.append(simplified); + aMissingMsg.append(" "); } if (aModule.is() && @@ -1960,6 +1963,11 @@ void cppuhelper::ServiceManager::preloadImplementations() { } std::cerr << std::endl; + if (aMissingMsg.getLength() > 0) + { + OUString aMsg = aMissingMsg.makeStringAndClear(); + std::cerr << "Absent (often optional): " << aMsg << "\n"; + } if (aDisabledMsg.getLength() > 0) { OUString aMsg = aDisabledMsg.makeStringAndClear(); |