From 850abad67bc05f823bc3975367b33ec67449b5c5 Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel.grandin@collabora.co.uk>
Date: Mon, 7 Oct 2019 14:42:01 +0200
Subject: use cppu::WeakImplHelper in PropertyValueSet

Change-Id: I48b0292207a88234290ffc9a3ca5585ee9b924e3
Reviewed-on: https://gerrit.libreoffice.org/80405
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
---
 include/ucbhelper/propertyvalueset.hxx | 22 ++++------------------
 1 file changed, 4 insertions(+), 18 deletions(-)

(limited to 'include/ucbhelper')

diff --git a/include/ucbhelper/propertyvalueset.hxx b/include/ucbhelper/propertyvalueset.hxx
index 97ee7c6ec889..d1276fdb3ef5 100644
--- a/include/ucbhelper/propertyvalueset.hxx
+++ b/include/ucbhelper/propertyvalueset.hxx
@@ -24,7 +24,7 @@
 #include <com/sun/star/sdbc/XColumnLocate.hpp>
 #include <com/sun/star/sdbc/XRow.hpp>
 #include <com/sun/star/beans/Property.hpp>
-#include <cppuhelper/weak.hxx>
+#include <cppuhelper/implbase.hxx>
 
 #include <osl/mutex.hxx>
 #include <ucbhelper/ucbhelperdllapi.h>
@@ -56,10 +56,9 @@ class PropertyValues;
   * directly be returned by the implementation of the command.
   */
 class UCBHELPER_DLLPUBLIC PropertyValueSet :
-                public cppu::OWeakObject,
-                public css::lang::XTypeProvider,
-                public css::sdbc::XRow,
-                public css::sdbc::XColumnLocate
+                public cppu::WeakImplHelper<
+                    css::sdbc::XRow,
+                    css::sdbc::XColumnLocate>
 {
     css::uno::Reference< css::uno::XComponentContext >   m_xContext;
     css::uno::Reference< css::script::XTypeConverter >   m_xTypeConverter;
@@ -83,19 +82,6 @@ public:
             const css::uno::Reference< css::uno::XComponentContext >& rxContext );
     virtual ~PropertyValueSet() 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;
-
     // XRow
     virtual sal_Bool SAL_CALL
     wasNull() override;
-- 
cgit