Tag: cws_src680_qiq User: fs Date: 2006/06/27 05:04:15 Modified: dba/dbaccess/source/core/inc/definitioncolumn.hxx
Log: RESYNC: (1.4-1.5); FILE MERGED File Changes: Directory: /dba/dbaccess/source/core/inc/ ========================================= File [changed]: definitioncolumn.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/inc/definitioncolumn.hxx?r1=1.4.124.1&r2=1.4.124.2 Delta lines: +24 -9 -------------------- --- definitioncolumn.hxx 16 Jun 2006 11:47:40 -0000 1.4.124.1 +++ definitioncolumn.hxx 27 Jun 2006 12:04:12 -0000 1.4.124.2 @@ -133,6 +133,9 @@ 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 @@ 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 @@ 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; }; /** @@ -276,7 +285,7 @@ * describes all properties for a columns of an index. */ class OIndexColumnWrapper : public OColumnWrapper, - public ::comphelper::OIdPropertyArrayUsageHelper < OIndexColumnWrapper > + public ::comphelper::OPropertyArrayUsageHelper < OIndexColumnWrapper > { protected: // <properties> @@ -294,21 +303,24 @@ 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> @@ -326,14 +338,17 @@ 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_ --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
