include/ucbhelper/macros.hxx | 26 -------------------------- ucb/source/ucp/webdav/webdavprovider.cxx | 21 +++++++++++++++++++-- 2 files changed, 19 insertions(+), 28 deletions(-)
New commits: commit 7211f0d15d5a982a37cfb9e58da323177ae7e350 Author: Julien Nabet <[email protected]> AuthorDate: Tue Aug 11 09:27:43 2020 +0200 Commit: Julien Nabet <[email protected]> CommitDate: Tue Aug 11 10:52:13 2020 +0200 Expand XSERVICEINFO_COMMOM_IMPL macro which is now used only once Change-Id: I32de3f604cbb6863e29c0a63b599920a988c8389 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100463 Tested-by: Jenkins Reviewed-by: Julien Nabet <[email protected]> diff --git a/include/ucbhelper/macros.hxx b/include/ucbhelper/macros.hxx index 8e62bc278e84..ecdbeef7007e 100644 --- a/include/ucbhelper/macros.hxx +++ b/include/ucbhelper/macros.hxx @@ -141,32 +141,6 @@ GETTYPES_IMPL_START( Class ) \ CPPU_TYPE_REF( I11 ) \ GETTYPES_IMPL_END -// XServiceInfo impl. internals - - -#define XSERVICEINFO_COMMOM_IMPL( Class, ImplName ) \ -OUString SAL_CALL Class::getImplementationName() \ -{ \ - return getImplementationName_Static(); \ -} \ - \ -OUString Class::getImplementationName_Static() \ -{ \ - return ImplName; \ -} \ - \ -sal_Bool SAL_CALL \ -Class::supportsService( const OUString& ServiceName ) \ -{ \ - return cppu::supportsService( this, ServiceName ); \ -} \ - \ -css::uno::Sequence< OUString > SAL_CALL \ -Class::getSupportedServiceNames() \ -{ \ - return getSupportedServiceNames_Static(); \ -} - #endif /* ! INCLUDED_UCBHELPER_MACROS_HXX */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/ucb/source/ucp/webdav/webdavprovider.cxx b/ucb/source/ucp/webdav/webdavprovider.cxx index 002f90194023..366d341b1591 100644 --- a/ucb/source/ucp/webdav/webdavprovider.cxx +++ b/ucb/source/ucp/webdav/webdavprovider.cxx @@ -82,9 +82,26 @@ XTYPEPROVIDER_IMPL_3( ContentProvider, // XServiceInfo methods. +OUString SAL_CALL ContentProvider::getImplementationName() +{ + return getImplementationName_Static(); +} + +OUString ContentProvider::getImplementationName_Static() +{ + return "com.sun.star.comp.WebDAVContentProvider"; +} + +sal_Bool SAL_CALL ContentProvider::supportsService( const OUString& ServiceName ) +{ + return cppu::supportsService( this, ServiceName ); +} + +css::uno::Sequence< OUString > SAL_CALL ContentProvider::getSupportedServiceNames() +{ + return getSupportedServiceNames_Static(); +} -XSERVICEINFO_COMMOM_IMPL( ContentProvider, - "com.sun.star.comp.WebDAVContentProvider" ) /// @throws css::uno::Exception static css::uno::Reference< css::uno::XInterface > ContentProvider_CreateInstance( const css::uno::Reference< css::lang::XMultiServiceFactory> & rSMgr ) _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
