diff options
author | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-09-23 10:38:35 +0000 |
---|---|---|
committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-09-23 10:38:35 +0000 |
commit | 39fb3fe8d2d2476dacbceb8a95f13718a3c5aeb1 (patch) | |
tree | c7296ca7c30187231d718caef6e74242adce3ede /connectivity | |
parent | 86d67dd8c3b5ea9b47d0e7c0ed065ec177c2b5e5 (diff) |
INTEGRATION: CWS dba201b (1.34.58); FILE MERGED
2005/09/21 07:59:58 oj 1.34.58.2: RESYNC: (1.34-1.35); FILE MERGED
2005/07/11 13:27:05 fs 1.34.58.1: merging CWS dba201 into dba201b
Diffstat (limited to 'connectivity')
-rw-r--r-- | connectivity/source/drivers/file/FPreparedStatement.cxx | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/connectivity/source/drivers/file/FPreparedStatement.cxx b/connectivity/source/drivers/file/FPreparedStatement.cxx index 772c72bedc4a..d9039ad70f36 100644 --- a/connectivity/source/drivers/file/FPreparedStatement.cxx +++ b/connectivity/source/drivers/file/FPreparedStatement.cxx @@ -4,9 +4,9 @@ * * $RCSfile: FPreparedStatement.cxx,v $ * - * $Revision: 1.35 $ + * $Revision: 1.36 $ * - * last change: $Author: rt $ $Date: 2005-09-08 05:56:20 $ + * last change: $Author: hr $ $Date: 2005-09-23 11:38:35 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -115,16 +115,17 @@ void OPreparedStatement::disposing() { ::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()) |