diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-02-22 17:09:35 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-02-24 08:08:00 +0100 |
| commit | ad73967e99235a2ba9b5a2106c5d6d0f8efaa1ca (patch) | |
| tree | 5b11b7812b84c2647c64d1002bad7ed8a1d1754d /connectivity/source/cpool | |
| parent | a53577e6ff3629c4e9219616960d89eea9463593 (diff) | |
Remove unnecessary extractInterface
Change-Id: I4848bf84615274ad5732223a354fb7a6b845d9a8
Diffstat (limited to 'connectivity/source/cpool')
| -rw-r--r-- | connectivity/source/cpool/ZPoolCollection.cxx | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/connectivity/source/cpool/ZPoolCollection.cxx b/connectivity/source/cpool/ZPoolCollection.cxx index 30aa321560db..5df6034fb2c6 100644 --- a/connectivity/source/cpool/ZPoolCollection.cxx +++ b/connectivity/source/cpool/ZPoolCollection.cxx @@ -27,7 +27,6 @@ #include <com/sun/star/frame/Desktop.hpp> #include <com/sun/star/reflection/ProxyFactory.hpp> #include <com/sun/star/sdbc/DriverManager.hpp> -#include <comphelper/extract.hxx> #include <comphelper/processfactory.hxx> #include <cppuhelper/supportsservice.hxx> #include <com/sun/star/beans/XPropertySet.hpp> @@ -359,13 +358,19 @@ Reference<XInterface> OPoolCollection::openNode(const OUString& _rPath,const Ref { if (xDirectAccess.is() && xDirectAccess->hasByName(_rPath)) { - if (!::cppu::extractInterface(xNode, xDirectAccess->getByName(_rPath))) - SAL_WARN("connectivity.cpool", "OConfigurationNode::openNode: could not open the node!"); + xNode.set(xDirectAccess->getByName(_rPath), css::uno::UNO_QUERY); + SAL_WARN_IF( + !xNode.is(), "connectivity.cpool", + "OConfigurationNode::openNode: could not open the node!"); } else if (xHierarchyAccess.is()) { - if (!::cppu::extractInterface(xNode, xHierarchyAccess->getByHierarchicalName(_rPath))) - SAL_WARN("connectivity.cpool", "OConfigurationNode::openNode: could not open the node!"); + xNode.set( + xHierarchyAccess->getByHierarchicalName(_rPath), + css::uno::UNO_QUERY); + SAL_WARN_IF( + !xNode.is(), "connectivity.cpool", + "OConfigurationNode::openNode: could not open the node!"); } } |