mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Stephan Bergmann 2012-04-23 18:41:29 +02:00
parent b0547b358b
commit 015283bb50
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cppuhelper/source/defaultbootstrap.cxx
View File

@ -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;