ucb/source/cacher/cachedcontentresultsetstub.cxx | 32 ----------------------- ucb/source/cacher/cachedcontentresultsetstub.hxx | 23 +++------------- ucb/source/cacher/cacheddynamicresultset.cxx | 32 ----------------------- ucb/source/cacher/cacheddynamicresultset.hxx | 23 +++------------- 4 files changed, 10 insertions(+), 100 deletions(-)
New commits: commit c5e9bc71c4803ccf7c1eaa23aed03bdaee31f001 Author: Noel Grandin <[email protected]> AuthorDate: Mon Oct 7 15:08:24 2019 +0200 Commit: Noel Grandin <[email protected]> CommitDate: Tue Oct 8 08:29:04 2019 +0200 use cppu::WeakImplHelper in CachedDynamicResultSetFactory Change-Id: Ia13306a3059678ef306835b8641a26200f9ae420 Reviewed-on: https://gerrit.libreoffice.org/80414 Tested-by: Jenkins Reviewed-by: Noel Grandin <[email protected]> diff --git a/ucb/source/cacher/cacheddynamicresultset.cxx b/ucb/source/cacher/cacheddynamicresultset.cxx index 22f9bb46e8b3..074bf0cc431f 100644 --- a/ucb/source/cacher/cacheddynamicresultset.cxx +++ b/ucb/source/cacher/cacheddynamicresultset.cxx @@ -161,38 +161,6 @@ CachedDynamicResultSetFactory::~CachedDynamicResultSetFactory() } -// CachedDynamicResultSetFactory XInterface methods. -void SAL_CALL CachedDynamicResultSetFactory::acquire() - throw() -{ - OWeakObject::acquire(); -} - -void SAL_CALL CachedDynamicResultSetFactory::release() - throw() -{ - OWeakObject::release(); -} - -css::uno::Any SAL_CALL CachedDynamicResultSetFactory::queryInterface( const css::uno::Type & rType ) -{ - css::uno::Any aRet = cppu::queryInterface( rType, - static_cast< XTypeProvider* >(this), - static_cast< XServiceInfo* >(this), - static_cast< XCachedDynamicResultSetFactory* >(this) - ); - return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType ); -} - -// CachedDynamicResultSetFactory XTypeProvider methods. - - -XTYPEPROVIDER_IMPL_3( CachedDynamicResultSetFactory, - XTypeProvider, - XServiceInfo, - XCachedDynamicResultSetFactory ); - - // CachedDynamicResultSetFactory XServiceInfo methods. XSERVICEINFO_COMMOM_IMPL( CachedDynamicResultSetFactory, diff --git a/ucb/source/cacher/cacheddynamicresultset.hxx b/ucb/source/cacher/cacheddynamicresultset.hxx index a6816ba06cc9..e5cb903564af 100644 --- a/ucb/source/cacher/cacheddynamicresultset.hxx +++ b/ucb/source/cacher/cacheddynamicresultset.hxx @@ -27,6 +27,7 @@ #include <com/sun/star/lang/XTypeProvider.hpp> #include <com/sun/star/ucb/XContentIdentifierMapping.hpp> #include <com/sun/star/ucb/XCachedDynamicResultSetFactory.hpp> +#include <cppuhelper/implbase.hxx> #define CACHED_DRS_SERVICE_NAME "com.sun.star.ucb.CachedDynamicResultSet" #define CACHED_DRS_FACTORY_NAME "com.sun.star.ucb.CachedDynamicResultSetFactory" @@ -78,11 +79,10 @@ public: }; -class CachedDynamicResultSetFactory final - : public cppu::OWeakObject - , public css::lang::XTypeProvider - , public css::lang::XServiceInfo - , public css::ucb::XCachedDynamicResultSetFactory +class CachedDynamicResultSetFactory final : + public cppu::WeakImplHelper< + css::lang::XServiceInfo, + css::ucb::XCachedDynamicResultSetFactory> { css::uno::Reference< css::uno::XComponentContext > m_xContext; @@ -93,19 +93,6 @@ public: virtual ~CachedDynamicResultSetFactory() override; - - // XInterface - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override; - virtual void SAL_CALL acquire() - throw() override; - virtual void SAL_CALL release() - throw() override; - - // XTypeProvider - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override; - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override; - - // XServiceInfo virtual OUString SAL_CALL getImplementationName() override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; commit 6a1485d4109ae5d0666d769406811d1918c90388 Author: Noel Grandin <[email protected]> AuthorDate: Mon Oct 7 15:06:49 2019 +0200 Commit: Noel Grandin <[email protected]> CommitDate: Tue Oct 8 08:28:57 2019 +0200 use cppu::WeakImplHelper in CachedContentResultSetStubFactory Change-Id: Ic0fb9aa44fefc9377ead2d815be0f522eaf8cb33 Reviewed-on: https://gerrit.libreoffice.org/80413 Tested-by: Jenkins Reviewed-by: Noel Grandin <[email protected]> diff --git a/ucb/source/cacher/cachedcontentresultsetstub.cxx b/ucb/source/cacher/cachedcontentresultsetstub.cxx index 24459ec66e6b..bf4651f79694 100644 --- a/ucb/source/cacher/cachedcontentresultsetstub.cxx +++ b/ucb/source/cacher/cachedcontentresultsetstub.cxx @@ -507,38 +507,6 @@ CachedContentResultSetStubFactory::~CachedContentResultSetStubFactory() } -// CachedContentResultSetStubFactory XInterface methods. -void SAL_CALL CachedContentResultSetStubFactory::acquire() - throw() -{ - OWeakObject::acquire(); -} - -void SAL_CALL CachedContentResultSetStubFactory::release() - throw() -{ - OWeakObject::release(); -} - -css::uno::Any SAL_CALL CachedContentResultSetStubFactory::queryInterface( const css::uno::Type & rType ) -{ - css::uno::Any aRet = cppu::queryInterface( rType, - static_cast< XTypeProvider* >(this), - static_cast< XServiceInfo* >(this), - static_cast< XCachedContentResultSetStubFactory* >(this) - ); - return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType ); -} - -// CachedContentResultSetStubFactory XTypeProvider methods. - - -XTYPEPROVIDER_IMPL_3( CachedContentResultSetStubFactory, - XTypeProvider, - XServiceInfo, - XCachedContentResultSetStubFactory ); - - // CachedContentResultSetStubFactory XServiceInfo methods. XSERVICEINFO_COMMOM_IMPL( CachedContentResultSetStubFactory, diff --git a/ucb/source/cacher/cachedcontentresultsetstub.hxx b/ucb/source/cacher/cachedcontentresultsetstub.hxx index 1913d3ebd6a9..d5e2838a269a 100644 --- a/ucb/source/cacher/cachedcontentresultsetstub.hxx +++ b/ucb/source/cacher/cachedcontentresultsetstub.hxx @@ -28,6 +28,7 @@ #include <com/sun/star/ucb/XFetchProvider.hpp> #include <com/sun/star/ucb/XFetchProviderForContentAccess.hpp> #include <com/sun/star/ucb/XCachedContentResultSetStubFactory.hpp> +#include <cppuhelper/implbase.hxx> #define CACHED_CRS_STUB_SERVICE_NAME "com.sun.star.ucb.CachedContentResultSetStub" #define CACHED_CRS_STUB_FACTORY_NAME "com.sun.star.ucb.CachedContentResultSetStubFactory" @@ -142,11 +143,10 @@ public: }; -class CachedContentResultSetStubFactory final - : public cppu::OWeakObject - , public css::lang::XTypeProvider - , public css::lang::XServiceInfo - , public css::ucb::XCachedContentResultSetStubFactory +class CachedContentResultSetStubFactory final : + public cppu::WeakImplHelper< + css::lang::XServiceInfo, + css::ucb::XCachedContentResultSetStubFactory> { public: @@ -154,19 +154,6 @@ public: virtual ~CachedContentResultSetStubFactory() override; - - // XInterface - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override; - virtual void SAL_CALL acquire() - throw() override; - virtual void SAL_CALL release() - throw() override; - - // XTypeProvider - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override; - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override; - - // XServiceInfo virtual OUString SAL_CALL getImplementationName() override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
