CWS-TOOLING: integrate CWS dbaperf3

2009-08-28 08:04:41 +0200 oj  r275515 : wrong replacement
2009-08-28 07:57:44 +0200 oj  r275514 : declaration of 'nRealSize' shadows a previous local
2009-08-20 10:17:11 +0200 oj  r275168 : CWS-TOOLING: rebase CWS dbaperf3 to trunk@275001 (milestone: DEV300:m55)
2009-08-19 11:50:49 +0200 oj  r275145 : #ii102891# minimize metadata calls
2009-06-22 12:20:15 +0200 oj  r273213 : compile error
2009-06-22 12:19:45 +0200 oj  r273212 : compile error
2009-06-18 08:54:08 +0200 oj  r273099 : #i102891# reduce calls to databasemetadata
2009-06-18 08:19:55 +0200 oj  r273095 : #i102891# reduce calls to databasemetadata

2 files changed, 3 insertions, 3 deletions

diff --git a/connectivity/source/drivers/macab/MacabResultSet.cxx b/connectivity/source/drivers/macab/MacabResultSet.cxx
index 25113f9cf3..5a5d660c60 100755
--- a/connectivity/source/drivers/macab/MacabResultSet.cxx
+++ b/connectivity/source/drivers/macab/MacabResultSet.cxx
@@ -151,8 +151,8 @@ void MacabResultSet::disposing()
 
     ::osl::MutexGuard aGuard(m_aMutex);
 
-    m_xStatement	= NULL;
-    m_xMetaData		= NULL;
+m_xStatement.clear();
+m_xMetaData.clear();
 }
 // -------------------------------------------------------------------------
 Any SAL_CALL MacabResultSet::queryInterface(const Type & rType) throw(RuntimeException)
diff --git a/connectivity/source/drivers/macab/MacabTables.cxx b/connectivity/source/drivers/macab/MacabTables.cxx
index 82ccac7f97..7fa211ad76 100755
--- a/connectivity/source/drivers/macab/MacabTables.cxx
+++ b/connectivity/source/drivers/macab/MacabTables.cxx
@@ -88,6 +88,6 @@ void MacabTables::impl_refresh(  ) throw(RuntimeException)
 // -------------------------------------------------------------------------
 void MacabTables::disposing(void)
 {
-    m_xMetaData = NULL;
+m_xMetaData.clear();
     OCollection::disposing();
 }