Tag: cws_src680_qiq User: fs Date: 2006/06/27 06:51:14 Modified: dba/connectivity/inc/connectivity/PColumn.hxx
Log: RESYNC: (1.12-1.13); FILE MERGED File Changes: Directory: /dba/connectivity/inc/connectivity/ ============================================== File [changed]: PColumn.hxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/inc/connectivity/PColumn.hxx?r1=1.12.104.1&r2=1.12.104.2 Delta lines: +16 -7 -------------------- --- PColumn.hxx 6 Jun 2006 13:57:23 -0000 1.12.104.1 +++ PColumn.hxx 27 Jun 2006 13:51:11 -0000 1.12.104.2 @@ -53,6 +53,10 @@ #include <com/sun/star/sdbc/XDatabaseMetaData.hpp> #endif +#ifndef _COMPHELPER_PROPERTY_ARRAY_HELPER_HXX_ +#include <comphelper/proparrhlp.hxx> +#endif + namespace connectivity { namespace parse @@ -60,7 +64,7 @@ class OParseColumn; typedef sdbcx::OColumn OParseColumn_BASE; - typedef ::comphelper::OIdPropertyArrayUsageHelper<OParseColumn> OParseColumn_PROP; + typedef ::comphelper::OPropertyArrayUsageHelper<OParseColumn> OParseColumn_PROP; class OParseColumn : public OParseColumn_BASE, public OParseColumn_PROP @@ -71,7 +75,7 @@ sal_Bool m_bDbasePrecisionChanged; sal_Bool m_bAggregateFunction; protected: - virtual ::cppu::IPropertyArrayHelper* createArrayHelper( sal_Int32 _nId) const; + virtual ::cppu::IPropertyArrayHelper* createArrayHelper() const; virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper(); virtual ~OParseColumn(); @@ -118,12 +122,15 @@ const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData >& _rxDBMetaData, sal_Int32 _nColumnPos ); + + private: + using OParseColumn_BASE::createArrayHelper; }; class OOrderColumn; typedef sdbcx::OColumn OOrderColumn_BASE; - typedef ::comphelper::OIdPropertyArrayUsageHelper<OOrderColumn> OOrderColumn_PROP; + typedef ::comphelper::OPropertyArrayUsageHelper<OOrderColumn> OOrderColumn_PROP; class OOrderColumn : public OOrderColumn_BASE, public OOrderColumn_PROP @@ -131,7 +138,7 @@ sal_Bool m_bAscending; sal_Bool m_bOrder; protected: - virtual ::cppu::IPropertyArrayHelper* createArrayHelper( sal_Int32 _nId) const; + virtual ::cppu::IPropertyArrayHelper* createArrayHelper() const; virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper(); virtual ~OOrderColumn(); @@ -152,6 +159,8 @@ virtual void construct(); virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); + private: + using OOrderColumn_BASE::createArrayHelper; }; } } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
