From 015283bb50e8d0d8127ea7c06deda202441f051e Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Mon, 23 Apr 2012 18:41:29 +0200
Subject: [PATCH] Trying to parse legacy rdb as XML can cause
 InvalidRegistryException, too

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

diff --git a/cppuhelper/source/defaultbootstrap.cxx b/cppuhelper/source/defaultbootstrap.cxx
index a11f220358ec..f156ce15c8e9 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;