commit 505822ef941194552ae782081d5f6e9d2a6989d3
author Caolán McNamara <caolanm@redhat.com> Fri Oct 25 20:38:31 2019 +0100
committer Caolán McNamara <caolanm@redhat.com> Sun Oct 27 13:39:51 2019 +0100
tree 099a9ba5fffc0017c1e5cf20d101a23387414fa2
parent 2070290de6bd5c44c9786aac56aa4d3e2f3ec522

tdf#128393 change sorting while thawed

Change-Id: I9670c1557e0b39f9dde1f068bb091b9459d89baa
Reviewed-on: https://gerrit.libreoffice.org/81533
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

sw/source/ui/fldui/fldref.cxx

diff --git a/sw/source/ui/fldui/fldref.cxx b/sw/source/ui/fldui/fldref.cxx
index a2c6bfb..4b89a8a 100644
--- a/sw/source/ui/fldui/fldref.cxx
+++ b/sw/source/ui/fldui/fldref.cxx
@@ -484,6 +484,24 @@ void SwFieldRefPage::UpdateSubType(const OUString& filterString)

    m_xSelectionLB->freeze();
    m_xSelectionLB->clear();

    if (REFFLDFLAG & nTypeId)
    {
        if (nTypeId == REFFLDFLAG_FOOTNOTE || nTypeId == REFFLDFLAG_ENDNOTE)
        {
            m_xSelectionLB->thaw();
            m_xSelectionLB->make_unsorted();
            m_xSelectionLB->freeze();
        }
        // #i83479#
        else if (nTypeId != REFFLDFLAG_HEADING && nTypeId != REFFLDFLAG_NUMITEM)
        {
            m_xSelectionLB->thaw();
            m_xSelectionLB->make_sorted();
            m_xSelectionLB->freeze();
        }
    }

    // #i83479#
    m_xSelectionToolTipLB->freeze();
    m_xSelectionToolTipLB->clear();
@@ -494,7 +512,6 @@ void SwFieldRefPage::UpdateSubType(const OUString& filterString)
    {
        if (nTypeId == REFFLDFLAG_BOOKMARK)     // text marks!
        {
            m_xSelectionLB->make_sorted();
            // get all text marks
            IDocumentMarkAccess* const pMarkAccess = pSh->getIDocumentMarkAccess();
            for(IDocumentMarkAccess::const_iterator_t ppMark = pMarkAccess->getBookmarksBegin();
@@ -516,7 +533,6 @@ void SwFieldRefPage::UpdateSubType(const OUString& filterString)
        }
        else if (nTypeId == REFFLDFLAG_FOOTNOTE)
        {
            m_xSelectionLB->make_unsorted();
            SwSeqFieldList aArr;
            const size_t nCnt = pSh->GetSeqFootnoteList( aArr );

@@ -533,7 +549,6 @@ void SwFieldRefPage::UpdateSubType(const OUString& filterString)
        }
        else if (nTypeId == REFFLDFLAG_ENDNOTE)
        {
            m_xSelectionLB->make_unsorted();
            SwSeqFieldList aArr;
            const size_t nCnt = pSh->GetSeqFootnoteList( aArr, true );

@@ -621,7 +636,6 @@ void SwFieldRefPage::UpdateSubType(const OUString& filterString)
        }
        else
        {
            m_xSelectionLB->make_sorted();
            // get the fields to Seq-FieldType:

            SwSetExpFieldType* pType = static_cast<SwSetExpFieldType*>(pSh->GetFieldType(