[Libreoffice-commits] core.git: Branch 'libreoffice-7-4-0' - basctl/source

[Caolán McNamara (via logerrit)]

 basctl/source/basicide/macrodlg.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 9b119bb65280a9a0294652d343fdbe880609cd3a
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Sun Aug 7 12:34:00 2022 +0100
Commit:     Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Wed Aug 10 11:48:14 2022 +0200

    tdf#150291 crash on macro organizer with no macro selected
    
    Change-Id: Ib7e05f4e3e1c63bc0bd497b590256c4ee77a0bf8
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137822
    Tested-by: Jenkins
    Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
    (cherry picked from commit d4a885b7526b7242053f5587f47f1251c06492d1)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137833
    Reviewed-by: Michael Stahl <michael.st...@allotropia.de>
    Tested-by: Mike Kaganski <mike.kagan...@collabora.com>
    Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>

diff --git a/basctl/source/basicide/macrodlg.cxx 
b/basctl/source/basicide/macrodlg.cxx
index 03613c96c914..a9d3fd0f037c 100644
--- a/basctl/source/basicide/macrodlg.cxx
+++ b/basctl/source/basicide/macrodlg.cxx
@@ -122,7 +122,8 @@ MacroChooser::~MacroChooser()
 
 void MacroChooser::StoreMacroDescription()
 {
-    m_xBasicBox->get_selected(m_xBasicBoxIter.get());
+    if (!m_xBasicBox->get_selected(m_xBasicBoxIter.get()))
+        return;
     EntryDescriptor aDesc = 
m_xBasicBox->GetEntryDescriptor(m_xBasicBoxIter.get());
     OUString aMethodName;
     if (m_xMacroBox->get_selected(m_xMacroBoxIter.get()))