[Libreoffice-commits] .: 2 commits - basic/source connectivity/source

[Caolán McNamara]

 basic/source/basmgr/basmgr.cxx                      |    1 -
 connectivity/source/drivers/odbcbase/OResultSet.cxx |    2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 418a3c31234b9662eb10d739845d14d517cc0f5e
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Aug 5 16:03:10 2011 +0100

    delete/delete[] mismatch, thanks to Terrence Enger

diff --git a/connectivity/source/drivers/odbcbase/OResultSet.cxx b/connectivity/source/drivers/odbcbase/OResultSet.cxx
index 59273ac..32917e6 100644
--- a/connectivity/source/drivers/odbcbase/OResultSet.cxx
+++ b/connectivity/source/drivers/odbcbase/OResultSet.cxx
@@ -1381,7 +1381,7 @@ void OResultSet::setFetchSize(sal_Int32 _par0)
     if ( _par0 > 0 )
     {
         N3SQLSetStmtAttr(m_aStatementHandle,SQL_ATTR_ROW_ARRAY_SIZE,(SQLPOINTER)(sal_IntPtr)_par0,SQL_IS_UINTEGER);
-        delete m_pRowStatusArray;
+        delete [] m_pRowStatusArray;
 
         m_pRowStatusArray = new SQLUSMALLINT[_par0];
         N3SQLSetStmtAttr(m_aStatementHandle,SQL_ATTR_ROW_STATUS_PTR,m_pRowStatusArray,SQL_IS_POINTER);
commit 80e4587f6d155cce5b0466621731e54acef95237
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Aug 5 15:57:20 2011 +0100

    don't need to include this here

diff --git a/basic/source/basmgr/basmgr.cxx b/basic/source/basmgr/basmgr.cxx
index 9334669..2d1835d 100644
--- a/basic/source/basmgr/basmgr.cxx
+++ b/basic/source/basmgr/basmgr.cxx
@@ -42,7 +42,6 @@
 #include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
 #include <basic/sbmod.hxx>
-#include <basic/sbobjmod.hxx>
 #include <unotools/intlwrapper.hxx>
 #include <comphelper/processfactory.hxx>