User: vg Date: 2007/03/26 06:58:15 Modified: dba/connectivity/source/drivers/ado/ATable.cxx
Log: INTEGRATION: CWS mingwport03 (1.29.44); FILE MERGED 2006/11/07 12:31:33 vg 1.29.44.3: RESYNC: (1.29-1.30); FILE MERGED 2006/10/25 12:11:36 vg 1.29.44.2: #i53572# MinGW port 2006/09/07 10:22:04 vg 1.29.44.1: #i53572# MinGW port File Changes: Directory: /dba/connectivity/source/drivers/ado/ ================================================ File [changed]: ATable.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/ado/ATable.cxx?r1=1.30&r2=1.31 Delta lines: +9 -5 ------------------- --- ATable.cxx 17 Sep 2006 02:15:45 -0000 1.30 +++ ATable.cxx 26 Mar 2007 13:58:13 -0000 1.31 @@ -206,7 +206,7 @@ void SAL_CALL OAdoTable::rename( const ::rtl::OUString& newName ) throw(SQLException, ElementExistException, RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); - checkDisposed(rBHelper.bDisposed); + checkDisposed(OTableDescriptor_BASE_TYPEDEF::rBHelper.bDisposed); m_aTable.put_Name(newName); ADOS::ThrowException(*(m_pCatalog->getConnection()->getConnection()),*this); @@ -223,7 +223,7 @@ void SAL_CALL OAdoTable::alterColumnByName( const ::rtl::OUString& colName, const Reference< XPropertySet >& descriptor ) throw(SQLException, NoSuchElementException, RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); - checkDisposed(rBHelper.bDisposed); + checkDisposed(OTableDescriptor_BASE_TYPEDEF::rBHelper.bDisposed); sal_Bool bError = sal_True; OAdoColumn* pColumn = NULL; @@ -243,7 +243,7 @@ void SAL_CALL OAdoTable::alterColumnByIndex( sal_Int32 index, const Reference< XPropertySet >& descriptor ) throw(SQLException, ::com::sun::star::lang::IndexOutOfBoundsException, RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); - checkDisposed(rBHelper.bDisposed); + checkDisposed(OTableDescriptor_BASE_TYPEDEF::rBHelper.bDisposed); Reference< XPropertySet > xOld; m_pColumns->getByIndex(index) >>= xOld; @@ -283,14 +283,18 @@ OTable_TYPEDEF::setFastPropertyValue_NoBroadcast(nHandle,rValue); } // ------------------------------------------------------------------------- -void SAL_CALL OAdoTable::acquire() throw(::com::sun::star::uno::RuntimeException) +void SAL_CALL OAdoTable::acquire() throw() { OTable_TYPEDEF::acquire(); } // ----------------------------------------------------------------------------- -void SAL_CALL OAdoTable::release() throw(::com::sun::star::uno::RuntimeException) +void SAL_CALL OAdoTable::release() throw() { OTable_TYPEDEF::release(); } // ----------------------------------------------------------------------------- +::rtl::OUString SAL_CALL OAdoTable::getName() throw(::com::sun::star::uno::RuntimeException) +{ + return m_aTable.get_Name(); +} --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
