summaryrefslogtreecommitdiff
path: root/ucb
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2019-10-07 15:04:36 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2019-10-08 08:28:48 +0200
commit353be96d175d522b21440dbe2b39a67650eebf08 (patch)
treef1726ae252c8898b0960dc3b1fde1323e512f106 /ucb
parent32e48476fe514955aca5f66f6f7a632341623f01 (diff)
use cppu::WeakImplHelper in CachedContentResultSetFactory
Change-Id: I1575e051fe963a4bf73453a7e6b89c9c891d1ff9 Reviewed-on: https://gerrit.libreoffice.org/80412 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'ucb')
-rw-r--r--ucb/source/cacher/cachedcontentresultset.cxx33
-rw-r--r--ucb/source/cacher/cachedcontentresultset.hxx22
2 files changed, 5 insertions, 50 deletions
diff --git a/ucb/source/cacher/cachedcontentresultset.cxx b/ucb/source/cacher/cachedcontentresultset.cxx
index a84be15215c6..a6a2899aef99 100644
--- a/ucb/source/cacher/cachedcontentresultset.cxx
+++ b/ucb/source/cacher/cachedcontentresultset.cxx
@@ -2066,39 +2066,6 @@ CachedContentResultSetFactory::~CachedContentResultSetFactory()
{
}
-
-// CachedContentResultSetFactory XInterface methods.
-void SAL_CALL CachedContentResultSetFactory::acquire()
- throw()
-{
- OWeakObject::acquire();
-}
-
-void SAL_CALL CachedContentResultSetFactory::release()
- throw()
-{
- OWeakObject::release();
-}
-
-css::uno::Any SAL_CALL CachedContentResultSetFactory::queryInterface( const css::uno::Type & rType )
-{
- css::uno::Any aRet = cppu::queryInterface( rType,
- static_cast< XTypeProvider* >(this),
- static_cast< XServiceInfo* >(this),
- static_cast< XCachedContentResultSetFactory* >(this)
- );
- return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
-}
-
-// CachedContentResultSetFactory XTypeProvider methods.
-
-
-XTYPEPROVIDER_IMPL_3( CachedContentResultSetFactory,
- XTypeProvider,
- XServiceInfo,
- XCachedContentResultSetFactory );
-
-
// CachedContentResultSetFactory XServiceInfo methods.
XSERVICEINFO_COMMOM_IMPL( CachedContentResultSetFactory,
diff --git a/ucb/source/cacher/cachedcontentresultset.hxx b/ucb/source/cacher/cachedcontentresultset.hxx
index fc1741b5412f..3e450f4d01ea 100644
--- a/ucb/source/cacher/cachedcontentresultset.hxx
+++ b/ucb/source/cacher/cachedcontentresultset.hxx
@@ -31,6 +31,7 @@
#include <com/sun/star/ucb/FetchResult.hpp>
#include <com/sun/star/ucb/XContentIdentifierMapping.hpp>
#include <com/sun/star/ucb/XCachedContentResultSetFactory.hpp>
+#include <cppuhelper/implbase.hxx>
#include <rtl/ref.hxx>
#include <memory>
@@ -365,11 +366,10 @@ private:
};
-class CachedContentResultSetFactory final
- : public cppu::OWeakObject
- , public css::lang::XTypeProvider
- , public css::lang::XServiceInfo
- , public css::ucb::XCachedContentResultSetFactory
+class CachedContentResultSetFactory final :
+ public cppu::WeakImplHelper<
+ css::lang::XServiceInfo,
+ css::ucb::XCachedContentResultSetFactory>
{
css::uno::Reference< css::uno::XComponentContext > m_xContext;
@@ -379,18 +379,6 @@ public:
virtual ~CachedContentResultSetFactory() 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;