summaryrefslogtreecommitdiff
path: root/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.cxx')
-rw-r--r--connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.cxx15
1 files changed, 5 insertions, 10 deletions
diff --git a/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.cxx b/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.cxx
index 7b84661b8e21..695f6973512e 100644
--- a/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.cxx
+++ b/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.cxx
@@ -84,8 +84,6 @@ OPreparedResultSet::OPreparedResultSet(OConnection& rConn, OPreparedStatement* p
m_aFields = mysql_fetch_fields(m_pResult);
}
-OPreparedResultSet::~OPreparedResultSet() {}
-
void OPreparedResultSet::disposing()
{
OPropertySetHelper::disposing();
@@ -502,11 +500,8 @@ void SAL_CALL OPreparedResultSet::close()
MutexGuard aGuard(m_aMutex);
checkDisposed(OPreparedResultSet_BASE::rBHelper.bDisposed);
- if (m_aData)
- {
- delete[] m_aData;
- delete[] m_aMetaData;
- }
+ m_aData.reset();
+ m_aMetaData.reset();
if (m_pResult)
mysql_free_result(m_pResult);
@@ -633,9 +628,9 @@ sal_Bool SAL_CALL OPreparedResultSet::next()
if (m_aData == nullptr)
{
bFirstRun = true;
- m_aData = new MYSQL_BIND[m_nFieldCount];
- memset(m_aData, 0, m_nFieldCount * sizeof(MYSQL_BIND));
- m_aMetaData = new BindMetaData[m_nFieldCount];
+ m_aData.reset(new MYSQL_BIND[m_nFieldCount]);
+ memset(m_aData.get(), 0, m_nFieldCount * sizeof(MYSQL_BIND));
+ m_aMetaData.reset(new BindMetaData[m_nFieldCount]);
}
for (sal_Int32 i = 0; i < m_nFieldCount; ++i)
{