[Libreoffice-commits] core.git: 2 commits - binaryurp/source dbaccess/source

[Noel Grandin (via logerrit)]

 binaryurp/source/bridge.cxx                          |    2 ++
 dbaccess/source/core/dataaccess/databasedocument.cxx |    5 +++++
 dbaccess/source/ui/browser/formadapter.cxx           |    2 ++
 dbaccess/source/ui/browser/genericcontroller.cxx     |    5 +++++
 dbaccess/source/ui/misc/TokenWriter.cxx              |    1 +
 5 files changed, 15 insertions(+)

New commits:
commit 7bbe6602552fc7691bbfee8e9e31489fbd906140
Author:     Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Tue Sep 12 14:58:56 2023 +0200
Commit:     Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Wed Sep 13 09:45:34 2023 +0200

    loplugin:unodispose in dbaccess
    
    Change-Id: I7a28204ababc9fec4e90ccbd2f0a485d6bc8d560
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156849
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>

diff --git a/dbaccess/source/core/dataaccess/databasedocument.cxx 
b/dbaccess/source/core/dataaccess/databasedocument.cxx
index 043f3144d3a2..57970d2dd8ad 100644
--- a/dbaccess/source/core/dataaccess/databasedocument.cxx
+++ b/dbaccess/source/core/dataaccess/databasedocument.cxx
@@ -1853,6 +1853,11 @@ void ODatabaseDocument::disposing()
 void SAL_CALL ODatabaseDocument::dispose(  )
 {
     ::cppu::WeakComponentImplHelperBase::dispose();
+    m_xTitleHelper.clear();
+    m_xModuleManager.clear();
+    m_pEventExecutor.clear();
+    m_xCurrentController.clear();
+    m_xUIConfigurationManager.clear();
 }
 
 void SAL_CALL ODatabaseDocument::addEventListener( const Reference< 
lang::XEventListener >& _xListener )
diff --git a/dbaccess/source/ui/browser/formadapter.cxx 
b/dbaccess/source/ui/browser/formadapter.cxx
index 9f439acd20db..24791b44fff5 100644
--- a/dbaccess/source/ui/browser/formadapter.cxx
+++ b/dbaccess/source/ui/browser/formadapter.cxx
@@ -1273,6 +1273,8 @@ void SAL_CALL SbaXFormAdapter::dispose()
             xComp->dispose();
     }
     m_aChildren.clear();
+    m_xMainForm.clear();
+    m_xParent.clear();
 }
 
 void SAL_CALL SbaXFormAdapter::addEventListener(const Reference< 
css::lang::XEventListener >& xListener)
diff --git a/dbaccess/source/ui/browser/genericcontroller.cxx 
b/dbaccess/source/ui/browser/genericcontroller.cxx
index 54d58824ee45..57634ec8b0d4 100644
--- a/dbaccess/source/ui/browser/genericcontroller.cxx
+++ b/dbaccess/source/ui/browser/genericcontroller.cxx
@@ -1165,6 +1165,11 @@ void SAL_CALL OGenericUnoController::dispose()
 {
     SolarMutexGuard aSolarGuard;
     OGenericUnoController_Base::dispose();
+    m_xUrlTransformer.clear();
+    m_xSlaveDispatcher.clear();
+    m_xMasterDispatcher.clear();
+    m_xDatabaseContext.clear();
+    m_xTitleHelper.clear();
 }
 
 weld::Window* OGenericUnoController::getFrameWeld() const
diff --git a/dbaccess/source/ui/misc/TokenWriter.cxx 
b/dbaccess/source/ui/misc/TokenWriter.cxx
index 8d898fe24e1f..e38b3a58a2b4 100644
--- a/dbaccess/source/ui/misc/TokenWriter.cxx
+++ b/dbaccess/source/ui/misc/TokenWriter.cxx
@@ -136,6 +136,7 @@ void ODatabaseImportExport::dispose()
     m_xRow.clear();
     m_xRowLocate.clear();
     m_xFormatter.clear();
+    m_xRowSetColumns.clear();
 }
 
 void SAL_CALL ODatabaseImportExport::disposing( const EventObject& Source )
commit 3d9f9b1b299251c5c28d74e951b4447193ad7ade
Author:     Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Tue Sep 12 13:32:43 2023 +0200
Commit:     Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Wed Sep 13 09:45:20 2023 +0200

    loplugin:unodispose in binaryurp
    
    Change-Id: Iab83b304ab7928dc4ca88a90f3184e2b2e7bf741
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156842
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>

diff --git a/binaryurp/source/bridge.cxx b/binaryurp/source/bridge.cxx
index 523bbbf14ac5..f88fc10ca6ed 100644
--- a/binaryurp/source/bridge.cxx
+++ b/binaryurp/source/bridge.cxx
@@ -920,6 +920,8 @@ void Bridge::dispose() {
     // from within an incoming or outgoing remote call, as passive_.wait() 
would
     // otherwise deadlock:
     passive_.wait();
+    connection_.clear();
+    provider_.clear();
 }
 
 void Bridge::addEventListener(