91326e7f01
- bsc#1117300 - [DATA LOSS] Saving a new document can silently overwrite an existing document * bsc1117300.patch OBS-URL: https://build.opensuse.org/request/show/652815 OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=730
35 lines
1.5 KiB
Diff
35 lines
1.5 KiB
Diff
From 4846848941241f92b32bcffef3489736d1baffec Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
|
|
Date: Thu, 8 Nov 2018 09:58:58 +0000
|
|
Subject: Resolves: tdf#119790 for gtk3 save and restore typed name on changing filter
|
|
|
|
Change-Id: I17c3d154144b13ce401b0e4afe84c91a2fe98d8e
|
|
Reviewed-on: https://gerrit.libreoffice.org/63076
|
|
Tested-by: Jenkins
|
|
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
|
|
---
|
|
vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx | 9 +++++++++
|
|
1 file changed, 9 insertions(+)
|
|
|
|
diff --git a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
|
|
index 16a845eabe81..75458dae1a13 100644
|
|
--- a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
|
|
+++ b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
|
|
@@ -807,7 +807,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
|
|
+ }
|
|
}
|
|
}
|
|
|