diff options
| author | Noel Grandin <noel@peralex.com> | 2015-03-10 09:07:06 +0200 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2015-04-10 10:55:36 +0100 |
| commit | d7a84ce8406096b455d81f50cd50ca2e877adc06 (patch) | |
| tree | b1dd2b5a4860cf2c9664e2ff3087b8dbb9db7576 /mysqlc | |
| parent | c0a802b59e1edddeb0b621e15137f5058299efd7 (diff) | |
vclwidget: only call dispose() once
by using a new utility method in vcl::Window
This means that we don't have to make all our dispose
methods safe to call more than once.
Change-Id: I2110c7de4a86c70fdc97dd8fd318c86b56865374
Diffstat (limited to 'mysqlc')
| -rw-r--r-- | mysqlc/source/mysqlc_connection.cxx | 2 | ||||
| -rw-r--r-- | mysqlc/source/mysqlc_resultset.cxx | 2 | ||||
| -rw-r--r-- | mysqlc/source/mysqlc_statement.cxx | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/mysqlc/source/mysqlc_connection.cxx b/mysqlc/source/mysqlc_connection.cxx index 42df27df3017..f7cab90c8887 100644 --- a/mysqlc/source/mysqlc_connection.cxx +++ b/mysqlc/source/mysqlc_connection.cxx @@ -531,7 +531,7 @@ void SAL_CALL OConnection::close() MutexGuard aGuard(m_aMutex); checkDisposed(OConnection_BASE::rBHelper.bDisposed); } - dispose(); + disposeOnce(); } // XWarningsSupplier diff --git a/mysqlc/source/mysqlc_resultset.cxx b/mysqlc/source/mysqlc_resultset.cxx index ec750010299d..632cf803aac3 100644 --- a/mysqlc/source/mysqlc_resultset.cxx +++ b/mysqlc/source/mysqlc_resultset.cxx @@ -615,7 +615,7 @@ void SAL_CALL OResultSet::close() throw(SQLException, RuntimeException, std::exc mysqlc_sdbc_driver::translateAndThrow(e, *this, m_encoding); } - dispose(); + disposeOnce(); } sal_Bool SAL_CALL OResultSet::first() throw(SQLException, RuntimeException, std::exception) diff --git a/mysqlc/source/mysqlc_statement.cxx b/mysqlc/source/mysqlc_statement.cxx index 9bd069ca5dcf..c7cfdea7beea 100644 --- a/mysqlc/source/mysqlc_statement.cxx +++ b/mysqlc/source/mysqlc_statement.cxx @@ -138,7 +138,7 @@ void SAL_CALL OCommonStatement::close() MutexGuard aGuard(m_aMutex); checkDisposed(rBHelper.bDisposed); } - dispose(); + disposeOnce(); } void SAL_CALL OStatement::clearBatch() |