use cppu::WeakImplHelper in InteractionRequest

Change-Id: I5f79ac795d17158c3e74aa76baf8483892cec920
Reviewed-on: https://gerrit.libreoffice.org/80404
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

2 files changed, 3 insertions, 67 deletions

diff --git a/include/ucbhelper/interactionrequest.hxx b/include/ucbhelper/interactionrequest.hxx
index fca1a63c2cdd..137f75434093 100644
--- a/include/ucbhelper/interactionrequest.hxx
+++ b/include/ucbhelper/interactionrequest.hxx
@@ -29,7 +29,7 @@
 #include <com/sun/star/ucb/XInteractionAuthFallback.hpp>
 #include <com/sun/star/ucb/XInteractionReplaceExistingData.hpp>
 #include <com/sun/star/ucb/XInteractionSupplyAuthentication2.hpp>
-#include <cppuhelper/weak.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <ucbhelper/ucbhelperdllapi.h>
 #include <memory>
 
@@ -61,9 +61,8 @@ struct InteractionRequest_Impl;
   * This class can also be used as base class for more specialized requests,
   * like authentication requests.
   */
-class UCBHELPER_DLLPUBLIC InteractionRequest : public cppu::OWeakObject,
-                           public css::lang::XTypeProvider,
-                           public css::task::XInteractionRequest
+class UCBHELPER_DLLPUBLIC InteractionRequest :
+                           public cppu::WeakImplHelper<css::task::XInteractionRequest>
 {
     std::unique_ptr<InteractionRequest_Impl> m_pImpl;
 
@@ -89,20 +88,6 @@ public:
     void setContinuations(
         const css::uno::Sequence< css::uno::Reference< css::task::XInteractionContinuation > > & rContinuations );
 
-    // 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< css::uno::Type > SAL_CALL
-    getTypes() override;
-    virtual css::uno::Sequence< sal_Int8 > SAL_CALL
-    getImplementationId() override;
-
     // XInteractionRequest
     virtual css::uno::Any SAL_CALL
     getRequest() override;
diff --git a/ucbhelper/source/provider/interactionrequest.cxx b/ucbhelper/source/provider/interactionrequest.cxx
index 277c2611ac95..0dbc568fcaa7 100644
--- a/ucbhelper/source/provider/interactionrequest.cxx
+++ b/ucbhelper/source/provider/interactionrequest.cxx
@@ -105,55 +105,6 @@ void InteractionRequest::setSelection(
 // XInterface methods.
 
 
-// virtual
-void SAL_CALL InteractionRequest::acquire()
-    throw()
-{
-    OWeakObject::acquire();
-}
-
-
-// virtual
-void SAL_CALL InteractionRequest::release()
-    throw()
-{
-    OWeakObject::release();
-}
-
-
-// virtual
-uno::Any SAL_CALL
-InteractionRequest::queryInterface( const uno::Type & rType )
-{
-    uno::Any aRet = cppu::queryInterface( rType,
-                static_cast< lang::XTypeProvider * >( this ),
-                static_cast< task::XInteractionRequest * >( this ) );
-
-    return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
-}
-
-
-// XTypeProvider methods.
-
-
-// virtual
-uno::Sequence< sal_Int8 > SAL_CALL InteractionRequest::getImplementationId()
-{
-    return css::uno::Sequence<sal_Int8>();
-}
-
-
-// virtual
-uno::Sequence< uno::Type > SAL_CALL InteractionRequest::getTypes()
-{
-    static cppu::OTypeCollection s_aCollection(
-                cppu::UnoType<lang::XTypeProvider>::get(),
-                cppu::UnoType<task::XInteractionRequest>::get() );
-
-    return s_aCollection.getTypes();
-}
-
-
 // XInteractionRequest methods.