summaryrefslogtreecommitdiff
path: root/basctl
diff options
context:
space:
mode:
Diffstat (limited to 'basctl')
-rw-r--r--basctl/source/basicide/macrodlg.cxx20
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();