[Libreoffice-commits] core.git: mysqlc/source

[Michael Meeks]

 mysqlc/source/mysqlc_connection.cxx |    2 +-
 mysqlc/source/mysqlc_resultset.cxx  |    2 +-
 mysqlc/source/mysqlc_statement.cxx  |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit af48ad2120b3240826edbd0af2a28531adeb5154
Author: Michael Meeks <michael.meeks at collabora.com>
Date:   Tue Apr 28 15:34:17 2015 +0100

    fix erroneous disposeOnce calls.
    
    Change-Id: I4ce39e6d6534d1481f7e6b759d61040606da839c

diff --git a/mysqlc/source/mysqlc_connection.cxx b/mysqlc/source/mysqlc_connection.cxx
index 47ffd8d..d26558b 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);
     }
-    disposeOnce();
+    dispose();
 }
 
 // XWarningsSupplier
diff --git a/mysqlc/source/mysqlc_resultset.cxx b/mysqlc/source/mysqlc_resultset.cxx
index 662cd45..2ef646c 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);
     }
 
-    disposeOnce();
+    dispose();
 }
 
 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 c645a81..f2a15d3 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);
     }
-    disposeOnce();
+    dispose();
 }
 
 void SAL_CALL OStatement::clearBatch()