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

Change-Id: I1b2c4a296de6d1d6769f9e82380d1b45d506daca
Reviewed-on: https://gerrit.libreoffice.org/80406
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
---
 include/ucbhelper/providerhelper.hxx | 25 +++++--------------------
 1 file changed, 5 insertions(+), 20 deletions(-)

(limited to 'include/ucbhelper')

diff --git a/include/ucbhelper/providerhelper.hxx b/include/ucbhelper/providerhelper.hxx
index 95a7369bedd1..919a0909028f 100644
--- a/include/ucbhelper/providerhelper.hxx
+++ b/include/ucbhelper/providerhelper.hxx
@@ -25,7 +25,7 @@
 #include <com/sun/star/ucb/XContentProvider.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/lang/XTypeProvider.hpp>
-#include <cppuhelper/weak.hxx>
+#include <cppuhelper/implbase.hxx>
 
 #include <rtl/ref.hxx>
 #include <ucbhelper/ucbhelperdllapi.h>
@@ -61,10 +61,10 @@ typedef std::vector< ContentImplHelperRef > ContentRefList;
   *   ( These set contains the properties added to a content using its
   *   XPropertyContainer interface )
   */
-class UCBHELPER_DLLPUBLIC ContentProviderImplHelper : public cppu::OWeakObject,
-                                    public css::lang::XTypeProvider,
-                                    public css::lang::XServiceInfo,
-                                    public css::ucb::XContentProvider
+class UCBHELPER_DLLPUBLIC ContentProviderImplHelper :
+                                    public cppu::WeakImplHelper<
+                                        css::lang::XServiceInfo,
+                                        css::ucb::XContentProvider>
 {
     friend class ContentImplHelper;
 
@@ -135,21 +135,6 @@ public:
     virtual ~ContentProviderImplHelper() 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
 
 
-- 
cgit