From 5fd78feebe220f848c4a0d3beeb1ef0f04bbae6f Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Fri, 1 Jun 2012 10:10:07 +0200 Subject: [PATCH] Revert "bootstrapping should elide duplicate .rdb paths in the configuration" 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). --- cppuhelper/source/defaultbootstrap.cxx | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/cppuhelper/source/defaultbootstrap.cxx b/cppuhelper/source/defaultbootstrap.cxx index dd7aeaf4e795..1f119c96145e 100644 --- a/cppuhelper/source/defaultbootstrap.cxx +++ b/cppuhelper/source/defaultbootstrap.cxx @@ -2157,7 +2157,6 @@ css::uno::Reference< css::registry::XSimpleRegistry > createTypeRegistry( css::uno::Reference< css::registry::XRegistryKey >()), css::uno::UNO_QUERY_THROW); css::uno::Reference< css::registry::XSimpleRegistry > reg; - std::vector loaded; for (sal_Int32 i = 0; i != -1;) { rtl::OUString uri(uris.getToken(0, ' ', i)); if (uri.isEmpty()) { @@ -2166,13 +2165,9 @@ css::uno::Reference< css::registry::XSimpleRegistry > createTypeRegistry( bool optional; bool directory; decodeRdbUri(&uri, &optional, &directory); - if (::std::find (loaded.begin(), loaded.end(), uri) == loaded.end()) - { - reg = directory - ? readTypeRdbDirectory(uri, optional, reg, simpleRegs, nestedRegs) - : readTypeRdbFile(uri, optional, reg, simpleRegs, nestedRegs); - loaded.push_back(uri); - } + reg = directory + ? readTypeRdbDirectory(uri, optional, reg, simpleRegs, nestedRegs) + : readTypeRdbFile(uri, optional, reg, simpleRegs, nestedRegs); } return reg; }