User: hr Date: 06/06/19 18:30:31 Modified: /dba/connectivity/source/drivers/hsqldb/ HTable.cxx
Log: INTEGRATION: CWS warnings01 (1.6.10); FILE MERGED 2006/06/14 10:56:21 fs 1.6.10.4: #i66367# reverted previous changes related to replacing IdPropertyArrayHelper with PropertyArrayHelper - there's a subtle difference between both ids ... 2005/11/16 12:59:06 fs 1.6.10.3: #i57457# warning free code 2005/11/07 19:10:06 pl 1.6.10.2: RESYNC: (1.6-1.7); FILE MERGED 2005/11/07 14:43:37 fs 1.6.10.1: #i57457# warning-free code File Changes: Directory: /dba/connectivity/source/drivers/hsqldb/ =================================================== File [changed]: HTable.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/hsqldb/HTable.cxx?r1=1.7&r2=1.8 Delta lines: +24 -27 --------------------- --- HTable.cxx 23 Sep 2005 11:39:56 -0000 1.7 +++ HTable.cxx 20 Jun 2006 01:30:28 -0000 1.8 @@ -152,12 +152,9 @@ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PRIVILEGES), PROPERTY_ID_PRIVILEGES,PropertyAttribute::READONLY,&m_nPrivileges, ::getCppuType(&m_nPrivileges)); } // ----------------------------------------------------------------------------- -::cppu::IPropertyArrayHelper* OHSQLTable::createArrayHelper( sal_Int32 _nId) const +::cppu::IPropertyArrayHelper* OHSQLTable::createArrayHelper( sal_Int32 /*_nId*/ ) const { - Sequence< Property > aProps; - describeProperties(aProps); - changePropertyAttributte(aProps); - return new ::cppu::OPropertyArrayHelper(aProps); + return doCreateArrayHelper(); } // ------------------------------------------------------------------------- ::cppu::IPropertyArrayHelper & OHSQLTable::getInfoHelper() @@ -202,10 +199,8 @@ sal_Int64 OHSQLTable::getSomething( const Sequence< sal_Int8 > & rId ) throw (RuntimeException) { return (rId.getLength() == 16 && 0 == rtl_compareMemory(getUnoTunnelImplementationId().getConstArray(), rId.getConstArray(), 16 ) ) - ? - (sal_Int64)this - : - OTable_TYPEDEF::getSomething(rId); + ? reinterpret_cast< sal_Int64 >( this ) + : OTable_TYPEDEF::getSomething(rId); } // ------------------------------------------------------------------------- // XAlterTable @@ -319,8 +314,10 @@ void OHSQLTable::alterColumnType(sal_Int32 nNewType,const ::rtl::OUString& _rColName, const Reference<XPropertySet>& _xDescriptor) { ::rtl::OUString sSql = getAlterTableColumnPart(); + sSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ALTER COLUMN ")); - const ::rtl::OUString sQuote = getMetaData()->getIdentifierQuoteString( ); + sSql += ::dbtools::quoteName( getMetaData()->getIdentifierQuoteString(), _rColName ); + sSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ")); OHSQLColumn* pColumn = new OHSQLColumn(sal_True); Reference<XPropertySet> xProp = pColumn; --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
