diff options
| -rw-r--r-- | include/ucbhelper/propertyvalueset.hxx | 22 | ||||
| -rw-r--r-- | ucbhelper/source/provider/propertyvalueset.cxx | 32 |
2 files changed, 4 insertions, 50 deletions
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; diff --git a/ucbhelper/source/provider/propertyvalueset.cxx b/ucbhelper/source/provider/propertyvalueset.cxx index 32fabcff3b58..e1be42d2a39d 100644 --- a/ucbhelper/source/provider/propertyvalueset.cxx +++ b/ucbhelper/source/provider/propertyvalueset.cxx @@ -153,38 +153,6 @@ PropertyValueSet::~PropertyValueSet() } -// XInterface methods. -void SAL_CALL PropertyValueSet::acquire() - throw() -{ - OWeakObject::acquire(); -} - -void SAL_CALL PropertyValueSet::release() - throw() -{ - OWeakObject::release(); -} - -css::uno::Any SAL_CALL PropertyValueSet::queryInterface( const css::uno::Type & rType ) -{ - css::uno::Any aRet = cppu::queryInterface( rType, - static_cast< XTypeProvider* >(this), - static_cast< XRow* >(this), - static_cast< XColumnLocate* >(this) - ); - return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType ); -} - -// XTypeProvider methods. - - -XTYPEPROVIDER_IMPL_3( PropertyValueSet, - XTypeProvider, - XRow, - XColumnLocate ); - - // XRow methods. |