pool/libreoffice
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 652815 from home:jdelvare:branches:LibreOffice:Factory

Browse Source 
- 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
This commit is contained in:
Tomáš Chvátal 2018-12-02 09:08:50 +00:00 committed by Git OBS Bridge
parent 849eaef483
commit 91326e7f01
3 changed files with 44 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
bsc1117300.patch Normal file
View File

@ -0,0 +1,34 @@
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
+ }
}
}

7
libreoffice.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Thu Nov 29 10:41:59 UTC 2018 - jdelvare@suse.com
- bsc#1117300 - [DATA LOSS] Saving a new document can silently
overwrite an existing document
* bsc1117300.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Nov 28 12:51:12 UTC 2018 - Tomáš Chvátal <tchvatal@suse.com> Wed Nov 28 12:51:12 UTC 2018 - Tomáš Chvátal <tchvatal@suse.com>

3
libreoffice.spec
View File

@ -110,6 +110,8 @@ Patch7: bsc1110348.patch
Patch8: bsc1112112.patch Patch8: bsc1112112.patch
# Bug 882383 - LO-L3: Chart in PPTX lacks color and is too large # Bug 882383 - LO-L3: Chart in PPTX lacks color and is too large
Patch9: bsc882383.patch Patch9: bsc882383.patch
# Bug 1117300 - [DATA LOSS] Saving a new document can silently overwrite an existing document
Patch10: bsc1117300.patch
# try to save space by using hardlinks # try to save space by using hardlinks
Patch990: install-with-hardlinks.diff Patch990: install-with-hardlinks.diff
BuildRequires: %{name}-share-linker BuildRequires: %{name}-share-linker
@ -959,6 +961,7 @@ Provides %{langname} translations and additional resources (help files, etc.) fo
%patch7 -p1 %patch7 -p1
%patch8 -p1 %patch8 -p1
%patch9 -p1 %patch9 -p1
%patch10 -p1
%patch990 -p1 %patch990 -p1
# Disable some of the failing tests (some are random) # Disable some of the failing tests (some are random)