summaryrefslogtreecommitdiff
path: root/ucb/source/ucp/hierarchy
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 /ucb/source/ucp/hierarchy
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 'ucb/source/ucp/hierarchy')
-rw-r--r--ucb/source/ucp/hierarchy/hierarchydatasource.cxx24
1 files changed, 14 insertions, 10 deletions
diff --git a/ucb/source/ucp/hierarchy/hierarchydatasource.cxx b/ucb/source/ucp/hierarchy/hierarchydatasource.cxx
index 87d1353ac7dc..a3eed99bba95 100644
--- a/ucb/source/ucp/hierarchy/hierarchydatasource.cxx
+++ b/ucb/source/ucp/hierarchy/hierarchydatasource.cxx
@@ -107,9 +107,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();
-
// XTypeProvider
virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
throw( css::uno::RuntimeException, std::exception ) override;
@@ -722,15 +719,22 @@ uno::Sequence< uno::Type > SAL_CALL HierarchyDataAccess::getTypes()
// XServiceInfo methods.
+OUString SAL_CALL HierarchyDataAccess::getImplementationName()
+ throw( css::uno::RuntimeException, std::exception )
+{
+ return OUString("com.sun.star.comp.ucb.HierarchyDataAccess");
+}
-XSERVICEINFO_NOFACTORY_IMPL_0(
- HierarchyDataAccess,
- OUString( "com.sun.star.comp.ucb.HierarchyDataAccess" ) )
+sal_Bool SAL_CALL HierarchyDataAccess::supportsService( const OUString& ServiceName )
+ throw( css::uno::RuntimeException, std::exception )
{
- uno::Sequence< OUString > aSNS( 2 );
- aSNS[ 0 ] = READ_SERVICE_NAME;
- aSNS[ 1 ] = READWRITE_SERVICE_NAME;
- return aSNS;
+ return cppu::supportsService( this, ServiceName );
+}
+
+css::uno::Sequence< OUString > SAL_CALL HierarchyDataAccess::getSupportedServiceNames()
+ throw( css::uno::RuntimeException, std::exception )
+{
+ return { READ_SERVICE_NAME, READWRITE_SERVICE_NAME };
}