diff options
author | Mathias Bauer <mba@openoffice.org> | 2009-09-25 21:47:16 +0200 |
---|---|---|
committer | Mathias Bauer <mba@openoffice.org> | 2009-09-25 21:47:16 +0200 |
commit | 0a266bd33b8786869cdeab8325f8f1b1900533ad (patch) | |
tree | 137ba378aaae9e8f0765fabbbf5035131f250781 /connectivity/source/drivers/kab | |
parent | 6a1e797fa4b432841708545272e13e8f6ab4bd39 (diff) | |
parent | ab33e14647ada2a32624fa39ec0ddbbbdc694df5 (diff) |
merge commit
Diffstat (limited to 'connectivity/source/drivers/kab')
-rw-r--r-- | connectivity/source/drivers/kab/KResultSet.cxx | 4 | ||||
-rw-r--r-- | connectivity/source/drivers/kab/KTables.cxx | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/connectivity/source/drivers/kab/KResultSet.cxx b/connectivity/source/drivers/kab/KResultSet.cxx index 28c9877914ac..d05d757c9dac 100644 --- a/connectivity/source/drivers/kab/KResultSet.cxx +++ b/connectivity/source/drivers/kab/KResultSet.cxx @@ -124,8 +124,8 @@ void KabResultSet::disposing() ::osl::MutexGuard aGuard(m_aMutex); - m_xStatement = NULL; - m_xMetaData = NULL; +m_xStatement.clear(); +m_xMetaData.clear(); } // ------------------------------------------------------------------------- Any SAL_CALL KabResultSet::queryInterface(const Type & rType) throw(RuntimeException) diff --git a/connectivity/source/drivers/kab/KTables.cxx b/connectivity/source/drivers/kab/KTables.cxx index 88ccecc188ac..a672f983e8aa 100644 --- a/connectivity/source/drivers/kab/KTables.cxx +++ b/connectivity/source/drivers/kab/KTables.cxx @@ -88,6 +88,6 @@ void KabTables::impl_refresh( ) throw(RuntimeException) // ------------------------------------------------------------------------- void KabTables::disposing(void) { - m_xMetaData = NULL; +m_xMetaData.clear(); OCollection::disposing(); } |