[Libreoffice-commits] .: 2 commits - cppuhelper/source

[Stephan Bergmann]

 cppuhelper/source/defaultbootstrap.cxx |   26 +++++++++++---------------
 1 file changed, 11 insertions(+), 15 deletions(-)

New commits:
commit 5fd78feebe220f848c4a0d3beeb1ef0f04bbae6f
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Jun 1 10:10:07 2012 +0200

    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).

diff --git a/cppuhelper/source/defaultbootstrap.cxx b/cppuhelper/source/defaultbootstrap.cxx
index dd7aeaf..1f119c9 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<rtl::OUString> 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;
 }
commit 0951b76a00edd1cd89b8acf86c785d56fc776351
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Jun 1 10:09:18 2012 +0200

    Add "virtual" for consistency
    
    Change-Id: I8ecc2edde553edbd80ca04e2f3d541c31f516211

diff --git a/cppuhelper/source/defaultbootstrap.cxx b/cppuhelper/source/defaultbootstrap.cxx
index 55a4f09..dd7aeaf 100644
--- a/cppuhelper/source/defaultbootstrap.cxx
+++ b/cppuhelper/source/defaultbootstrap.cxx
@@ -648,27 +648,28 @@ public:
         css::uno::Reference< css::uno::XComponentContext > const & Context)
         throw (css::uno::Exception, css::uno::RuntimeException);
 
-    css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException);
+    virtual css::uno::Type SAL_CALL getElementType()
+        throw (css::uno::RuntimeException);
 
-    sal_Bool SAL_CALL hasElements() throw (css::uno::RuntimeException);
+    virtual sal_Bool SAL_CALL hasElements() throw (css::uno::RuntimeException);
 
-    css::uno::Reference< css::container::XEnumeration > SAL_CALL
+    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL
     createEnumeration() throw (css::uno::RuntimeException);
 
-    sal_Bool SAL_CALL has(css::uno::Any const & aElement)
+    virtual sal_Bool SAL_CALL has(css::uno::Any const & aElement)
         throw (css::uno::RuntimeException);
 
-    void SAL_CALL insert(css::uno::Any const & aElement)
+    virtual void SAL_CALL insert(css::uno::Any const & aElement)
         throw (
             css::lang::IllegalArgumentException,
             css::container::ElementExistException, css::uno::RuntimeException);
 
-    void SAL_CALL remove(css::uno::Any const & aElement)
+    virtual void SAL_CALL remove(css::uno::Any const & aElement)
         throw (
             css::lang::IllegalArgumentException,
             css::container::NoSuchElementException, css::uno::RuntimeException);
 
-    css::uno::Reference< css::container::XEnumeration > SAL_CALL
+    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL
     createContentEnumeration(rtl::OUString const & aServiceName)
         throw (css::uno::RuntimeException);