include/ucbhelper/resultset.hxx | 34 +++++++-----------------
ucbhelper/source/provider/resultset.cxx | 45 --------------------------------
2 files changed, 10 insertions(+), 69 deletions(-)
New commits:
commit 7426fd34b3979ce546f749dba15f58e299b62eac
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Mon Oct 7 14:48:02 2019 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Tue Oct 8 14:08:36 2019 +0200
use cppu::WeakImplHelper in ResultSet
Change-Id: I9d6feef38532b0057e16fc3f25b0f285d3dfcb99
Reviewed-on: https://gerrit.libreoffice.org/80407
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/include/ucbhelper/resultset.hxx b/include/ucbhelper/resultset.hxx
index 7dcdce8cb8d4..2c5e99bdc2a9 100644
--- a/include/ucbhelper/resultset.hxx
+++ b/include/ucbhelper/resultset.hxx
@@ -32,7 +32,7 @@
#include <rtl/ref.hxx>
#include <salhelper/simplereferenceobject.hxx>
-#include <cppuhelper/weak.hxx>
+#include <cppuhelper/implbase.hxx>
#include <ucbhelper/ucbhelperdllapi.h>
#include <memory>
@@ -58,16 +58,15 @@ struct ResultSet_Impl;
* @see ResultSetDataSupplier
*/
class UCBHELPER_DLLPUBLIC ResultSet :
- public cppu::OWeakObject,
- public css::lang::XTypeProvider,
- public css::lang::XServiceInfo,
- public css::lang::XComponent,
- public css::ucb::XContentAccess,
- public css::sdbc::XResultSet,
- public css::sdbc::XResultSetMetaDataSupplier,
- public css::sdbc::XRow,
- public css::sdbc::XCloseable,
- public css::beans::XPropertySet
+ public cppu::WeakImplHelper<
+ css::lang::XServiceInfo,
+ css::lang::XComponent,
+ css::ucb::XContentAccess,
+ css::sdbc::XResultSet,
+ css::sdbc::XResultSetMetaDataSupplier,
+ css::sdbc::XRow,
+ css::sdbc::XCloseable,
+ css::beans::XPropertySet>
{
std::unique_ptr<ResultSet_Impl> m_pImpl;
@@ -101,19 +100,6 @@ public:
const css::uno::Reference< css::ucb::XCommandEnvironment >& rxEnv
);
virtual ~ResultSet() 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;
-
// XServiceInfo
virtual OUString SAL_CALL getImplementationName() override;
virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
override;
diff --git a/ucbhelper/source/provider/resultset.cxx
b/ucbhelper/source/provider/resultset.cxx
index 64991e0a4c7c..133b66a1da56 100644
--- a/ucbhelper/source/provider/resultset.cxx
+++ b/ucbhelper/source/provider/resultset.cxx
@@ -208,51 +208,6 @@ ResultSet::~ResultSet()
}
-// XInterface methods.
-
-void SAL_CALL ResultSet::acquire()
- throw()
-{
- OWeakObject::acquire();
-}
-
-void SAL_CALL ResultSet::release()
- throw()
-{
- OWeakObject::release();
-}
-
-css::uno::Any SAL_CALL ResultSet::queryInterface( const css::uno::Type & rType
)
-{
- css::uno::Any aRet = cppu::queryInterface( rType,
- static_cast<
lang::XTypeProvider* >(this),
- static_cast<
lang::XServiceInfo* >(this),
- static_cast< lang::XComponent*
>(this),
- static_cast<
css::ucb::XContentAccess* >(this),
- static_cast< sdbc::XResultSet*
>(this),
- static_cast<
sdbc::XResultSetMetaDataSupplier* >(this),
- static_cast< sdbc::XRow*
>(this),
- static_cast< sdbc::XCloseable*
>(this),
- static_cast<
beans::XPropertySet* >(this)
- );
- return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
-}
-
-// XTypeProvider methods.
-
-
-XTYPEPROVIDER_IMPL_9( ResultSet,
- lang::XTypeProvider,
- lang::XServiceInfo,
- lang::XComponent,
- css::ucb::XContentAccess,
- sdbc::XResultSet,
- sdbc::XResultSetMetaDataSupplier,
- sdbc::XRow,
- sdbc::XCloseable,
- beans::XPropertySet );
-
-
// XServiceInfo methods.
OUString SAL_CALL ResultSet::getImplementationName()
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
