summaryrefslogtreecommitdiff
path: root/include/ucbhelper
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2019-10-07 14:50:38 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2019-10-08 08:27:40 +0200
commit81c150f3e5a48040fb194f1d5b10349ef8fcefb1 (patch)
treea65975fc5b17425141cb4356dc0e7f41a3c1631b /include/ucbhelper
parentc1692639bcee2f3b0b0f03347f8743b8a7307300 (diff)
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>
Diffstat (limited to 'include/ucbhelper')
-rw-r--r--include/ucbhelper/resultsetmetadata.hxx19
1 files changed, 2 insertions, 17 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
/**