[Libreoffice-commits] core.git: vcl/unx

[Maxim Monastirsky (via logerrit)]

 vcl/unx/gtk3/gtk3gtkinst.cxx |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 0ba7063b3f065741915aff076343579b088da3dc
Author:     Maxim Monastirsky <momonasmon at gmail.com>
AuthorDate: Sun Aug 2 14:38:05 2020 +0300
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Sun Aug 2 22:08:29 2020 +0200

    Make gtk's get_sort_order return the same as the vcl's one
    
    Change-Id: Ia6584b268cb7b53423c7ac3d353e07409e9a5dac
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99952
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index fba1fa52fec8..391999922f62 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -10339,11 +10339,12 @@ public:
 
     virtual bool get_sort_order() const override
     {
+        int nSortColumn;
         GtkSortType eSortType;
 
         GtkTreeSortable* pSortable = GTK_TREE_SORTABLE(m_pTreeStore);
-        gtk_tree_sortable_get_sort_column_id(pSortable, nullptr, &eSortType);
-        return eSortType == GTK_SORT_ASCENDING;
+        gtk_tree_sortable_get_sort_column_id(pSortable, &nSortColumn, &eSortType);
+        return nSortColumn != GTK_TREE_SORTABLE_UNSORTED_SORT_COLUMN_ID && eSortType == GTK_SORT_ASCENDING;
     }
 
     virtual void set_sort_indicator(TriState eState, int col) override