diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-09-23 10:38:50 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-09-23 10:38:50 +0000 |
| commit | 404bf8d2604dde0fb8325c50611d71b770863a3a (patch) | |
| tree | 678f2ed37a2a9a7578df723b3b874045abf21cd8 /connectivity | |
| parent | 39fb3fe8d2d2476dacbceb8a95f13718a3c5aeb1 (diff) | |
INTEGRATION: CWS dba201b (1.92.58); FILE MERGED
2005/09/21 08:00:16 oj 1.92.58.2: RESYNC: (1.92-1.93); FILE MERGED
2005/07/11 13:27:06 fs 1.92.58.1: merging CWS dba201 into dba201b
Diffstat (limited to 'connectivity')
| -rw-r--r-- | connectivity/source/drivers/file/FResultSet.cxx | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/connectivity/source/drivers/file/FResultSet.cxx b/connectivity/source/drivers/file/FResultSet.cxx index 24c6ab19a334..46c71b11d5ac 100644 --- a/connectivity/source/drivers/file/FResultSet.cxx +++ b/connectivity/source/drivers/file/FResultSet.cxx @@ -4,9 +4,9 @@ * * $RCSfile: FResultSet.cxx,v $ * - * $Revision: 1.93 $ + * $Revision: 1.94 $ * - * last change: $Author: rt $ $Date: 2005-09-08 05:56:34 $ + * last change: $Author: hr $ $Date: 2005-09-23 11:38:50 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -203,6 +203,9 @@ void OResultSet::disposing(void) m_xParamColumns = NULL; m_xColsIdx = NULL; + Reference<XComponent> xComp = m_pTable; + if ( xComp.is() ) + xComp->removeEventListener(this); if(m_pTable) { m_pTable->release(); @@ -460,14 +463,7 @@ void SAL_CALL OResultSet::afterLast( ) throw(SQLException, RuntimeException) void SAL_CALL OResultSet::close( ) throw(SQLException, RuntimeException) { -// { -// ::osl::MutexGuard aGuard( m_aMutex ); -// checkDisposed(OResultSet_BASE::rBHelper.bDisposed); -// -// } -// dispose(); - ::osl::MutexGuard aGuard( m_aMutex ); - clear(); + dispose(); } // ------------------------------------------------------------------------- |