From c1692639bcee2f3b0b0f03347f8743b8a7307300 Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel.grandin@collabora.co.uk>
Date: Mon, 7 Oct 2019 14:49:16 +0200
Subject: use cppu::WeakImplHelper in ResultSetImplHelper

Change-Id: If82ae3f5cee0ae893fd32ecafe3c7baf7ec00ed4
Reviewed-on: https://gerrit.libreoffice.org/80408
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
---
 include/ucbhelper/resultsethelper.hxx | 22 ++++------------------
 1 file changed, 4 insertions(+), 18 deletions(-)

(limited to 'include/ucbhelper')

diff --git a/include/ucbhelper/resultsethelper.hxx b/include/ucbhelper/resultsethelper.hxx
index 15c74b4235c1..b297ebcebc82 100644
--- a/include/ucbhelper/resultsethelper.hxx
+++ b/include/ucbhelper/resultsethelper.hxx
@@ -26,7 +26,7 @@
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/ucb/XDynamicResultSet.hpp>
 #include <com/sun/star/ucb/OpenCommandArgument2.hpp>
-#include <cppuhelper/weak.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <ucbhelper/ucbhelperdllapi.h>
 
 namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } }
@@ -51,10 +51,9 @@ namespace ucbhelper {
   * - all required interfaces for service css::ucb::DynamicResultSet
   */
 class UCBHELPER_DLLPUBLIC ResultSetImplHelper :
-                public cppu::OWeakObject,
-                public css::lang::XTypeProvider,
-                public css::lang::XServiceInfo,
-                public css::ucb::XDynamicResultSet
+                public cppu::WeakImplHelper<
+                    css::lang::XServiceInfo,
+                    css::ucb::XDynamicResultSet>
 {
     std::unique_ptr<cppu::OInterfaceContainerHelper> m_pDisposeEventListeners;
     bool                         m_bStatic;
@@ -128,19 +127,6 @@ public:
       */
     virtual ~ResultSetImplHelper() 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;
-- 
cgit