commit 2dc90967977617f58a9d47e6ae89175919eef4b2
author Caolán McNamara <caolanm@redhat.com> Mon Nov 01 10:30:23 2021 +0000
committer Xisco Fauli <xiscofauli@libreoffice.org> Tue Nov 02 11:41:32 2021 +0100
tree 52b94967649c7f770de6d01935f82bfe7a71ec68
parent b3be435a61d9367dcaef8347f77b92c9ea0a94d9

Resolves: tdf#145391 insertion code assumes unsorted treeview

so assumed row index doesn't match real insertion point

presumably a problem since...

commit e8b3df5b9b0eb0a93c25b6dc2e445ae44a7e3f78
Date:   Fri Aug 2 14:57:49 2019 +0200

    tdf#93476 Sort Macro library list after creating/importing a macro

    Only set the widget as sorted in the ctor, it remains sorted

Change-Id: I6cefc43357f3215a49b33ff18befdc679c1749bc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124469
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>

basctl/source/basicide/moduldl2.cxx

diff --git a/basctl/source/basicide/moduldl2.cxx b/basctl/source/basicide/moduldl2.cxx
index cd6587d..168f4ff 100644
--- a/basctl/source/basicide/moduldl2.cxx
+++ b/basctl/source/basicide/moduldl2.cxx
@@ -631,28 +631,33 @@ void LibPage::InsertLib()

    Sequence< OUString > aLibNames = GetMergedLibraryNames( xModLibContImport, xDlgLibContImport );
    sal_Int32 nLibCount = aLibNames.getLength();
    const OUString* pLibNames = aLibNames.getConstArray();
    for ( sal_Int32 i = 0 ; i < nLibCount ; i++ )
    if (nLibCount)
    {
        // library import dialog
        if (!xLibDlg)
        xLibDlg = std::make_shared<LibDialog>(m_pDialog->getDialog());
        xLibDlg->SetStorageName(aURLObj.getName());
        weld::TreeView& rView = xLibDlg->GetLibBox();
        rView.make_unsorted();

        const OUString* pLibNames = aLibNames.getConstArray();
        for (sal_Int32 i = 0 ; i < nLibCount; ++i)
        {
            xLibDlg = std::make_shared<LibDialog>(m_pDialog->getDialog());
            xLibDlg->SetStorageName( aURLObj.getName() );
            // libbox entries
            OUString aLibName( pLibNames[ i ] );
            if ( !( ( xModLibContImport.is() && xModLibContImport->hasByName( aLibName ) && xModLibContImport->isLibraryLink( aLibName ) ) ||
                    ( xDlgLibContImport.is() && xDlgLibContImport->hasByName( aLibName ) && xDlgLibContImport->isLibraryLink( aLibName ) ) ) )
            {
                rView.append();
                const int nRow = rView.n_children() - 1;
                rView.set_toggle(nRow, TRISTATE_TRUE);
                rView.set_text(nRow, aLibName, 0);
            }
        }

        // libbox entries
        OUString aLibName( pLibNames[ i ] );
        if ( !( ( xModLibContImport.is() && xModLibContImport->hasByName( aLibName ) && xModLibContImport->isLibraryLink( aLibName ) ) ||
                ( xDlgLibContImport.is() && xDlgLibContImport->hasByName( aLibName ) && xDlgLibContImport->isLibraryLink( aLibName ) ) ) )
        {
            weld::TreeView& rView = xLibDlg->GetLibBox();
            rView.append();
            const int nRow = rView.n_children() - 1;
            rView.set_toggle(nRow, TRISTATE_TRUE);
            rView.set_text(nRow, aLibName, 0);
            rView.set_cursor(rView.find_text(aLibName));
        }
        rView.make_sorted();

        if (rView.n_children())
            rView.set_cursor(0);
    }

    if (!xLibDlg)