commit 6e2bd11251afbe64f9889ede36b28b00f47aaff5
author Caolán McNamara <caolanm@redhat.com> Sun Aug 07 12:49:11 2022 +0100
committer Caolán McNamara <caolanm@redhat.com> Sun Aug 07 15:40:29 2022 +0200
tree c83ca0998b71323c7a87744a7956820f3d2344f3
parent 42a32f375a2641e6e82ee685efa3573c0dcaf001

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>

basctl/source/basicide/iderdll.cxx

diff --git a/basctl/source/basicide/iderdll.cxx b/basctl/source/basicide/iderdll.cxx
index 8e8a3dc..0220450 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)
{

basctl/source/basicide/macrodlg.cxx

diff --git a/basctl/source/basicide/macrodlg.cxx b/basctl/source/basicide/macrodlg.cxx
index a9d3fd0..2cc12fb 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());

vcl/source/app/salvtables.cxx

diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index 1cc12d4..02394ac 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -4900,8 +4900,6 @@ void SalInstanceTreeView::set_text(const weld::TreeIter& rIter, const OUString& 
OUString SalInstanceTreeView::get_id(const weld::TreeIter& rIter) const
{
    const SalInstanceTreeIter& rVclIter = static_cast<const SalInstanceTreeIter&>(rIter);
    if (!rVclIter.iter)
        return OUString();
    const OUString* pStr = static_cast<const OUString*>(rVclIter.iter->GetUserData());
    if (pStr)
        return *pStr;

vcl/source/treelist/treelist.cxx

diff --git a/vcl/source/treelist/treelist.cxx b/vcl/source/treelist/treelist.cxx
index fc81fa2..8f51e34 100644
--- a/vcl/source/treelist/treelist.cxx
+++ b/vcl/source/treelist/treelist.cxx
@@ -102,8 +102,6 @@ bool SvTreeList::IsEntryVisible( const SvListView* pView, SvTreeListEntry* pEntr

sal_uInt16 SvTreeList::GetDepth( const SvTreeListEntry* pEntry ) const
{
    if (!pEntry)
        return 0;
    DBG_ASSERT(pEntry && pEntry!=pRootItem.get(),"GetDepth:Bad Entry");
    sal_uInt16 nDepth = 0;
    while( pEntry && pEntry->pParent != pRootItem.get() )
@@ -1504,8 +1502,6 @@ SvTreeListEntries& SvTreeList::GetChildList( SvTreeListEntry* pParent )

const SvTreeListEntry* SvTreeList::GetParent( const SvTreeListEntry* pEntry ) const
{
    if (!pEntry)
        return nullptr;
    const SvTreeListEntry* pParent = pEntry->pParent;
    if (pParent == pRootItem.get())
        pParent = nullptr;
@@ -1514,8 +1510,6 @@ const SvTreeListEntry* SvTreeList::GetParent( const SvTreeListEntry* pEntry ) co

SvTreeListEntry* SvTreeList::GetParent( SvTreeListEntry* pEntry )
{
    if (!pEntry)
        return nullptr;
    SvTreeListEntry* pParent = pEntry->pParent;
    if (pParent == pRootItem.get())
        pParent = nullptr;