[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - vcl/unx

[Libreoffice Gerrit user]

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

New commits:
commit cc3661c57ee18e66b39418598a11a90f2793067e
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Mon Dec 10 21:20:51 2018 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Tue Dec 11 14:29:08 2018 +0100

    gtk takes care of the ordering itself
    
    Change-Id: I5d77a3dddeb5524bfef13a4871ffc5bb6be6cae0
    Reviewed-on: https://gerrit.libreoffice.org/64902
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index 22e553bc8991..346eb8d65562 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -4703,17 +4703,14 @@ namespace
         gchar* pName2;
         GtkTreeSortable* pSortable = GTK_TREE_SORTABLE(pModel);
         gint sort_column_id(0);
-        GtkSortType order(GTK_SORT_ASCENDING);
-        gtk_tree_sortable_get_sort_column_id(pSortable, &sort_column_id, &order);
+        gtk_tree_sortable_get_sort_column_id(pSortable, &sort_column_id, nullptr);
         gtk_tree_model_get(pModel, a, sort_column_id, &pName1, -1);
         gtk_tree_model_get(pModel, b, sort_column_id, &pName2, -1);
         gint ret = pSorter->compare(OUString(pName1, strlen(pName1), RTL_TEXTENCODING_UTF8),
                                     OUString(pName2, strlen(pName2), RTL_TEXTENCODING_UTF8));
         g_free(pName1);
         g_free(pName2);
-        if (ret == 0)
-            return ret;
-        return order == GTK_SORT_ASCENDING ? ret : -ret;
+        return ret;
     }
 }