diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-03-28 11:16:38 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-03-28 11:16:38 +0100 |
| commit | 8b533d84f3ae211fdfafc2adc8d8567f366771d4 (patch) | |
| tree | f06f1058756bccf21686a9d06b4d5d71fe3963bc | |
| parent | 8a85479845c89093bd2a05c31bccf8cbb7c55ad3 (diff) | |
Missing XTypeProvider base class
Change-Id: I4e457b55d7d5cd255a0931030f35150d1dd6bf09
| -rw-r--r-- | connectivity/source/commontools/paramwrapper.cxx | 11 | ||||
| -rw-r--r-- | include/connectivity/paramwrapper.hxx | 6 |
2 files changed, 9 insertions, 8 deletions
diff --git a/connectivity/source/commontools/paramwrapper.cxx b/connectivity/source/commontools/paramwrapper.cxx index 84e472097bc0..9c4af0eb8b46 100644 --- a/connectivity/source/commontools/paramwrapper.cxx +++ b/connectivity/source/commontools/paramwrapper.cxx @@ -103,11 +103,12 @@ namespace param Sequence< Type > SAL_CALL ParameterWrapper::getTypes( ) throw(RuntimeException, std::exception) { - Sequence< Type > aTypes( 4 ); - aTypes[ 1 ] = ::getCppuType( static_cast< Reference< XWeak >* >( NULL ) ); - aTypes[ 1 ] = ::getCppuType( static_cast< Reference< XPropertySet >* >( NULL ) ); - aTypes[ 2 ] = ::getCppuType( static_cast< Reference< XFastPropertySet >* >( NULL ) ); - aTypes[ 3 ] = ::getCppuType( static_cast< Reference< XMultiPropertySet >* >( NULL ) ); + Sequence< Type > aTypes( 5 ); + aTypes[ 0 ] = ::getCppuType( static_cast< Reference< XWeak >* >( NULL ) ); + aTypes[ 1 ] = ::getCppuType( static_cast< Reference< XTypeProvider >* >( NULL ) ); + aTypes[ 2 ] = ::getCppuType( static_cast< Reference< XPropertySet >* >( NULL ) ); + aTypes[ 3 ] = ::getCppuType( static_cast< Reference< XFastPropertySet >* >( NULL ) ); + aTypes[ 4 ] = ::getCppuType( static_cast< Reference< XMultiPropertySet >* >( NULL ) ); return aTypes; } diff --git a/include/connectivity/paramwrapper.hxx b/include/connectivity/paramwrapper.hxx index 8d284aaa0e49..60ff2cc72f95 100644 --- a/include/connectivity/paramwrapper.hxx +++ b/include/connectivity/paramwrapper.hxx @@ -51,6 +51,7 @@ namespace param property "Value", which is forwarded to an XParameters interface */ class OOO_DLLPUBLIC_DBTOOLS ParameterWrapper :public ::cppu::OWeakObject + ,public css::lang::XTypeProvider ,public ::comphelper::OMutexAndBroadcastHelper ,public ::cppu::OPropertySetHelper { @@ -91,9 +92,8 @@ namespace param DECLARE_XINTERFACE() - //TODO: are these actually used (given they are not SAL_OVERRIDE)? - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; |