mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

preload: add the ability to disable various components.

Browse Source 
Helps filter stupid stuff that makes no sense for online - eg.
reportbuilder or jdbc.

Change-Id: I40e06954c45fdefd21528202f4587ae83eb994c2
Reviewed-on: https://gerrit.libreoffice.org/69567
Tested-by: Jenkins
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
This commit is contained in:
Michael Meeks
2019-03-22 18:48:41 +01:00
parent fd2f43e05b
commit 9bc50c7efd
1 changed files with 36 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
cppuhelper/source/servicemanager.cxx
View File

@@ -1789,6 +1789,22 @@ void cppuhelper::ServiceManager::preloadImplementations() {
std::cerr << "preload:";
std::vector<OUString> aReported;
std::vector<OUString> aDisabled;
OUStringBuffer aDisabledMsg("Disabled: ");
/// Allow external callers & testers to disable certain components
const char *pDisable = getenv("UNODISABLELIBRARY");
if (pDisable)
{
OUString aDisable(pDisable, strlen(pDisable), RTL_TEXTENCODING_UTF8);
for (sal_Int32 i = 0; i >= 0; )
{
OUString tok = aDisable.getToken(0, ' ', i);
tok = tok.trim();
if (!tok.isEmpty())
aDisabled.push_back(tok);
}
}
// loop all implementations
for (const auto& rEntry : data_.namedImplementations)
@@ -1800,13 +1816,28 @@ void cppuhelper::ServiceManager::preloadImplementations() {
if (aLibrary.isEmpty())
continue;
OUString simplified = simplifyModule(aLibrary);
bool bDisabled =
std::find(aDisabled.begin(), aDisabled.end(), simplified) != aDisabled.end();
if (std::find(aReported.begin(), aReported.end(), aLibrary) == aReported.end())
{
std::cerr << " " << simplifyModule(aLibrary);
std::cerr.flush();
if (bDisabled)
{
aDisabledMsg.append(simplified);
aDisabledMsg.append(" ");
}
else
{
std::cerr << " " << simplified;
std::cerr.flush();
}
aReported.push_back(aLibrary);
}
if (bDisabled)
continue;
// expand absolute URI implementation component library
aUri = cppu::bootstrap_expandUri(aLibrary);
}
@@ -1928,6 +1959,9 @@ void cppuhelper::ServiceManager::preloadImplementations() {
}
std::cerr << std::endl;
std::cerr << aDisabledMsg.makeStringAndClear() << "\n";
std::cerr.flush();
// Various rather important uno mappings.
static struct {
const char *mpFrom;