use cppu::WeakImplHelper in PropertySetInfo

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

2 files changed, 2 insertions, 46 deletions

diff --git a/include/ucbhelper/contentinfo.hxx b/include/ucbhelper/contentinfo.hxx
index b6d2bad87e65..f3f455af98ff 100644
--- a/include/ucbhelper/contentinfo.hxx
+++ b/include/ucbhelper/contentinfo.hxx
@@ -24,7 +24,7 @@
 #include <com/sun/star/ucb/XCommandInfo.hpp>
 #include <com/sun/star/lang/XTypeProvider.hpp>
 #include <com/sun/star/beans/XPropertySetInfo.hpp>
-#include <cppuhelper/weak.hxx>
+#include <cppuhelper/implbase.hxx>
 
 #include <osl/mutex.hxx>
 
@@ -45,9 +45,7 @@ class ContentImplHelper;
   * Core Properties that may have been added to the content.
   */
 class PropertySetInfo :
-                public cppu::OWeakObject,
-                public css::lang::XTypeProvider,
-                public css::beans::XPropertySetInfo
+                public cppu::WeakImplHelper<css::beans::XPropertySetInfo>
 {
     css::uno::Reference< css::ucb::XCommandEnvironment >
                                 m_xEnv;
@@ -65,19 +63,6 @@ public:
                      ContentImplHelper* pContent );
     virtual ~PropertySetInfo() 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;
-
     // XPropertySetInfo
     virtual css::uno::Sequence<
                 css::beans::Property > SAL_CALL
diff --git a/ucbhelper/source/provider/contentinfo.cxx b/ucbhelper/source/provider/contentinfo.cxx
index c64bba28212b..64feb16e2b74 100644
--- a/ucbhelper/source/provider/contentinfo.cxx
+++ b/ucbhelper/source/provider/contentinfo.cxx
@@ -56,35 +56,6 @@ PropertySetInfo::~PropertySetInfo()
 }
 
 
-// XInterface methods.
-
-void SAL_CALL PropertySetInfo::acquire()
-    throw()
-{
-    OWeakObject::acquire();
-}
-
-void SAL_CALL PropertySetInfo::release()
-    throw()
-{
-    OWeakObject::release();
-}
-
-css::uno::Any SAL_CALL PropertySetInfo::queryInterface( const css::uno::Type & rType )
-{
-    css::uno::Any aRet = cppu::queryInterface( rType,
-                                               static_cast< lang::XTypeProvider* >(this),
-                                               static_cast< beans::XPropertySetInfo* >(this)
-                                               );
-    return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
-}
-
-// XTypeProvider methods.
-XTYPEPROVIDER_IMPL_2( PropertySetInfo,
-                      lang::XTypeProvider,
-                      beans::XPropertySetInfo );
-
-
 // XPropertySetInfo methods.