User: hr Date: 06/06/19 19:07:29 Modified: /dba/connectivity/source/parse/ PColumn.cxx
Log: INTEGRATION: CWS warnings01 (1.11.30); FILE MERGED 2006/06/14 10:56:23 fs 1.11.30.2: #i66367# reverted previous changes related to replacing IdPropertyArrayHelper with PropertyArrayHelper - there's a subtle difference between both ids ... 2005/11/16 12:59:28 fs 1.11.30.1: #i57457# warning free code File Changes: Directory: /dba/connectivity/source/parse/ ========================================== File [changed]: PColumn.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/parse/PColumn.cxx?r1=1.11&r2=1.12 Delta lines: +24 -28 --------------------- --- PColumn.cxx 8 Sep 2005 07:39:30 -0000 1.11 +++ PColumn.cxx 20 Jun 2006 02:07:27 -0000 1.12 @@ -114,17 +114,15 @@ } // ----------------------------------------------------------------------------- -::cppu::IPropertyArrayHelper* OParseColumn::createArrayHelper( sal_Int32 _nId) const +::cppu::IPropertyArrayHelper* OParseColumn::createArrayHelper() const { - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > aProps; - describeProperties(aProps); - changePropertyAttributte(aProps); - return new ::cppu::OPropertyArrayHelper(aProps); + return doCreateArrayHelper(); } // ----------------------------------------------------------------------------- ::cppu::IPropertyArrayHelper & SAL_CALL OParseColumn::getInfoHelper() { - return *OParseColumn_PROP::getArrayHelper(isNew() ? 1 : 0); + OSL_ENSURE( !isNew(), "OParseColumn::OOrderColumn: a *new* OrderColumn?" ); + return *OParseColumn_PROP::getArrayHelper(); } // ----------------------------------------------------------------------------- OOrderColumn::OOrderColumn( const Reference<XPropertySet>& _xColumn @@ -183,17 +181,15 @@ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISASCENDING),PROPERTY_ID_ISASCENDING,0,&m_bAscending, ::getCppuType(reinterpret_cast< sal_Bool*>(NULL))); } // ----------------------------------------------------------------------------- -::cppu::IPropertyArrayHelper* OOrderColumn::createArrayHelper( sal_Int32 _nId) const +::cppu::IPropertyArrayHelper* OOrderColumn::createArrayHelper() const { - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > aProps; - describeProperties(aProps); - changePropertyAttributte(aProps); - return new ::cppu::OPropertyArrayHelper(aProps); + return doCreateArrayHelper(); } // ----------------------------------------------------------------------------- ::cppu::IPropertyArrayHelper & SAL_CALL OOrderColumn::getInfoHelper() { - return *OOrderColumn_PROP::getArrayHelper(isNew() ? 1 : 0); + OSL_ENSURE( !isNew(), "OOrderColumn::OOrderColumn: a *new* OrderColumn?" ); + return *OOrderColumn_PROP::getArrayHelper(); } // ----------------------------------------------------------------------------- ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL OOrderColumn::getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException) --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
