/[gentoo-x86]/app-office/libreoffice/files/libreoffice-3.6.0-kde-fpicker.patch
Gentoo

Contents of /app-office/libreoffice/files/libreoffice-3.6.0-kde-fpicker.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1.2 - (show annotations) (download)
Fri Aug 31 14:08:52 2012 UTC (19 months, 2 weeks ago) by scarabeus
Branch: MAIN
CVS Tags: HEAD
Changes since 1.1: +0 -0 lines
FILE REMOVED
Version bump to 3.6.1. Drop older. Stabilise 3.5.6 on amd64 x86 and ppc. Remove live 3.5 branch ebuild.

(Portage version: 2.2.0_alpha123/cvs/Linux x86_64)

1 From c921fc0ae2b20de1953e7558fce6b9ddb94c56d3 Mon Sep 17 00:00:00 2001
2 From: Luboš Luňák <l.lunak@suse.cz>
3 Date: Wed, 01 Aug 2012 09:11:44 +0000
4 Subject: do not let LO's autoextension handling interfere with KFileDialog's(fdo#52546)
5
6 Change-Id: I73263a74d7b9bbf4a99e86773854e69f747e19d5
7 Signed-off-by: Tomas Chvatal <tchvatal@suse.cz>
8 ---
9 diff --git a/vcl/unx/kde4/KDE4FilePicker.cxx b/vcl/unx/kde4/KDE4FilePicker.cxx
10 index df08ed7..4917bf7 100644
11 --- a/vcl/unx/kde4/KDE4FilePicker.cxx
12 +++ b/vcl/unx/kde4/KDE4FilePicker.cxx
13 @@ -398,9 +398,12 @@ uno::Any SAL_CALL KDE4FilePicker::getValue( sal_Int16 controlId, sal_Int16 )
14 switch (controlId)
15 {
16 case ExtendedFilePickerElementIds::CHECKBOX_AUTOEXTENSION:
17 - // we ignore this one and rely on KFileDialog to provide the function,
18 - // always return true, here meaning "it's been taken care of"
19 - res = uno::Any( true );
20 + // We ignore this one and rely on KFileDialog to provide the function.
21 + // Always return false, to pretend we do not support this, otherwise
22 + // LO core would try to be smart and cut the extension in some places,
23 + // interfering with KFileDialog's handling of it. KFileDialog also
24 + // saves the value of the setting, so LO core is not needed for that either.
25 + res = uno::Any( false );
26 break;
27 case ExtendedFilePickerElementIds::CHECKBOX_PASSWORD:
28 case ExtendedFilePickerElementIds::CHECKBOX_FILTEROPTIONS:
29 --
30 cgit v0.9.0.2-2-gbebe

  ViewVC Help
Powered by ViewVC 1.1.20