use cppu::WeakImplHelper in ResultSetMetaData

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

2 files changed, 2 insertions, 48 deletions

diff --git a/include/ucbhelper/resultsetmetadata.hxx b/include/ucbhelper/resultsetmetadata.hxx
index a0d9d553bb51..7fecfafedb76 100644
--- a/include/ucbhelper/resultsetmetadata.hxx
+++ b/include/ucbhelper/resultsetmetadata.hxx
@@ -26,7 +26,7 @@
 #include <com/sun/star/uno/Sequence.h>
 #include <com/sun/star/lang/XTypeProvider.hpp>
 #include <com/sun/star/sdbc/XResultSetMetaData.hpp>
-#include <cppuhelper/weak.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <ucbhelper/ucbhelperdllapi.h>
 
 namespace com { namespace sun { namespace star {
@@ -71,9 +71,7 @@ ResultSetColumnData::ResultSetColumnData()
  * implementations of service com.sun.star.ucb.ContentResultSet.
  */
 class UCBHELPER_DLLPUBLIC ResultSetMetaData final :
-                public ::cppu::OWeakObject,
-                public css::lang::XTypeProvider,
-                public css::sdbc::XResultSetMetaData
+                public cppu::WeakImplHelper<css::sdbc::XResultSetMetaData>
 {
     std::unique_ptr<ucbhelper_impl::ResultSetMetaData_Impl> m_pImpl;
     css::uno::Reference< css::uno::XComponentContext >    m_xContext;
@@ -115,19 +113,6 @@ public:
       */
     virtual ~ResultSetMetaData() 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;
-
     // XResultSetMetaData
 
     /**
diff --git a/ucbhelper/source/provider/resultsetmetadata.cxx b/ucbhelper/source/provider/resultsetmetadata.cxx
index e8a8155b7365..fe3d2b7c1e1f 100644
--- a/ucbhelper/source/provider/resultsetmetadata.cxx
+++ b/ucbhelper/source/provider/resultsetmetadata.cxx
@@ -106,37 +106,6 @@ ResultSetMetaData::~ResultSetMetaData()
 }
 
 
-// XInterface methods.
-
-void SAL_CALL ResultSetMetaData::acquire()
-    throw()
-{
-    OWeakObject::acquire();
-}
-
-void SAL_CALL ResultSetMetaData::release()
-    throw()
-{
-    OWeakObject::release();
-}
-
-css::uno::Any SAL_CALL ResultSetMetaData::queryInterface( const css::uno::Type & rType )
-{
-    css::uno::Any aRet = cppu::queryInterface( rType,
-                                               static_cast< XTypeProvider* >(this),
-                                               static_cast< XResultSetMetaData* >(this)
-                                               );
-    return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
-}
-
-// XTypeProvider methods.
-
-
-XTYPEPROVIDER_IMPL_2( ResultSetMetaData,
-                      XTypeProvider,
-                      XResultSetMetaData );
-
-
 // XResultSetMetaData methods.