Tag: cws_src680_qiq User: fs Date: 2006/06/27 04:59:26 Modified: dba/dbaccess/source/core/api/table.cxx
Log: RESYNC: (1.54-1.55); FILE MERGED File Changes: Directory: /dba/dbaccess/source/core/api/ ========================================= File [changed]: table.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/api/table.cxx?r1=1.54.124.2&r2=1.54.124.3 Delta lines: +11 -9 -------------------- --- table.cxx 16 Jun 2006 11:47:37 -0000 1.54.124.2 +++ table.cxx 27 Jun 2006 11:59:24 -0000 1.54.124.3 @@ -94,9 +94,6 @@ #ifndef _COMPHELPER_EXTRACT_HXX_ #include <comphelper/extract.hxx> #endif -#ifndef _CONNECTIVITY_SDBCX_COLUMN_HXX_ -#include <connectivity/sdbcx/VColumn.hxx> -#endif #ifndef DBACORE_SDBCORETOOLS_HXX #include "sdbcoretools.hxx" #endif @@ -139,8 +136,8 @@ ,const ::rtl::OUString& _rDesc ,const Reference< XNameAccess >& _xColumnDefinitions) throw(SQLException) :OTable_Base(_pTables,_rxConn,_rxConn->getMetaData().is() && _rxConn->getMetaData()->storesMixedCaseQuotedIdentifiers(), _rName, _rType, _rDesc, _rSchema, _rCatalog ) - ,m_nPrivileges(0) ,m_xColumnDefinitions(_xColumnDefinitions) + ,m_nPrivileges(0) { DBG_CTOR(ODBTable, NULL); DBG_ASSERT(getMetaData().is(), "ODBTable::ODBTable : invalid conn !"); @@ -204,6 +201,10 @@ } } //-------------------------------------------------------------------------- +void ODBTable::columnCloned(const Reference< XPropertySet >& /*_xClone*/) +{ +} +//-------------------------------------------------------------------------- Sequence< sal_Int8 > ODBTable::getImplementationId() throw (RuntimeException) { static OImplementationId * pId = 0; @@ -367,7 +368,7 @@ } // XRename, //------------------------------------------------------------------------------ -void SAL_CALL ODBTable::rename( const ::rtl::OUString& _rNewName ) throw(SQLException, ElementExistException, RuntimeException) +void SAL_CALL ODBTable::rename( const ::rtl::OUString& /*_rNewName*/ ) throw(SQLException, ElementExistException, RuntimeException) { throw SQLException(DBACORE_RESSTRING(RID_STR_NO_TABLE_RENAME),*this,SQLSTATE_GENERAL,1000,Any() ); } @@ -377,7 +378,8 @@ void SAL_CALL ODBTable::alterColumnByName( const ::rtl::OUString& _rName, const Reference< XPropertySet >& _rxDescriptor ) throw(SQLException, NoSuchElementException, RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); - checkDisposed(OTable_Linux::rBHelper.bDisposed); + checkDisposed( + connectivity::sdbcx::OTableDescriptor_BASE::rBHelper.bDisposed); if(m_pColumns->hasByName(_rName)) { ::rtl::OUString sSql = ::rtl::OUString::createFromAscii("ALTER TABLE "); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
