Skip to content

C
core
Kaydet (Commit) 49fa3007 authored tarafından Stephan Bergmann's avatar Stephan Bergmann
Dosyalara gözat
Seçenekler

Don't call Manager::addProvider(null) upon optional NoSuchFileException 

Change-Id: I62e953c886886158f227362fef7048459192217b
üst f72c2a72
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 3 deletions
cppuhelper/source/typemanager.cxx
Dosyayı görüntüle @ 49fa3007
...@@ -2141,9 +2141,8 @@ void cppuhelper::TypeManager::readRdbDirectory( ...@@ -2141,9 +2141,8 @@ void cppuhelper::TypeManager::readRdbDirectory(
void cppuhelper::TypeManager::readRdbFile( void cppuhelper::TypeManager::readRdbFile(
rtl::OUString const & uri, bool optional) rtl::OUString const & uri, bool optional)
{ {
rtl::Reference< unoidl::Provider > prov;
try { try {
prov = unoidl::loadProvider(manager_, uri); manager_->addProvider(unoidl::loadProvider(manager_, uri));
} catch (unoidl::NoSuchFileException &) { } catch (unoidl::NoSuchFileException &) {
if (!optional) { if (!optional) {
throw css::uno::DeploymentException( throw css::uno::DeploymentException(
...@@ -2157,7 +2156,6 @@ void cppuhelper::TypeManager::readRdbFile( ...@@ -2157,7 +2156,6 @@ void cppuhelper::TypeManager::readRdbFile(
+ e.getDetail()), + e.getDetail()),
static_cast< cppu::OWeakObject * >(this)); static_cast< cppu::OWeakObject * >(this));
} }
manager_->addProvider(prov);
} }
css::uno::Any cppuhelper::TypeManager::getSequenceType( css::uno::Any cppuhelper::TypeManager::getSequenceType(
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment