diff options
| -rw-r--r-- | include/ucbhelper/resultsethelper.hxx | 22 | ||||
| -rw-r--r-- | ucbhelper/source/provider/resultsethelper.cxx | 33 |
2 files changed, 4 insertions, 51 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; diff --git a/ucbhelper/source/provider/resultsethelper.cxx b/ucbhelper/source/provider/resultsethelper.cxx index 279bbc4deb84..e9c97dff46e7 100644 --- a/ucbhelper/source/provider/resultsethelper.cxx +++ b/ucbhelper/source/provider/resultsethelper.cxx @@ -65,39 +65,6 @@ ResultSetImplHelper::~ResultSetImplHelper() } -// XInterface methods. -void SAL_CALL ResultSetImplHelper::acquire() - throw() -{ - OWeakObject::acquire(); -} - -void SAL_CALL ResultSetImplHelper::release() - throw() -{ - OWeakObject::release(); -} - -css::uno::Any SAL_CALL ResultSetImplHelper::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::XDynamicResultSet* >(this) - ); - return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType ); -} - -// XTypeProvider methods. - - -XTYPEPROVIDER_IMPL_3( ResultSetImplHelper, - lang::XTypeProvider, - lang::XServiceInfo, - css::ucb::XDynamicResultSet ); - - // XServiceInfo methods. OUString SAL_CALL ResultSetImplHelper::getImplementationName() |