summaryrefslogtreecommitdiff
path: root/connectivity/source/cpool
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2016-11-09 15:14:57 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2016-11-10 06:51:53 +0000
commit5c2c2d8dc4449c9d4ac9d645f634772ba93373af (patch)
tree9aaa3ab74dcc23b8a5d188c1b7b5d1c7cac3a024 /connectivity/source/cpool
parent76c8336eec82862732d3a26be84b5e8a52efe022 (diff)
loplugin:expandablemethods in comphelper..cppuhelper
Change-Id: I9d5487af4729bd3ee4f6450092e4b77f74a12e6d Reviewed-on: https://gerrit.libreoffice.org/30717 Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'connectivity/source/cpool')
-rw-r--r--connectivity/source/cpool/ZPoolCollection.cxx11
-rw-r--r--connectivity/source/cpool/ZPoolCollection.hxx1
2 files changed, 3 insertions, 9 deletions
diff --git a/connectivity/source/cpool/ZPoolCollection.cxx b/connectivity/source/cpool/ZPoolCollection.cxx
index ad462ea596b6..f502b5fdb2eb 100644
--- a/connectivity/source/cpool/ZPoolCollection.cxx
+++ b/connectivity/source/cpool/ZPoolCollection.cxx
@@ -252,7 +252,9 @@ bool OPoolCollection::isPoolingEnabled()
Reference<XInterface> const & OPoolCollection::getConfigPoolRoot()
{
if(!m_xConfigNode.is())
- m_xConfigNode = createWithServiceFactory(getConnectionPoolNodeName());
+ m_xConfigNode = createWithProvider(
+ css::configuration::theDefaultProvider::get(m_xContext),
+ getConnectionPoolNodeName());
return m_xConfigNode;
}
@@ -312,13 +314,6 @@ OConnectionPool* OPoolCollection::getConnectionPool(const OUString& _sImplName,
return pRet;
}
-Reference< XInterface > OPoolCollection::createWithServiceFactory(const OUString& _rPath) const
-{
- return createWithProvider(
- css::configuration::theDefaultProvider::get(m_xContext),
- _rPath);
-}
-
Reference< XInterface > OPoolCollection::createWithProvider(const Reference< XMultiServiceFactory >& _rxConfProvider,
const OUString& _rPath)
{
diff --git a/connectivity/source/cpool/ZPoolCollection.hxx b/connectivity/source/cpool/ZPoolCollection.hxx
index ea5e2d307f38..316fb7a227c0 100644
--- a/connectivity/source/cpool/ZPoolCollection.hxx
+++ b/connectivity/source/cpool/ZPoolCollection.hxx
@@ -85,7 +85,6 @@ namespace connectivity
const css::uno::Reference< css::uno::XComponentContext >& _rxContext);
// some configuration helper methods
- css::uno::Reference< css::uno::XInterface > createWithServiceFactory(const OUString& _rPath) const;
css::uno::Reference< css::uno::XInterface > const & getConfigPoolRoot();
static css::uno::Reference< css::uno::XInterface > createWithProvider( const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxConfProvider,
const OUString& _rPath);