diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-20 01:47:02 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-20 01:47:02 +0000 |
| commit | 79c09920ab7de543d6da3e5384f2f3b302bc68dc (patch) | |
| tree | 7c0b5432c98b78f29bef908457de0380ff604707 /dbaccess/source | |
| parent | e421d40fce2773ae30e4e64d1f194fca602b5204 (diff) | |
INTEGRATION: CWS warnings01 (1.4.50); FILE MERGED
2006/03/24 15:35:54 fs 1.4.50.1: #i57457# warning-free code (unxlngi6/.pro + unxsoli4.pro)
Diffstat (limited to 'dbaccess/source')
| -rw-r--r-- | dbaccess/source/core/inc/definitioncolumn.hxx | 31 |
1 files changed, 23 insertions, 8 deletions
diff --git a/dbaccess/source/core/inc/definitioncolumn.hxx b/dbaccess/source/core/inc/definitioncolumn.hxx index 42271507558c..609efb894f8b 100644 --- a/dbaccess/source/core/inc/definitioncolumn.hxx +++ b/dbaccess/source/core/inc/definitioncolumn.hxx @@ -4,9 +4,9 @@ * * $RCSfile: definitioncolumn.hxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: rt $ $Date: 2005-09-08 13:36:39 $ + * last change: $Author: hr $ $Date: 2006-06-20 02:47:02 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -133,6 +133,9 @@ namespace dbaccess protected: // XUnoTunnel virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException); + + protected: + using OColumn::getFastPropertyValue; }; /** @@ -199,6 +202,9 @@ namespace dbaccess virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException); // Helper // sal_Int32 getColumnTypeID() const {return m_nColTypeID;} + + protected: + using OColumn::getFastPropertyValue; }; /** @@ -244,6 +250,9 @@ namespace dbaccess protected: // XUnoTunnel virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException); + + protected: + using OColumnWrapper::getFastPropertyValue; }; /** @@ -274,7 +283,7 @@ namespace dbaccess * describes all properties for a columns of an index. */ class OIndexColumnWrapper : public OColumnWrapper, - public ::comphelper::OIdPropertyArrayUsageHelper < OIndexColumnWrapper > + public ::comphelper::OPropertyArrayUsageHelper < OIndexColumnWrapper > { protected: // <properties> @@ -292,21 +301,24 @@ namespace dbaccess virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); - // OIdPropertyArrayUsageHelper + // OPropertyArrayUsageHelper virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); - virtual ::cppu::IPropertyArrayHelper* createArrayHelper(sal_Int32 nId) const; + virtual ::cppu::IPropertyArrayHelper* createArrayHelper() const; virtual void SAL_CALL getFastPropertyValue( ::com::sun::star::uno::Any& rValue, sal_Int32 nHandle ) const; + + protected: + using OColumnWrapper::getFastPropertyValue; }; /** * describes all properties for a columns of an key column. */ class OKeyColumnWrapper : public OColumnWrapper, - public ::comphelper::OIdPropertyArrayUsageHelper < OKeyColumnWrapper > + public ::comphelper::OPropertyArrayUsageHelper < OKeyColumnWrapper > { protected: // <properties> @@ -324,14 +336,17 @@ namespace dbaccess virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); - // OIdPropertyArrayUsageHelper + // OPropertyArrayUsageHelper virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); - virtual ::cppu::IPropertyArrayHelper* createArrayHelper(sal_Int32 nId) const; + virtual ::cppu::IPropertyArrayHelper* createArrayHelper() const; virtual void SAL_CALL getFastPropertyValue( ::com::sun::star::uno::Any& rValue, sal_Int32 nHandle ) const; + + protected: + using OColumnWrapper::getFastPropertyValue; }; } #endif // _DBACORE_DEFINITIONCOLUMN_HXX_ |