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

Revert "bootstrapping should elide duplicate .rdb paths in the configuration"

Browse Source 
This reverts commit b162aec6254ab535cc5eb990b249f46aa8e79153, which increased
code complexity for no benefit (the dubious scenario it was introduced for
concerned duplicate service rdbs rather than type rdbs, anyway).
This commit is contained in:
Stephan Bergmann 2012-06-01 10:10:07 +02:00
parent 0951b76a00
commit 5fd78feebe
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
cppuhelper/source/defaultbootstrap.cxx
View File

@ -2157,7 +2157,6 @@ css::uno::Reference< css::registry::XSimpleRegistry > createTypeRegistry(
css::uno::Reference< css::registry::XRegistryKey >()), css::uno::Reference< css::registry::XRegistryKey >()),
css::uno::UNO_QUERY_THROW); css::uno::UNO_QUERY_THROW);
css::uno::Reference< css::registry::XSimpleRegistry > reg; css::uno::Reference< css::registry::XSimpleRegistry > reg;
std::vector<rtl::OUString> loaded;
for (sal_Int32 i = 0; i != -1;) { for (sal_Int32 i = 0; i != -1;) {
rtl::OUString uri(uris.getToken(0, ' ', i)); rtl::OUString uri(uris.getToken(0, ' ', i));
if (uri.isEmpty()) { if (uri.isEmpty()) {
@ -2166,13 +2165,9 @@ css::uno::Reference< css::registry::XSimpleRegistry > createTypeRegistry(
bool optional; bool optional;
bool directory; bool directory;
decodeRdbUri(&uri, &optional, &directory); decodeRdbUri(&uri, &optional, &directory);
if (::std::find (loaded.begin(), loaded.end(), uri) == loaded.end()) reg = directory
{ ? readTypeRdbDirectory(uri, optional, reg, simpleRegs, nestedRegs)
reg = directory : readTypeRdbFile(uri, optional, reg, simpleRegs, nestedRegs);
? readTypeRdbDirectory(uri, optional, reg, simpleRegs, nestedRegs)
: readTypeRdbFile(uri, optional, reg, simpleRegs, nestedRegs);
loaded.push_back(uri);
}
} }
return reg; return reg;
} }