User: hr Date: 05/09/23 04:39:58 Modified: /dba/connectivity/source/drivers/hsqldb/ HTable.cxx
Log: INTEGRATION: CWS dba201b (1.2.38); FILE MERGED 2005/09/21 08:14:58 oj 1.2.38.3: RESYNC: (1.5-1.6); FILE MERGED 2005/07/11 07:11:55 oj 1.2.38.2: RESYNC: (1.2-1.5); FILE MERGED 2005/07/05 07:48:58 oj 1.2.38.1: #i51335# if table is a view remove the xrename interface 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.6&r2=1.7 Delta lines: +30 -1 -------------------- --- HTable.cxx 8 Sep 2005 06:04:21 -0000 1.6 +++ HTable.cxx 23 Sep 2005 11:39:56 -0000 1.7 @@ -382,6 +382,28 @@ } } // ----------------------------------------------------------------------------- +Sequence< Type > SAL_CALL OHSQLTable::getTypes( ) throw(RuntimeException) +{ + if ( ! m_Type.compareToAscii("VIEW") ) + { + Sequence< Type > aTypes = OTableHelper::getTypes(); + ::std::vector<Type> aOwnTypes; + aOwnTypes.reserve(aTypes.getLength()); + const Type* pIter = aTypes.getConstArray(); + const Type* pEnd = pIter + aTypes.getLength(); + for(;pIter != pEnd;++pIter) + { + if( *pIter != ::getCppuType((const Reference<XRename>*)0) ) + { + aOwnTypes.push_back(*pIter); + } + } + Type *pTypes = aOwnTypes.empty() ? 0 : &aOwnTypes[0]; + return Sequence< Type >(pTypes, aOwnTypes.size()); + } + return OTableHelper::getTypes(); +} +// ------------------------------------------------------------------------- // XRename void SAL_CALL OHSQLTable::rename( const ::rtl::OUString& newName ) throw(SQLException, ElementExistException, RuntimeException) { @@ -422,6 +444,13 @@ ::dbtools::qualifiedNameComponents(getMetaData(),newName,m_CatalogName,m_SchemaName,m_Name,::dbtools::eInTableDefinitions); } +// ------------------------------------------------------------------------- +Any SAL_CALL OHSQLTable::queryInterface( const Type & rType ) throw(RuntimeException) +{ + if( !m_Type.compareToAscii("VIEW") && rType == ::getCppuType((const Reference<XRename>*)0) ) + return Any(); - + return OTableHelper::queryInterface(rType); +} +// ------------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
