diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-10-07 14:49:16 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-10-08 08:27:22 +0200 |
| commit | c1692639bcee2f3b0b0f03347f8743b8a7307300 (patch) | |
| tree | c737f528dbfbaf67e59bc7cb32d98ad65375eb93 /include/ucbhelper | |
| parent | 469e577852fd41655169cbb05fc610bd36a1e51a (diff) | |
use cppu::WeakImplHelper in ResultSetImplHelper
Change-Id: If82ae3f5cee0ae893fd32ecafe3c7baf7ec00ed4
Reviewed-on: https://gerrit.libreoffice.org/80408
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include/ucbhelper')
| -rw-r--r-- | include/ucbhelper/resultsethelper.hxx | 22 |
1 files changed, 4 insertions, 18 deletions
diff --git a/include/ucbhelper/resultsethelper.hxx b/include/ucbhelper/resultsethelper.hxx index 15c74b4235c1..b297ebcebc82 100644 --- a/include/ucbhelper/resultsethelper.hxx +++ b/include/ucbhelper/resultsethelper.hxx @@ -26,7 +26,7 @@ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/ucb/XDynamicResultSet.hpp> #include <com/sun/star/ucb/OpenCommandArgument2.hpp> -#include <cppuhelper/weak.hxx> +#include <cppuhelper/implbase.hxx> #include <ucbhelper/ucbhelperdllapi.h> namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } } @@ -51,10 +51,9 @@ namespace ucbhelper { * - all required interfaces for service css::ucb::DynamicResultSet */ class UCBHELPER_DLLPUBLIC ResultSetImplHelper : - public cppu::OWeakObject, - public css::lang::XTypeProvider, - public css::lang::XServiceInfo, - public css::ucb::XDynamicResultSet + public cppu::WeakImplHelper< + css::lang::XServiceInfo, + css::ucb::XDynamicResultSet> { std::unique_ptr<cppu::OInterfaceContainerHelper> m_pDisposeEventListeners; bool m_bStatic; @@ -128,19 +127,6 @@ public: */ virtual ~ResultSetImplHelper() 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; |