cppuhelper/source/defaultbootstrap.cxx | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
New commits:
commit 0bbf79005a697c6781047c01f05eb660836a18e1
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Mon Apr 23 11:47:45 2012 +0200
Do not fail for legacy rdb that only contains root key
diff --git a/cppuhelper/source/defaultbootstrap.cxx
b/cppuhelper/source/defaultbootstrap.cxx
index 4921011..a11f220 100644
--- a/cppuhelper/source/defaultbootstrap.cxx
+++ b/cppuhelper/source/defaultbootstrap.cxx
@@ -1318,7 +1318,12 @@ bool ServiceManager::readLegacyRdbFile(rtl::OUString
const & uri) {
static_cast< cppu::OWeakObject * >(this));
}
RegistryKeyArray impls;
- if (rootKey.openSubKeys("IMPLEMENTATIONS", impls) != REG_NO_ERROR) {
+ switch (rootKey.openSubKeys("IMPLEMENTATIONS", impls)) {
+ case REG_NO_ERROR:
+ break;
+ case REG_KEY_NOT_EXISTS:
+ return true;
+ default:
throw css::uno::DeploymentException(
"Failure reading legacy rdb file " + uri,
static_cast< cppu::OWeakObject * >(this));
_______________________________________________
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
