[Libreoffice-commits] core.git: Branch 'libreoffice-7-5-0' - 2 commits - comphelper/source svx/source

[Xisco Fauli (via logerrit)]

 comphelper/source/misc/SelectionMultiplex.cxx |    3 ++-
 svx/source/form/datanavi.cxx                  |    1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 12549c5b4deea7071958b644350dc2597b62c034
Author:     Xisco Fauli <xiscofa...@libreoffice.org>
AuthorDate: Fri Jan 13 11:42:38 2023 +0100
Commit:     Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Wed Jan 25 08:56:01 2023 +0000

    comphelper: check for nullptr
    
    See 
https://crashreport.libreoffice.org/stats/signature/comphelper::OSelectionChangeMultiplexer::dispose()
    
    Regression from 9931d6b1fb0406e16d56e186812884511738dcfa
    "tdf#150575: REPORTBUILDER: Crash when closing report when used report
    navigator"
    
    Change-Id: I6e4ada368254879d983f80026e9b42ddb4186c51
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145461
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
    (cherry picked from commit e4e2c7a63217c797802045d326f732296e0af918)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145443
    Reviewed-by: Michael Stahl <michael.st...@allotropia.de>
    (cherry picked from commit a8b4523905bd5ed8ed06150927b4af3cdf40a7ba)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145577
    Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
    Reviewed-by: Patrick Luby <plub...@neooffice.org>
    Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
    Tested-by: Xisco Fauli <xiscofa...@libreoffice.org>

diff --git a/comphelper/source/misc/SelectionMultiplex.cxx 
b/comphelper/source/misc/SelectionMultiplex.cxx
index e4fb824a0ba3..438eaa80d718 100644
--- a/comphelper/source/misc/SelectionMultiplex.cxx
+++ b/comphelper/source/misc/SelectionMultiplex.cxx
@@ -100,7 +100,8 @@ void OSelectionChangeMultiplexer::dispose()
     osl_atomic_increment(&m_refCount);
     {
         Reference< XSelectionChangeListener> xPreventDelete(this);
-        m_xSet->removeSelectionChangeListener(xPreventDelete);
+        if(m_xSet.is())
+            m_xSet->removeSelectionChangeListener(xPreventDelete);
     }
     osl_atomic_decrement(&m_refCount);
 }
commit fe5fa5333801a48fe8358780f454b1cfea0aaaf2
Author:     Xisco Fauli <xiscofa...@libreoffice.org>
AuthorDate: Mon Jan 23 10:55:02 2023 +0100
Commit:     Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Wed Jan 25 08:55:46 2023 +0000

    tdf#153154: m_xDataTypeLB is still in use
    
    Regression from 2e7f77d3fe01e36222d5ad84c18d7d7537092972
    "loplugin:unusedfields"
    
    Change-Id: Ic9435ee9417f812281ad75039d4ef88f508bad62
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145949
    Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
    Reviewed-by: Michael Stahl <michael.st...@allotropia.de>
    Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
    Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
    Tested-by: Xisco Fauli <xiscofa...@libreoffice.org>

diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx
index 210ebdce3b22..ca859c4cbd15 100644
--- a/svx/source/form/datanavi.cxx
+++ b/svx/source/form/datanavi.cxx
@@ -2066,6 +2066,7 @@ namespace svxform
         , m_xDefaultED(m_xBuilder->weld_entry("value"))
         , m_xDefaultBtn(m_xBuilder->weld_button("browse"))
         , m_xSettingsFrame(m_xBuilder->weld_widget("settingsframe"))
+        , m_xDataTypeLB(m_xBuilder->weld_combo_box("datatype"))
         , m_xRequiredCB(m_xBuilder->weld_check_button("required"))
         , m_xRequiredBtn(m_xBuilder->weld_button("requiredcond"))
         , m_xRelevantCB(m_xBuilder->weld_check_button("relevant"))