User: hr Date: 06/06/19 17:59:18 Modified: /dba/connectivity/inc/connectivity/ PColumn.hxx
Log: INTEGRATION: CWS warnings01 (1.12.30); FILE MERGED 2006/06/14 12:48:15 fs 1.12.30.2: #i10000# 2005/11/16 12:58:40 fs 1.12.30.1: #i57457# warning free code 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&r2=1.13 Delta lines: +12 -4 -------------------- --- PColumn.hxx 8 Sep 2005 04:57:57 -0000 1.12 +++ PColumn.hxx 20 Jun 2006 00:59:16 -0000 1.13 @@ -39,6 +39,10 @@ #include "connectivity/sdbcx/VColumn.hxx" #endif +#ifndef _COMPHELPER_PROPERTY_ARRAY_HELPER_HXX_ +#include <comphelper/proparrhlp.hxx> +#endif + namespace connectivity { namespace parse @@ -46,7 +50,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 @@ -57,7 +61,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(); @@ -86,12 +90,14 @@ ::rtl::OUString getTableName() const { return m_aTableName; } sal_Bool getFunction() const { return m_bFunction; } sal_Bool getDbasePrecisionChanged() const { return m_bDbasePrecisionChanged; } + 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 @@ -99,7 +105,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(); @@ -120,6 +126,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]
