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

Caolán McNamara (via logerrit) logerrit at kemper.freedesktop.org
Fri May 28 12:58:53 UTC 2021


 vcl/unx/gtk3/gtkinst.cxx |   10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

New commits:
commit c8e716d67c83a59be81777512bb08ca70df8678a
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Fri May 28 11:15:31 2021 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Fri May 28 14:58:08 2021 +0200

    gtk4: restore combobox set_active
    
    Change-Id: Ia8d7d8c52568d1d1fd72bd450f2a707a14bc610a
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116324
    Tested-by: Caolán McNamara <caolanm at redhat.com>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx
index 58041169e175..d2b7bd7b20a6 100644
--- a/vcl/unx/gtk3/gtkinst.cxx
+++ b/vcl/unx/gtk3/gtkinst.cxx
@@ -16993,15 +16993,7 @@ private:
     {
         disable_notify_events();
 
-        tree_view_set_cursor(pos);
-
-        if (m_pEditable)
-        {
-            if (pos != -1)
-                gtk_editable_set_text(m_pEditable, OUStringToOString(get_text_including_mru(pos), RTL_TEXTENCODING_UTF8).getStr());
-            else
-                gtk_editable_set_text(m_pEditable, "");
-        }
+        gtk_combo_box_set_active(m_pComboBox, pos);
 
         m_bChangedByMenu = false;
         enable_notify_events();


More information about the Libreoffice-commits mailing list