summaryrefslogtreecommitdiff
path: root/cppuhelper
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 /cppuhelper
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 'cppuhelper')
-rw-r--r--cppuhelper/source/servicemanager.cxx4
-rw-r--r--cppuhelper/source/servicemanager.hxx4
-rw-r--r--cppuhelper/source/typemanager.cxx8
-rw-r--r--cppuhelper/source/typemanager.hxx2
4 files changed, 5 insertions, 13 deletions
diff --git a/cppuhelper/source/servicemanager.cxx b/cppuhelper/source/servicemanager.cxx
index f2c1a4c337bf..22411286a2b7 100644
--- a/cppuhelper/source/servicemanager.cxx
+++ b/cppuhelper/source/servicemanager.cxx
@@ -1410,9 +1410,9 @@ void cppuhelper::ServiceManager::removeEventListenerFromComponent(
}
}
-void cppuhelper::ServiceManager::readRdbs(rtl::OUString const & uris) {
+void cppuhelper::ServiceManager::init(rtl::OUString const & rdbUris) {
for (sal_Int32 i = 0; i != -1;) {
- rtl::OUString uri(uris.getToken(0, ' ', i));
+ rtl::OUString uri(rdbUris.getToken(0, ' ', i));
if (uri.isEmpty()) {
continue;
}
diff --git a/cppuhelper/source/servicemanager.hxx b/cppuhelper/source/servicemanager.hxx
index 6f235040de1b..ca0021370545 100644
--- a/cppuhelper/source/servicemanager.hxx
+++ b/cppuhelper/source/servicemanager.hxx
@@ -194,7 +194,7 @@ public:
using ServiceManagerBase::acquire;
using ServiceManagerBase::release;
- void init(rtl::OUString const & rdbUris) { readRdbs(rdbUris); }
+ void init(rtl::OUString const & rdbUris);
void setContext(
css::uno::Reference< css::uno::XComponentContext > const & context)
@@ -357,8 +357,6 @@ private:
void removeEventListenerFromComponent(
css::uno::Reference< css::lang::XComponent > const & component);
- void readRdbs(rtl::OUString const & uris);
-
void readRdbDirectory(rtl::OUString const & uri, bool optional);
void readRdbFile(rtl::OUString const & uri, bool optional);
diff --git a/cppuhelper/source/typemanager.cxx b/cppuhelper/source/typemanager.cxx
index f232c6c1c68f..7faddafee8ce 100644
--- a/cppuhelper/source/typemanager.cxx
+++ b/cppuhelper/source/typemanager.cxx
@@ -1872,10 +1872,6 @@ cppuhelper::TypeManager::TypeManager():
manager_(new unoidl::Manager)
{}
-void cppuhelper::TypeManager::init(rtl::OUString const & rdbUris) {
- readRdbs(rdbUris);
-}
-
css::uno::Any cppuhelper::TypeManager::find(rtl::OUString const & name) {
//TODO: caching? (here or in unoidl::Manager?)
struct Simple {
@@ -2096,9 +2092,9 @@ cppuhelper::TypeManager::createTypeDescriptionEnumeration(
depth == css::reflection::TypeDescriptionSearchDepth_INFINITE);
}
-void cppuhelper::TypeManager::readRdbs(rtl::OUString const & uris) {
+void cppuhelper::TypeManager::init(rtl::OUString const & rdbUris) {
for (sal_Int32 i = 0; i != -1;) {
- rtl::OUString uri(uris.getToken(0, ' ', i));
+ rtl::OUString uri(rdbUris.getToken(0, ' ', i));
if (uri.isEmpty()) {
continue;
}
diff --git a/cppuhelper/source/typemanager.hxx b/cppuhelper/source/typemanager.hxx
index 945438a2802d..16103199be85 100644
--- a/cppuhelper/source/typemanager.hxx
+++ b/cppuhelper/source/typemanager.hxx
@@ -116,8 +116,6 @@ private:
css::reflection::InvalidTypeNameException,
css::uno::RuntimeException, std::exception) override;
- void readRdbs(rtl::OUString const & uris);
-
void readRdbDirectory(rtl::OUString const & uri, bool optional);
void readRdbFile(rtl::OUString const & uri, bool optional);