diff options
| author | Noel Grandin <noelgrandin@collabora.co.uk> | 2024-11-07 12:12:47 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2024-11-07 14:31:13 +0100 |
| commit | 6d6d11a2d26dfc5f4320bd7523ebbe61759eda8c (patch) | |
| tree | 1b861a91aed42df84e48e088255dcc645d422207 /connectivity/source/drivers | |
| parent | 8d0a0bc4d4bc9d6b453f98164c4ab33d0afa91f9 (diff) | |
use more concrete UNO type in connectivity::ado
Change-Id: I4a23e8847496166f1f9668830b97c71a248dd143
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/176206
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'connectivity/source/drivers')
| -rw-r--r-- | connectivity/source/drivers/ado/AConnection.cxx | 3 | ||||
| -rw-r--r-- | connectivity/source/drivers/ado/ADriver.cxx | 1 |
2 files changed, 1 insertions, 3 deletions
diff --git a/connectivity/source/drivers/ado/AConnection.cxx b/connectivity/source/drivers/ado/AConnection.cxx index 600604e5eafb..8fe1f3920c1e 100644 --- a/connectivity/source/drivers/ado/AConnection.cxx +++ b/connectivity/source/drivers/ado/AConnection.cxx @@ -54,7 +54,6 @@ IMPLEMENT_SERVICE_INFO(OConnection,"com.sun.star.sdbcx.AConnection","com.sun.sta OConnection::OConnection(ODriver* _pDriver) : m_xCatalog(nullptr), m_pDriver(_pDriver), - m_pCatalog(nullptr), m_nEngineType(0), m_bClosed(false), m_bAutocommit(true) @@ -456,7 +455,7 @@ void OConnection::disposing() m_bClosed = true; m_xMetaData = css::uno::WeakReference< css::sdbc::XDatabaseMetaData>(); - m_xCatalog = css::uno::WeakReference< css::sdbcx::XTablesSupplier>(); + m_xCatalog.clear(); m_pDriver = nullptr; m_aAdoConnection.Close(); diff --git a/connectivity/source/drivers/ado/ADriver.cxx b/connectivity/source/drivers/ado/ADriver.cxx index 6568f7a1ee84..69b4aa79d1e3 100644 --- a/connectivity/source/drivers/ado/ADriver.cxx +++ b/connectivity/source/drivers/ado/ADriver.cxx @@ -190,7 +190,6 @@ Reference< XTablesSupplier > SAL_CALL ODriver::getDataDefinitionByConnection( co aCatalog.putref_ActiveConnection(pConnection->getConnection()); rtl::Reference<OCatalog> pCatalog = new OCatalog(aCatalog,pConnection); xTab = pCatalog; - pConnection->setCatalog(xTab); pConnection->setCatalog(pCatalog.get()); } } |