[Libreoffice-commits] .: cppuhelper/source

[Stephan Bergmann]

 cppuhelper/source/defaultbootstrap.cxx |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

New commits:
commit 015283bb50e8d0d8127ea7c06deda202441f051e
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon Apr 23 18:41:29 2012 +0200

    Trying to parse legacy rdb as XML can cause InvalidRegistryException, too

diff --git a/cppuhelper/source/defaultbootstrap.cxx b/cppuhelper/source/defaultbootstrap.cxx
index a11f220..f156ce1 100644
--- a/cppuhelper/source/defaultbootstrap.cxx
+++ b/cppuhelper/source/defaultbootstrap.cxx
@@ -1276,9 +1276,11 @@ void ServiceManager::readRdbFile(rtl::OUString const & uri, bool optional) {
         }
         SAL_INFO("cppuhelper", "Ignored optional " << uri);
     } catch (css::registry::InvalidRegistryException & e) {
-        throw css::uno::DeploymentException(
-            "InvalidRegistryException: " + e.Message,
-            static_cast< cppu::OWeakObject * >(this));
+        if (!readLegacyRdbFile(uri)) {
+            throw css::uno::DeploymentException(
+                "InvalidRegistryException: " + e.Message,
+                static_cast< cppu::OWeakObject * >(this));
+        }
     } catch (css::uno::RuntimeException &) {
         if (!readLegacyRdbFile(uri)) {
             throw;