Tag: cws_src680_dba30 User: fs Date: 2006/07/19 05:14:14 Modified: dba/dbaccess/source/core/api/table.cxx
Log: RESYNC: (1.54-1.56); 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.14.1&r2=1.54.14.2 Delta lines: +18 -11 --------------------- --- table.cxx 2 Jan 2006 09:17:09 -0000 1.54.14.1 +++ table.cxx 19 Jul 2006 12:14:11 -0000 1.54.14.2 @@ -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()->supportsMixedCaseQuotedIdentifiers(), _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 !"); @@ -190,6 +187,11 @@ return pReturn; } // ----------------------------------------------------------------------------- +void ODBTable::columnAppended( const Reference< XPropertySet >& /*_rxSourceDescriptor*/ ) +{ + // not interested in +} +// ----------------------------------------------------------------------------- void ODBTable::columnDropped(const ::rtl::OUString& _sName) { Reference<XDrop> xDrop(m_xColumnDefinitions,UNO_QUERY); @@ -199,6 +201,10 @@ } } //-------------------------------------------------------------------------- +void ODBTable::columnCloned(const Reference< XPropertySet >& /*_xClone*/) +{ +} +//-------------------------------------------------------------------------- Sequence< sal_Int8 > ODBTable::getImplementationId() throw (RuntimeException) { static OImplementationId * pId = 0; @@ -362,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() ); } @@ -372,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 "); @@ -382,7 +389,7 @@ aQuote = xMeta->getIdentifierQuoteString( ); ::rtl::OUString sComposedName; - ::dbtools::composeTableName(xMeta,m_CatalogName,m_SchemaName,m_Name,sComposedName,sal_True,::dbtools::eInTableDefinitions); + sComposedName = ::dbtools::composeTableName( xMeta, m_CatalogName, m_SchemaName, m_Name, sal_True, ::dbtools::eInTableDefinitions ); if(!sComposedName.getLength()) ::dbtools::throwFunctionSequenceException(*this); @@ -454,7 +461,7 @@ return pId->getImplementationId(); } // ----------------------------------------------------------------------------- -Reference< XPropertySet > ODBTable::createEmptyObject() +Reference< XPropertySet > ODBTable::createColumnDescriptor() { return new OTableColumnDescriptor(); } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
