From 96bd77de5ad7b7a13f7e48e0f95c05ef49255aa0 Mon Sep 17 00:00:00 2001 From: Mike Kaganski Date: Mon, 13 Sep 2021 11:29:37 +0300 Subject: Use implementing XUnoTunnel part 5 - Revise uses of getSomething to use getFromUnoTunnel Where that is impossible, use getSomething_cast to unify casting, and minimize number of places doing low-level transformations. The change keeps the existing tunnel references that last for the duration of the pointers' life, because sometimes destroying such reference may destroy the pointed object, and result in use after free. Change-Id: I291c33223582c34cd2c763aa8aacf0ae899ca4c0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122101 Tested-by: Jenkins Reviewed-by: Mike Kaganski --- dbaccess/source/core/dataaccess/databasedocument.cxx | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'dbaccess') diff --git a/dbaccess/source/core/dataaccess/databasedocument.cxx b/dbaccess/source/core/dataaccess/databasedocument.cxx index f9f99ef8ef9a..7fc1cb6eb254 100644 --- a/dbaccess/source/core/dataaccess/databasedocument.cxx +++ b/dbaccess/source/core/dataaccess/databasedocument.cxx @@ -60,6 +60,7 @@ #include #include #include +#include #include #include #include @@ -2199,9 +2200,9 @@ com_sun_star_comp_dba_ODatabaseDocument(css::uno::XComponentContext* context, css::uno::Sequence const &) { Reference xDBContextTunnel(DatabaseContext::create(context), UNO_QUERY_THROW); - dbaccess::ODatabaseContext* pContext = reinterpret_cast( - xDBContextTunnel->getSomething( - dbaccess::ODatabaseContext::getUnoTunnelId())); + dbaccess::ODatabaseContext* pContext + = comphelper::getFromUnoTunnel(xDBContextTunnel); + assert(pContext); rtl::Reference pImpl( new dbaccess::ODatabaseModelImpl(context, *pContext)); -- cgit