summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2012-04-23 11:47:45 +0200
committerStephan Bergmann <sbergman@redhat.com>2012-04-23 11:47:45 +0200
commit0bbf79005a697c6781047c01f05eb660836a18e1 (patch)
tree01ce86a63fe89ae4928969f291faaeb9043a866c
parentc29b6b2a065bbf7ade2d6b62dfd1c0245318f355 (diff)
Do not fail for legacy rdb that only contains root key
-rw-r--r--cppuhelper/source/defaultbootstrap.cxx7
1 files changed, 6 insertions, 1 deletions
diff --git a/cppuhelper/source/defaultbootstrap.cxx b/cppuhelper/source/defaultbootstrap.cxx
index 4921011d54c3..a11f220358ec 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));