Tag: cws_src680_dba201 User: oj Date: 05/04/29 05:12:18 Modified: /dba/connectivity/source/drivers/file/ FPreparedStatement.cxx, FResultSet.cxx, FStatement.cxx
Log: #i47235# fix for refcount release File Changes: Directory: /dba/connectivity/source/drivers/file/ ================================================= File [changed]: FPreparedStatement.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/file/FPreparedStatement.cxx?r1=1.34&r2=1.34.34.1 Delta lines: +9 -8 ------------------- --- FPreparedStatement.cxx 16 Feb 2005 17:25:37 -0000 1.34 +++ FPreparedStatement.cxx 29 Apr 2005 12:12:15 -0000 1.34.34.1 @@ -2,9 +2,9 @@ * * $RCSfile: FPreparedStatement.cxx,v $ * - * $Revision: 1.34 $ + * $Revision: 1.34.34.1 $ * - * last change: $Author: vg $ $Date: 2005/02/16 17:25:37 $ + * last change: $Author: oj $ $Date: 2005/04/29 12:12:15 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -141,16 +141,17 @@ { ::osl::MutexGuard aGuard(m_aMutex); + clearMyResultSet(); + OStatement_BASE2::disposing(); + if(m_pResultSet) { m_pResultSet->release(); m_pResultSet = NULL; } - clearMyResultSet(); m_xParamColumns = NULL; - OStatement_BASE2::disposing(); m_xMetaData = NULL; if(m_aParameterRow.isValid()) File [changed]: FResultSet.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/file/FResultSet.cxx?r1=1.92&r2=1.92.34.1 Delta lines: +7 -11 -------------------- --- FResultSet.cxx 16 Feb 2005 17:25:50 -0000 1.92 +++ FResultSet.cxx 29 Apr 2005 12:12:15 -0000 1.92.34.1 @@ -2,9 +2,9 @@ * * $RCSfile: FResultSet.cxx,v $ * - * $Revision: 1.92 $ + * $Revision: 1.92.34.1 $ * - * last change: $Author: vg $ $Date: 2005/02/16 17:25:50 $ + * last change: $Author: oj $ $Date: 2005/04/29 12:12:15 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -229,6 +229,9 @@ m_xParamColumns = NULL; m_xColsIdx = NULL; + Reference<XComponent> xComp = m_pTable; + if ( xComp.is() ) + xComp->removeEventListener(this); if(m_pTable) { m_pTable->release(); @@ -486,14 +489,7 @@ 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(); } // ------------------------------------------------------------------------- File [changed]: FStatement.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/file/FStatement.cxx?r1=1.36&r2=1.36.20.1 Delta lines: +4 -3 ------------------- --- FStatement.cxx 18 Mar 2005 09:57:10 -0000 1.36 +++ FStatement.cxx 29 Apr 2005 12:12:15 -0000 1.36.20.1 @@ -2,9 +2,9 @@ * * $RCSfile: FStatement.cxx,v $ * - * $Revision: 1.36 $ + * $Revision: 1.36.20.1 $ * - * last change: $Author: obo $ $Date: 2005/03/18 09:57:10 $ + * last change: $Author: oj $ $Date: 2005/04/29 12:12:15 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -377,6 +377,7 @@ OResultSet* pResult = createResultSet(); xRS = pResult; initializeResultSet(pResult); + m_xResultSet = Reference<XResultSet>(pResult); pResult->OpenImpl(); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
