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>

2 files changed, 5 insertions, 48 deletions

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
 
 
diff --git a/ucbhelper/source/provider/providerhelper.cxx b/ucbhelper/source/provider/providerhelper.cxx
index ff15d082e042..a2c2f21bdcc4 100644
--- a/ucbhelper/source/provider/providerhelper.cxx
+++ b/ucbhelper/source/provider/providerhelper.cxx
@@ -73,34 +73,6 @@ ContentProviderImplHelper::~ContentProviderImplHelper()
 {
 }
 
-// XInterface
-void SAL_CALL ContentProviderImplHelper::acquire()
-    throw()
-{
-    OWeakObject::acquire();
-}
-
-void SAL_CALL ContentProviderImplHelper::release()
-    throw()
-{
-    OWeakObject::release();
-}
-
-css::uno::Any SAL_CALL ContentProviderImplHelper::queryInterface( const css::uno::Type & rType )
-{
-    css::uno::Any aRet = cppu::queryInterface( rType,
-                                               static_cast< lang::XTypeProvider* >(this),
-                                               static_cast< lang::XServiceInfo* >(this),
-                                               static_cast< css::ucb::XContentProvider* >(this)
-                                               );
-    return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
-}
-
-XTYPEPROVIDER_IMPL_3( ContentProviderImplHelper,
-                         lang::XTypeProvider,
-                         lang::XServiceInfo,
-                         css::ucb::XContentProvider );
-
 // virtual
 sal_Bool SAL_CALL ContentProviderImplHelper::supportsService(
                                             const OUString& ServiceName )