diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2022-08-07 12:49:11 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2022-08-07 15:40:29 +0200 |
| commit | 6e2bd11251afbe64f9889ede36b28b00f47aaff5 (patch) | |
| tree | c83ca0998b71323c7a87744a7956820f3d2344f3 /basctl/source/basicide | |
| parent | 42a32f375a2641e6e82ee685efa3573c0dcaf001 (diff) | |
tdf#150291 Revert "Fix crash when no valid EntryDescriptor found"
This reverts commit 499ecbf3a36990c29dc7e1fb9b0ecb1d297c2848 because
it causes the dialog not to start with the default selected macro
auto-expanded like it used to. Possibly the other fix for tdf#150291
solves the original problem.
Change-Id: Ic91410de073fe87d4edebde18b60ffcc1ad324a3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137923
Tested-by: Jenkins
Tested-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'basctl/source/basicide')
| -rw-r--r-- | basctl/source/basicide/iderdll.cxx | 1 | ||||
| -rw-r--r-- | basctl/source/basicide/macrodlg.cxx | 7 |
2 files changed, 0 insertions, 8 deletions
diff --git a/basctl/source/basicide/iderdll.cxx b/basctl/source/basicide/iderdll.cxx index 8e8a3dc3e114..022045050e9a 100644 --- a/basctl/source/basicide/iderdll.cxx +++ b/basctl/source/basicide/iderdll.cxx @@ -145,7 +145,6 @@ ExtraData* Dll::GetExtraData () ExtraData::ExtraData () : - m_aLastEntryDesc(EntryDescriptor()), bChoosingMacro(false), bShellInCriticalSection(false) { diff --git a/basctl/source/basicide/macrodlg.cxx b/basctl/source/basicide/macrodlg.cxx index a9d3fd0f037c..2cc12fb053d9 100644 --- a/basctl/source/basicide/macrodlg.cxx +++ b/basctl/source/basicide/macrodlg.cxx @@ -154,13 +154,6 @@ void MacroChooser::RestoreMacroDescription() aDesc = pData->GetLastEntryDescriptor(); } - // No valid EntryDescriptor found - if (aDesc.GetMethodName().isEmpty()) - { - m_xMacroNameEdit->select_region(0, 0); - return; - } - m_xBasicBox->SetCurrentEntry(aDesc); BasicSelectHdl(m_xBasicBox->get_widget()); |