Tag: cws_src680_qiq User: fs Date: 2006/06/27 08:09:35 Modified: dba/connectivity/source/parse/PColumn.cxx
Log: RESYNC: (1.11-1.12); FILE MERGED 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.104.1&r2=1.11.104.2 Delta lines: +27 -31 --------------------- --- PColumn.cxx 6 Jun 2006 13:57:26 -0000 1.11.104.1 +++ PColumn.cxx 27 Jun 2006 15:09:32 -0000 1.11.104.2 @@ -160,17 +160,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 @@ -229,17 +227,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]
