[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - cppuhelper/source

[Stephan Bergmann]

 cppuhelper/source/typemanager.cxx |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

New commits:
commit 0812816458256dcbd268cb2d2cb9eb10b91f61f2
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon Nov 11 13:18:49 2013 +0100

    Don't call Manager::addProvider(null) upon optional NoSuchFileException
    
    Change-Id: I62e953c886886158f227362fef7048459192217b
    (cherry picked from commit 49fa300703643a2e49df01944f1b1299138010c7)
    Reviewed-on: https://gerrit.libreoffice.org/6637
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/cppuhelper/source/typemanager.cxx b/cppuhelper/source/typemanager.cxx
index 672e377..08c6fb9 100644
--- a/cppuhelper/source/typemanager.cxx
+++ b/cppuhelper/source/typemanager.cxx
@@ -2141,9 +2141,8 @@ void cppuhelper::TypeManager::readRdbDirectory(
 void cppuhelper::TypeManager::readRdbFile(
     rtl::OUString const & uri, bool optional)
 {
-    rtl::Reference< unoidl::Provider > prov;
     try {
-        prov = unoidl::loadProvider(manager_, uri);
+        manager_->addProvider(unoidl::loadProvider(manager_, uri));
     } catch (unoidl::NoSuchFileException &) {
         if (!optional) {
             throw css::uno::DeploymentException(
@@ -2157,7 +2156,6 @@ void cppuhelper::TypeManager::readRdbFile(
                  + e.getDetail()),
                 static_cast< cppu::OWeakObject * >(this));
     }
-    manager_->addProvider(prov);
 }
 
 css::uno::Any cppuhelper::TypeManager::getSequenceType(