User: hr Date: 06/06/19 18:53:20 Modified: /dba/connectivity/source/drivers/mysql/ YTable.cxx
Log: INTEGRATION: CWS warnings01 (1.6.30); FILE MERGED 2006/06/14 10:56:22 fs 1.6.30.3: #i66367# reverted previous changes related to replacing IdPropertyArrayHelper with PropertyArrayHelper - there's a subtle difference between both ids ... 2005/11/16 12:59:18 fs 1.6.30.2: #i57457# warning free code 2005/11/07 14:43:59 fs 1.6.30.1: #i57457# warning-free code File Changes: Directory: /dba/connectivity/source/drivers/mysql/ ================================================== File [changed]: YTable.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/mysql/YTable.cxx?r1=1.6&r2=1.7 Delta lines: +26 -31 --------------------- --- YTable.cxx 8 Sep 2005 06:31:54 -0000 1.6 +++ YTable.cxx 20 Jun 2006 01:53:17 -0000 1.7 @@ -152,12 +152,9 @@ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PRIVILEGES), PROPERTY_ID_PRIVILEGES,PropertyAttribute::READONLY,&m_nPrivileges, ::getCppuType(&m_nPrivileges)); } // ----------------------------------------------------------------------------- -::cppu::IPropertyArrayHelper* OMySQLTable::createArrayHelper( sal_Int32 _nId) const +::cppu::IPropertyArrayHelper* OMySQLTable::createArrayHelper( sal_Int32 /*_nId*/ ) const { - Sequence< Property > aProps; - describeProperties(aProps); - changePropertyAttributte(aProps); - return new ::cppu::OPropertyArrayHelper(aProps); + return doCreateArrayHelper(); } // ------------------------------------------------------------------------- ::cppu::IPropertyArrayHelper & OMySQLTable::getInfoHelper() @@ -202,10 +199,8 @@ sal_Int64 OMySQLTable::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 @@ -304,7 +299,7 @@ descriptor->getPropertyValue(rProp.getNameByIndex(PROPERTY_ID_NAME)) >>= sNewColumnName; if ( !sNewColumnName.equalsIgnoreAsciiCase(colName) ) { - ::rtl::OUString sSql = getAlterTableColumnPart(colName); + ::rtl::OUString sSql = getAlterTableColumnPart(); sSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" CHANGE ")); const ::rtl::OUString sQuote = getMetaData()->getIdentifierQuoteString( ); sSql += ::dbtools::quoteName(sQuote,colName); @@ -327,7 +322,7 @@ // ----------------------------------------------------------------------------- void OMySQLTable::alterColumnType(sal_Int32 nNewType,const ::rtl::OUString& _rColName, const Reference<XPropertySet>& _xDescriptor) { - ::rtl::OUString sSql = getAlterTableColumnPart(_rColName); + ::rtl::OUString sSql = getAlterTableColumnPart(); sSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" CHANGE ")); const ::rtl::OUString sQuote = getMetaData()->getIdentifierQuoteString( ); sSql += ::dbtools::quoteName(sQuote,_rColName); @@ -344,7 +339,7 @@ // ----------------------------------------------------------------------------- void OMySQLTable::alterDefaultValue(const ::rtl::OUString& _sNewDefault,const ::rtl::OUString& _rColName) { - ::rtl::OUString sSql = getAlterTableColumnPart(_rColName); + ::rtl::OUString sSql = getAlterTableColumnPart(); sSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ALTER ")); const ::rtl::OUString sQuote = getMetaData()->getIdentifierQuoteString( ); @@ -357,7 +352,7 @@ // ----------------------------------------------------------------------------- void OMySQLTable::dropDefaultValue(const ::rtl::OUString& _rColName) { - ::rtl::OUString sSql = getAlterTableColumnPart(_rColName); + ::rtl::OUString sSql = getAlterTableColumnPart(); sSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ALTER ")); const ::rtl::OUString sQuote = getMetaData()->getIdentifierQuoteString( ); @@ -367,7 +362,7 @@ executeStatement(sSql); } // ----------------------------------------------------------------------------- -::rtl::OUString OMySQLTable::getAlterTableColumnPart(const ::rtl::OUString& _rsColumnName ) +::rtl::OUString OMySQLTable::getAlterTableColumnPart() { ::rtl::OUString sSql = ::rtl::OUString::createFromAscii("ALTER TABLE "); const ::rtl::OUString sQuote = getMetaData()->getIdentifierQuoteString( ); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
