summaryrefslogtreecommitdiff
path: root/include/ucbhelper
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2016-10-25 13:46:23 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2016-10-26 06:49:46 +0000
commit47317f041693db1a9d4618a1d9f7dcefe52b2904 (patch)
tree612afa75bf969dc70c7fce9accc17263c5aab5e8 /include/ucbhelper
parentfe1f1247fad782bdf43322532fdeb1ba9f03135a (diff)
loplugin:expandablemethods in ucb..ucbhelper
Change-Id: I42d077d7ebcfb77447d011644f8d64e80eae69c2 Reviewed-on: https://gerrit.libreoffice.org/30266 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include/ucbhelper')
-rw-r--r--include/ucbhelper/macros.hxx12
-rw-r--r--include/ucbhelper/resultset.hxx3
-rw-r--r--include/ucbhelper/resultsethelper.hxx3
3 files changed, 2 insertions, 16 deletions
diff --git a/include/ucbhelper/macros.hxx b/include/ucbhelper/macros.hxx
index 57de0edcc725..91a3aa32fb89 100644
--- a/include/ucbhelper/macros.hxx
+++ b/include/ucbhelper/macros.hxx
@@ -214,13 +214,6 @@ Class::createServiceFactory( const css::uno::Reference< css::lang::XMultiService
// Service without service factory.
-// Own implementation of getSupportedServiceNames_Static().
-#define XSERVICEINFO_NOFACTORY_IMPL_0( Class, ImplName ) \
-XSERVICEINFO_COMMOM_IMPL( Class, ImplName ) \
- \
-css::uno::Sequence< OUString > \
-Class::getSupportedServiceNames_Static()
-
// 1 service name
#define XSERVICEINFO_NOFACTORY_IMPL_1( Class, ImplName, Service1 ) \
XSERVICEINFO_COMMOM_IMPL( Class, ImplName ) \
@@ -228,8 +221,7 @@ XSERVICEINFO_COMMOM_IMPL( Class, ImplName ) \
css::uno::Sequence< OUString > \
Class::getSupportedServiceNames_Static() \
{ \
- css::uno::Sequence< OUString > aSNS { Service1 }; \
- return aSNS; \
+ return { Service1 }; \
}
// Service with service factory.
@@ -256,7 +248,7 @@ Class::getSupportedServiceNames_Static()
css::uno::Sequence< OUString > \
Class::getSupportedServiceNames_Static() \
{ \
- return css::uno::Sequence< OUString > { Service1 }; \
+ return { Service1 }; \
}
// 1 service name
diff --git a/include/ucbhelper/resultset.hxx b/include/ucbhelper/resultset.hxx
index e2f9945d9055..d7f831fa7b92 100644
--- a/include/ucbhelper/resultset.hxx
+++ b/include/ucbhelper/resultset.hxx
@@ -125,9 +125,6 @@ public:
virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
throw( css::uno::RuntimeException, std::exception ) override;
- static OUString getImplementationName_Static();
- static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
-
// XComponent
virtual void SAL_CALL
dispose()
diff --git a/include/ucbhelper/resultsethelper.hxx b/include/ucbhelper/resultsethelper.hxx
index d2f6c73b8c3e..e35466fce85c 100644
--- a/include/ucbhelper/resultsethelper.hxx
+++ b/include/ucbhelper/resultsethelper.hxx
@@ -152,9 +152,6 @@ public:
virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
throw( css::uno::RuntimeException, std::exception ) override;
- static OUString getImplementationName_Static();
- static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
-
// XComponent ( base class of XDynamicResultSet )
virtual void SAL_CALL
dispose()