From 502fbd79f9d71d01a177c3cd77256ed6a5a544d8 Mon Sep 17 00:00:00 2001 From: Julien Nabet Date: Tue, 17 Oct 2023 22:17:00 +0200 Subject: Related tdf#144256: fix order of disposing in OSharedConnection In dbaccess/source/core/dataaccess/SharedConnection.hxx, we got: 35 typedef ::cppu::WeakComponentImplHelper< css::sdbc::XConnection 36 > OSharedConnection_BASE; 37 typedef ::connectivity::OConnectionWrapper OSharedConnection_BASE2; 38 39 class OSharedConnection : public ::cppu::BaseMutex 40 , public OSharedConnection_BASE 41 , public OSharedConnection_BASE2 so first OSharedConnection_BASE ctr is called before OConnectionWrapper ctr therefore OConnectionWrapper dtr should be called before OSharedConnection_BASE dtr It doesn't fix the bug but investigating in all this mess, I'd like to fix these things since it may help. Change-Id: I47255357b4ca02261f31ebf500f3f1ff55642e69 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158096 Reviewed-by: Mike Kaganski Tested-by: Julien Nabet Reviewed-by: Julien Nabet --- dbaccess/source/core/dataaccess/SharedConnection.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'dbaccess') diff --git a/dbaccess/source/core/dataaccess/SharedConnection.cxx b/dbaccess/source/core/dataaccess/SharedConnection.cxx index 31a8e68ba7b1..d893a8e298b3 100644 --- a/dbaccess/source/core/dataaccess/SharedConnection.cxx +++ b/dbaccess/source/core/dataaccess/SharedConnection.cxx @@ -38,8 +38,8 @@ OSharedConnection::~OSharedConnection() {} void SAL_CALL OSharedConnection::disposing() { - OSharedConnection_BASE::disposing(); OConnectionWrapper::disposing(); + OSharedConnection_BASE::disposing(); } Reference SAL_CALL OSharedConnection::createStatement() -- cgit