From ee80ddd579ca78def642afabafc9bedb05473a7d Mon Sep 17 00:00:00 2001 From: David Tardon Date: Fri, 11 May 2012 08:13:51 +0200 Subject: [PATCH] Resolves: rhbz#820439 KDE export dialog broken for most formats --- ...-twice-it-confuses-KFileDialog-rhbz-.patch | 30 +++++++++++++++++++ libreoffice.spec | 7 ++++- 2 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 0001-do-not-prepend-n-twice-it-confuses-KFileDialog-rhbz-.patch diff --git a/0001-do-not-prepend-n-twice-it-confuses-KFileDialog-rhbz-.patch b/0001-do-not-prepend-n-twice-it-confuses-KFileDialog-rhbz-.patch new file mode 100644 index 0000000..626a97c --- /dev/null +++ b/0001-do-not-prepend-n-twice-it-confuses-KFileDialog-rhbz-.patch @@ -0,0 +1,30 @@ +From 5df9e10d27a071f878ed160f99129a7f3c34f5ed Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Lubo=C5=A1=20Lu=C5=88=C3=A1k?= +Date: Thu, 10 May 2012 18:29:12 +0200 +Subject: [PATCH] do not prepend \n twice, it confuses KFileDialog + (rhbz#820439) + +Draw -> Export -> filetype combo was broken. + +Change-Id: I9349749274498d5834dd63e73f3856434b1ab8d9 +--- + vcl/unx/kde4/KDE4FilePicker.cxx | 3 --- + 1 files changed, 0 insertions(+), 3 deletions(-) + +diff --git a/fpicker/source/unx/kde4/KDE4FilePicker.cxx b/fpicker/source/unx/kde4/KDE4FilePicker.cxx +index 140af9c..3537bfe 100644 +--- a/fpicker/source/unx/kde4/KDE4FilePicker.cxx ++++ b/fpicker/source/unx/kde4/KDE4FilePicker.cxx +@@ -342,9 +342,6 @@ rtl::OUString SAL_CALL KDE4FilePicker::getCurrentFilter() + void SAL_CALL KDE4FilePicker::appendFilterGroup( const rtl::OUString& , const uno::Sequence& filters) + throw( lang::IllegalArgumentException, uno::RuntimeException ) + { +- if (!_filter.isNull()) +- _filter.append(QString("\n")); +- + const sal_uInt16 length = filters.getLength(); + for (sal_uInt16 i = 0; i < length; ++i) + { +-- +1.7.7.6 + diff --git a/libreoffice.spec b/libreoffice.spec index 85e0563..74a198f 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -35,7 +35,7 @@ Summary: Free Software Productivity Suite Name: libreoffice Epoch: 1 Version: %{libo_version}.2 -Release: 3%{?dist} +Release: 4%{?dist} License: (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and Artistic Group: Applications/Productivity URL: http://www.documentfoundation.org/develop @@ -145,6 +145,7 @@ Patch31: 0001-save-register-arguments-first.patch Patch32: 0001-do-not-let-gcc-use-registers-we-are-setting-ourselve.patch Patch33: 0001-wrong-types-used-here-breaks-64bit-bigendian.patch Patch34: 0001-Resolves-rhbz-805743-a11y-call-doShow-after-we-have-.patch +Patch35: 0001-do-not-prepend-n-twice-it-confuses-KFileDialog-rhbz-.patch %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} %define instdir %{_libdir} @@ -1006,6 +1007,7 @@ mv -f redhat.soc extras/source/palettes/standard.soc %patch32 -p1 -b .do-not-let-gcc-use-registers-we-are-setting-ourselve.patch %patch33 -p1 -b .wrong-types-used-here-breaks-64bit-bigendian.patch %patch34 -p1 -b .rhbz-805743-a11y-call-doShow-after-we-have-.patch +%patch35 -p1 -b .do-not-prepend-n-twice-it-confuses-KFileDialog-rhbz-.patch # TODO: check this # these are horribly incomplete--empty translations and copied english @@ -2293,6 +2295,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || : %endif %changelog +* Fri May 11 2012 David Tardon - 3.5.3.2-4 +- Resolves: rhbz#820439 KDE export dialog broken for most formats + * Wed May 09 2012 Caolán McNamara - 3.5.3.2-3 - Resolves: rhbz#805743 a11y crash in impress/draw - Resolves: rhbz#813202 opengl slide transitions still a bit