diff options
author | Caolán McNamara <caolanm@redhat.com> | 2019-01-09 13:22:37 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2019-01-11 12:29:59 +0100 |
commit | b4b68a687c8781e58b1afe84b66323961cc2fd6d (patch) | |
tree | aa7faa5648a2c6cc201848ca60e4d745c905dffe /basctl | |
parent | def7929f49f1ed21c4745e5e022d5afffb110359 (diff) |
Resolves: tdf#122598 avoid crash on macro recording end
Change-Id: Ie9f9fc8b4a4a7852a5da37c7d190ca020391012e
Reviewed-on: https://gerrit.libreoffice.org/66029
Tested-by: Jenkins
Tested-by: Xisco Faulí <xiscofauli@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'basctl')
-rw-r--r-- | basctl/source/basicide/macrodlg.cxx | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/basctl/source/basicide/macrodlg.cxx b/basctl/source/basicide/macrodlg.cxx index 182627597940..af5415296322 100644 --- a/basctl/source/basicide/macrodlg.cxx +++ b/basctl/source/basicide/macrodlg.cxx @@ -226,21 +226,17 @@ void MacroChooser::EnableButton(weld::Button& rButton, bool bEnable) SbMethod* MacroChooser::GetMacro() { - SbMethod* pMethod = nullptr; - m_xBasicBox->get_cursor(m_xBasicBoxIter.get()); + if (!m_xBasicBox->get_cursor(m_xBasicBoxIter.get())) + return nullptr; SbModule* pModule = m_xBasicBox->FindModule(m_xBasicBoxIter.get()); - if (pModule) - { - if (m_xMacroBox->get_selected(m_xMacroBoxIter.get())) - { - OUString aMacroName(m_xMacroBox->get_text(*m_xMacroBoxIter)); - pMethod = pModule->FindMethod(aMacroName, SbxClassType::Method); - } - } - return pMethod; + if (!pModule) + return nullptr; + if (!m_xMacroBox->get_selected(m_xMacroBoxIter.get())) + return nullptr; + OUString aMacroName(m_xMacroBox->get_text(*m_xMacroBoxIter)); + return pModule->FindMethod(aMacroName, SbxClassType::Method); } - void MacroChooser::DeleteMacro() { SbMethod* pMethod = GetMacro(); |