[Libreoffice-commits] core.git: connectivity/source include/connectivity

[Stephan Bergmann]

 connectivity/source/commontools/paramwrapper.cxx |   11 ++++++-----
 include/connectivity/paramwrapper.hxx            |    6 +++---
 2 files changed, 9 insertions(+), 8 deletions(-)

New commits:
commit 8b533d84f3ae211fdfafc2adc8d8567f366771d4
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Mar 28 11:16:38 2014 +0100

    Missing XTypeProvider base class
    
    Change-Id: I4e457b55d7d5cd255a0931030f35150d1dd6bf09

diff --git a/connectivity/source/commontools/paramwrapper.cxx b/connectivity/source/commontools/paramwrapper.cxx
index 84e4720..9c4af0e 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 8d284aa..60ff2cc 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;