summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2018-11-08 09:58:58 +0000
committerCaolán McNamara <caolanm@redhat.com>2018-11-08 13:45:39 +0100
commit35b6f75bc14fe65c4700e199d82c958f715420ac (patch)
tree8b1c747def28511624028c45cb4eca0fa19e682b
parent4613e105f98af6e3b65ce87432b1a2db45e71ae2 (diff)
Resolves: tdf#119790 for gtk3 save and restore typed name on changing filter
Change-Id: I17c3d154144b13ce401b0e4afe84c91a2fe98d8e Reviewed-on: https://gerrit.libreoffice.org/63075 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r--vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx9
1 files changed, 9 insertions, 0 deletions
diff --git a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
index d5fd865747ba..b4603bb32a80 100644
--- a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
+++ b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
@@ -806,7 +806,16 @@ uno::Sequence<OUString> SAL_CALL SalGtkFilePicker::getSelectedFiles()
}
}
if( bChangeFilter && bExtensionTypedIn )
+ {
+#if GTK_CHECK_VERSION(3,0,0)
+ gchar* pCurrentName = gtk_file_chooser_get_current_name(GTK_FILE_CHOOSER(m_pDialog));
+ setCurrentFilter( aNewFilter );
+ gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(m_pDialog), pCurrentName);
+ g_free(pCurrentName);
+#else
setCurrentFilter( aNewFilter );
+#endif
+ }
}
}