[Libreoffice-commits] core.git: 2 commits - basctl/source sw/source vcl/source vcl/unx

[Caolán McNamara (via logerrit)]

 basctl/source/basicide/macrodlg.cxx |    2 +-
 sw/source/ui/misc/glossary.cxx      |    2 +-
 vcl/source/app/salvtables.cxx       |    1 +
 vcl/unx/gtk3/gtk3gtkinst.cxx        |    2 ++
 4 files changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 68bab1db3b0eaedd315ce7cea32a614f47607b9b
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Thu Aug 1 15:31:17 2019 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Thu Aug 1 22:17:16 2019 +0200

    Resolves: tdf#126661 unexpected sort between freeze+thaw
    
    Change-Id: Ibb6b404d32e38c72fb1ff4be73f3a5f116d55692
    Reviewed-on: https://gerrit.libreoffice.org/76809
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/basctl/source/basicide/macrodlg.cxx b/basctl/source/basicide/macrodlg.cxx
index fde159c8fc4e..ac93f0bbb01c 100644
--- a/basctl/source/basicide/macrodlg.cxx
+++ b/basctl/source/basicide/macrodlg.cxx
@@ -493,8 +493,8 @@ IMPL_LINK_NOARG(MacroChooser, BasicSelectHdl, weld::TreeView&, void)
         m_xMacroBox->freeze();
         for (auto const& macro : aMacros)
             m_xMacroBox->append_text(macro.second->GetName());
-        m_xMacroBox->make_sorted();
         m_xMacroBox->thaw();
+        m_xMacroBox->make_sorted();
 
         if (m_xMacroBox->get_iter_first(*m_xMacroBoxIter))
             m_xMacroBox->set_cursor(*m_xMacroBoxIter);
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index 6db8e912378f..922828140e8c 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -3799,6 +3799,7 @@ public:
 
     virtual void make_sorted() override
     {
+        assert(m_xTreeView->IsUpdateMode() && "don't sort when frozen");
         m_xTreeView->SetStyle(m_xTreeView->GetStyle() | WB_SORT);
         m_xTreeView->GetModel()->SetCompareHdl(LINK(this, SalInstanceTreeView, CompareHdl));
         set_sort_order(true);
diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index f06f818930ad..57ba84a75b8d 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -7157,6 +7157,8 @@ public:
 
     virtual void make_sorted() override
     {
+        // thaw wants to restore sort state of freeze
+        assert(gtk_tree_view_get_model(m_pTreeView) && "don't select when frozen");
         m_xSorter.reset(new comphelper::string::NaturalStringSorter(
                             ::comphelper::getProcessComponentContext(),
                             Application::GetSettings().GetUILanguageTag().getLocale()));
commit 58212048ef59e60b15b6261afbb40af048d1a95a
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Thu Aug 1 17:06:42 2019 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Thu Aug 1 22:17:03 2019 +0200

    sort outside thaw
    
    Change-Id: Ifafae5f4ddba816ef3b11d4babd54ae6495a487f
    Reviewed-on: https://gerrit.libreoffice.org/76816
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sw/source/ui/misc/glossary.cxx b/sw/source/ui/misc/glossary.cxx
index 9f69596083c4..f0bf1d266638 100644
--- a/sw/source/ui/misc/glossary.cxx
+++ b/sw/source/ui/misc/glossary.cxx
@@ -777,8 +777,8 @@ void SwGlossaryDlg::Init()
         }
     }
 
-    m_xCategoryBox->make_sorted();
     m_xCategoryBox->thaw();
+    m_xCategoryBox->make_sorted();
 
     if (xSelEntry)
     {