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

[Libreoffice Gerrit user]

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

New commits:
commit 22cd7acc7a81215876bb516311283b43f1a8f52c
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Mon Dec 10 21:20:51 2018 +0000
Commit:     Caolán McNamara <caol...@redhat.com>
CommitDate: Tue Dec 11 14:28:50 2018 +0100

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

diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index 070d8b9255a1..d48b1883d820 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -4704,17 +4704,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;
     }
 }
 
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits