[SCM] LibreOffice packaging repository branch, debian-experimental-3.6, updated. libreoffice_3.5.4-6-133-gd4e5e49
The following commit has been merged in the debian-experimental-3.6 branch:
commit d4e5e49d94e4b9d40dcd69bc1de3d412a0c751e0
Author: Rene Engelhard <rene@debian.org>
Date: Wed Aug 1 19:13:59 2012 +0200
backport upstream fix from libreoffice-3-6 to fix dot handling in KDE File Picker
diff --git a/changelog b/changelog
index 17fdca5..01aad59 100644
--- a/changelog
+++ b/changelog
@@ -7,6 +7,9 @@ libreoffice (1:3.6.0~rc4-1) UNRELEASED; urgency=low
- caches fontconfig font substitutions (closes: #631308)
* debian/patches/build-dont-run-checks.diff: as name says
+ * debian/patches/dont-let-autoextension-interfere-with-kfiledialog.diff:
+ backport upstream fix from libreoffice-3-6 to fix dot handling in
+ KDE File Picker (closes: #645946)
* debian/rules:
- new conditionals for: doxygen, libcdr, liblcms2
diff --git a/patches/dont-let-autoextension-interfere-with-kfiledialog.diff b/patches/dont-let-autoextension-interfere-with-kfiledialog.diff
new file mode 100644
index 0000000..9ce7a75
--- /dev/null
+++ b/patches/dont-let-autoextension-interfere-with-kfiledialog.diff
@@ -0,0 +1,30 @@
+From c921fc0ae2b20de1953e7558fce6b9ddb94c56d3 Mon Sep 17 00:00:00 2001
+From: Luboš Luňák <l.lunak@suse.cz>
+Date: Wed, 01 Aug 2012 09:11:44 +0000
+Subject: do not let LO's autoextension handling interfere with KFileDialog's(fdo#52546)
+
+Change-Id: I73263a74d7b9bbf4a99e86773854e69f747e19d5
+Signed-off-by: Tomas Chvatal <tchvatal@suse.cz>
+---
+diff --git a/vcl/unx/kde4/KDE4FilePicker.cxx b/vcl/unx/kde4/KDE4FilePicker.cxx
+index df08ed7..4917bf7 100644
+--- a/vcl/unx/kde4/KDE4FilePicker.cxx
++++ b/vcl/unx/kde4/KDE4FilePicker.cxx
+@@ -398,9 +398,12 @@ uno::Any SAL_CALL KDE4FilePicker::getValue( sal_Int16 controlId, sal_Int16 )
+ switch (controlId)
+ {
+ case ExtendedFilePickerElementIds::CHECKBOX_AUTOEXTENSION:
+- // we ignore this one and rely on KFileDialog to provide the function,
+- // always return true, here meaning "it's been taken care of"
+- res = uno::Any( true );
++ // We ignore this one and rely on KFileDialog to provide the function.
++ // Always return false, to pretend we do not support this, otherwise
++ // LO core would try to be smart and cut the extension in some places,
++ // interfering with KFileDialog's handling of it. KFileDialog also
++ // saves the value of the setting, so LO core is not needed for that either.
++ res = uno::Any( false );
+ break;
+ case ExtendedFilePickerElementIds::CHECKBOX_PASSWORD:
+ case ExtendedFilePickerElementIds::CHECKBOX_FILTEROPTIONS:
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/patches/series b/patches/series
index de4a1cc..d0bc27c 100644
--- a/patches/series
+++ b/patches/series
@@ -28,3 +28,4 @@ ignore-sc_cellrangesbase-fails.diff
build-dont-run-checks.diff
disable-broken-sdext_pdfimport-cppunit-test-for-now.diff
trying-to-force-CXX0X-off-for-ABI-incompatibility.diff
+dont-let-autoextension-interfere-with-kfiledialog.diff
--
LibreOffice packaging repository
Reply to: