app-office/libreoffice: Drop obsolete 4.4 patches

Package-Manager: portage-2.2.27

7 files changed, 0 insertions, 695 deletions

diff --git a/app-office/libreoffice/files/libreoffice-4.3.5.2-remove-bashisms.patch b/app-office/libreoffice/files/libreoffice-4.3.5.2-remove-bashisms.patch
deleted file mode 100644
index 370b4aaa4e7a..000000000000
--- a/app-office/libreoffice/files/libreoffice-4.3.5.2-remove-bashisms.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From f53e79acd0d42f5c41e1104056af9cf23e9e2e2a Mon Sep 17 00:00:00 2001
-From: "Andreas K. Huettel (dilfridge)" <dilfridge@gentoo.org>
-Date: Sun, 4 Jan 2015 15:33:35 +0100
-Subject: [PATCH] Replace bash-specific code from configure.ac, fixes build for
- sh=dash users
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Original patch by Rémi Cardona <remi@gentoo.org>
-
-Change-Id: I815567df8a868c3997e8ac357b8529fded28c950
-Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=525454
-Reviewed-on: https://gerrit.libreoffice.org/13731
-Reviewed-by: Caolán McNamara <caolanm@redhat.com>
-Tested-by: Caolán McNamara <caolanm@redhat.com>
----
- configure.ac | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 8aa33d0..5dbe640 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -11483,9 +11483,8 @@ test_font_map()
-     FONTFILE_LOWER="$(echo $FONTFILE | $AWK '{print tolower($0)}')"
- 
-     TESTEXPR="'${FONTFILE_LOWER}' = '$(echo $FONT | $AWK '{print tolower($0)}').ttf'"
--    while true ; do
-+    while test "$#" -ge 1 ; do
-         MAPPING="$(echo $1 | $AWK '{print tolower($0)}')"; shift
--        test -n "$MAPPING" || break
-         TESTEXPR="${TESTEXPR} -o '${FONTFILE_LOWER}' = '$MAPPING-regular.ttf'"
-     done
-     if test $TESTEXPR
--- 
-2.3.0
-
diff --git a/app-office/libreoffice/files/libreoffice-4.4.0.3-telepathy-build-fix.patch b/app-office/libreoffice/files/libreoffice-4.4.0.3-telepathy-build-fix.patch
deleted file mode 100644
index 2833385a1adf..000000000000
--- a/app-office/libreoffice/files/libreoffice-4.4.0.3-telepathy-build-fix.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 623b38fa5769f8cdec10b54b2a600bc4c4e077e6 Mon Sep 17 00:00:00 2001
-From: David Tardon <dtardon@redhat.com>
-Date: Sun, 11 Jan 2015 13:08:37 +0100
-Subject: OSL_ENSURE was not declared in this scope
-
-Change-Id: I426c0feee7b76fe02473e07fa209a61967af3e99
-
-diff --git a/tubes/source/conference.cxx b/tubes/source/conference.cxx
-index 86986fc..df4a63f 100644
---- a/tubes/source/conference.cxx
-+++ b/tubes/source/conference.cxx
-@@ -248,7 +248,7 @@ static void channel_closed_cb( TpChannel *channel, gpointer user_data, GObject *
- 
- void TeleConference::setChannel( TpAccount *pAccount, TpDBusTubeChannel* pChannel )
- {
--    OSL_ENSURE( !mpChannel, "TeleConference::setChannel: already have channel");
-+    SAL_WARN_IF( mpChannel, "tubes", "TeleConference::setChannel: already have channel");
-     if (mpChannel)
-         g_object_unref( mpChannel);
-     if (mpAccount)
-@@ -297,7 +297,7 @@ bool TeleConference::offerTube()
- {
-     INFO_LOGGER( "TeleConference::offerTube");
- 
--    OSL_ENSURE( mpChannel, "TeleConference::offerTube: no channel");
-+    SAL_WARN_IF( !mpChannel, "tubes", "TeleConference::offerTube: no channel");
-     if (!mpChannel)
-         return false;
- 
-@@ -319,7 +319,7 @@ bool TeleConference::setTube( GDBusConnection* pTube)
- {
-     INFO_LOGGER( "TeleConference::setTube");
- 
--    OSL_ENSURE( !pImpl->mpTube, "TeleConference::setTube: already tubed");
-+    SAL_WARN_IF( pImpl->mpTube, "tubes", "TeleConference::setTube: already tubed");
- 
-     pImpl->mpTube = pTube;
- 
--- 
-cgit v0.10.2
diff --git a/app-office/libreoffice/files/libreoffice-4.4.1.2-add-kde4-open-url-script.patch b/app-office/libreoffice/files/libreoffice-4.4.1.2-add-kde4-open-url-script.patch
deleted file mode 100644
index d4c4d28bbca1..000000000000
--- a/app-office/libreoffice/files/libreoffice-4.4.1.2-add-kde4-open-url-script.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From f7db2461292be3e23f5b3af47e488eaa8105d8db Mon Sep 17 00:00:00 2001
-From: Jan-Marek Glogowski <glogow@fbihome.de>
-Date: Wed, 26 Nov 2014 13:35:42 +0100
-Subject: Add kde4-open-url script
-
-Adds a KDE4 specific URL processing script.
-
-Change-Id: I0116fa95f076a5772e88c616e93de542fe4fe4e4
-
-diff --git a/shell/Package_scripts_kde.mk b/shell/Package_scripts_kde.mk
-index c5e4978..162bcc5 100644
---- a/shell/Package_scripts_kde.mk
-+++ b/shell/Package_scripts_kde.mk
-@@ -9,6 +9,12 @@
- 
- $(eval $(call gb_Package_Package,shell_scripts_kde,$(SRCDIR)/shell/source/unix/misc))
- 
-+ifeq ($(ENABLE_KDE),TRUE)
- $(eval $(call gb_Package_add_file,shell_scripts_kde,$(LIBO_BIN_FOLDER)/kde-open-url,kde-open-url.sh))
-+endif
-+
-+ifeq ($(ENABLE_KDE4),TRUE)
-+$(eval $(call gb_Package_add_file,shell_scripts_kde,$(LIBO_BIN_FOLDER)/kde4-open-url,kde4-open-url.sh))
-+endif
- 
- # vim: set shiftwidth=4 tabstop=4 noexpandtab:
-diff --git a/shell/source/unix/misc/kde4-open-url.sh b/shell/source/unix/misc/kde4-open-url.sh
-new file mode 100755
-index 0000000..e5b8125
---- /dev/null
-+++ b/shell/source/unix/misc/kde4-open-url.sh
-@@ -0,0 +1,22 @@
-+#!/bin/sh
-+#
-+# This file is part of the LibreOffice project.
-+#
-+# This Source Code Form is subject to the terms of the Mozilla Public
-+# License, v. 2.0. If a copy of the MPL was not distributed with this
-+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-+#
-+# This file incorporates work covered by the following license notice:
-+#
-+#   Licensed to the Apache Software Foundation (ASF) under one or more
-+#   contributor license agreements. See the NOTICE file distributed
-+#   with this work for additional information regarding copyright
-+#   ownership. The ASF licenses this file to you under the Apache
-+#   License, Version 2.0 (the "License"); you may not use this file
-+#   except in compliance with the License. You may obtain a copy of
-+#   the License at http://www.apache.org/licenses/LICENSE-2.0 .
-+#
-+
-+# use kde-open or xdg-open if available, falling back to our own open-url
-+kde-open "$1" 2>/dev/null || xdg-open "$1" 2>/dev/null || `dirname "$0"`/open-url "$1" 2>/dev/null
-+exit 0
--- 
-cgit v0.10.2
diff --git a/app-office/libreoffice/files/libreoffice-4.4.4.3-cleanup-IsNativeControlSupported.patch b/app-office/libreoffice/files/libreoffice-4.4.4.3-cleanup-IsNativeControlSupported.patch
deleted file mode 100644
index 7cb33b98fd32..000000000000
--- a/app-office/libreoffice/files/libreoffice-4.4.4.3-cleanup-IsNativeControlSupported.patch
+++ /dev/null
@@ -1,212 +0,0 @@
-Merged upstream commits:
-
-88e16529fc7b0e312b68e38295348c93b437aad8	"tdf#92110 KDE4: cleanup IsNativeControlSupported"
-57792314c7b05f71c66834ee47bfaa09003df765	"tdf#92115 KDE4: better listbox theming"
-
-
-diff -u b/vcl/unx/kde4/KDESalGraphics.cxx b/vcl/unx/kde4/KDESalGraphics.cxx
---- b/vcl/unx/kde4/KDESalGraphics.cxx
-+++ b/vcl/unx/kde4/KDESalGraphics.cxx
-@@ -85,47 +85,43 @@
- 
- bool KDESalGraphics::IsNativeControlSupported( ControlType type, ControlPart part )
- {
--    if (type == CTRL_PUSHBUTTON) return true;
--
--    if (type == CTRL_MENUBAR) return true;
--
--    if (type == CTRL_MENU_POPUP) return true;
--
--    if (type == CTRL_EDITBOX) return true;
--
--    if (type == CTRL_COMBOBOX) return true;
--
--    if (type == CTRL_TOOLBAR) return true;
--
--    if (type == CTRL_CHECKBOX) return true;
--
--    if (type == CTRL_LISTBOX) return true;
--
--    if (type == CTRL_LISTNODE) return true;
--
--    if (type == CTRL_FRAME) return true;
--
--    if (type == CTRL_SCROLLBAR) return true;
--
--    if (type == CTRL_WINDOW_BACKGROUND) return true;
--
--    if (type == CTRL_SPINBOX && (part == PART_ENTIRE_CONTROL || part == HAS_BACKGROUND_TEXTURE) ) return true;
--
--    // no spinbuttons for KDE, paint spinbox complete
--    //if (type == CTRL_SPINBUTTONS) return true;
--
--    if (type == CTRL_GROUPBOX) return true;
--
--    if (type == CTRL_FIXEDLINE) return true;
--
--    if (type == CTRL_TOOLTIP) return true;
-+    switch (type)
-+    {
-+        case CTRL_PUSHBUTTON:
-+        case CTRL_RADIOBUTTON:
-+        case CTRL_CHECKBOX:
-+        case CTRL_TOOLTIP:
-+        case CTRL_PROGRESS:
-+        case CTRL_LISTNODE:
-+            return (part == PART_ENTIRE_CONTROL);
-+
-+        case CTRL_MENUBAR:
-+        case CTRL_MENU_POPUP:
-+        case CTRL_EDITBOX:
-+        case CTRL_COMBOBOX:
-+        case CTRL_TOOLBAR:
-+        case CTRL_FRAME:
-+        case CTRL_SCROLLBAR:
-+        case CTRL_WINDOW_BACKGROUND:
-+        case CTRL_GROUPBOX:
-+        case CTRL_FIXEDLINE:
-+            return true;
-+
-+        case CTRL_LISTBOX:
-+            return (part == PART_ENTIRE_CONTROL
-+                 || part == PART_SUB_EDIT
-+                 || part == PART_WINDOW
-+                 || part == PART_BUTTON_DOWN);
- 
--    if (type == CTRL_RADIOBUTTON) return true;
-+        case CTRL_SPINBOX:
-+            return (part == PART_ENTIRE_CONTROL || part == HAS_BACKGROUND_TEXTURE);
- 
--    if (type == CTRL_SLIDER && (part == PART_TRACK_HORZ_AREA || part == PART_TRACK_VERT_AREA) )
--        return true;
-+        case CTRL_SLIDER:
-+            return (part == PART_TRACK_HORZ_AREA || part == PART_TRACK_VERT_AREA);
- 
--    if ( (type == CTRL_PROGRESS) && (part == PART_ENTIRE_CONTROL) ) return true;
-+        default:
-+            break;
-+    }
- 
-     return false;
- }
-@@ -221,15 +217,15 @@
-                                         const ImplControlValue& value,
-                                         const OUString& )
- {
--    if( lastPopupRect.isValid() && ( type != CTRL_MENU_POPUP || part != PART_MENU_ITEM ))
--        lastPopupRect = QRect();
--
--    // put not implemented types here
--    if (type == CTRL_SPINBUTTONS)
--    {
-+    bool nativeSupport = IsNativeControlSupported( type, part );
-+    if( ! nativeSupport ) {
-+        assert( ! nativeSupport && "drawNativeControl called without native support!" );
-         return false;
-     }
- 
-+    if( lastPopupRect.isValid() && ( type != CTRL_MENU_POPUP || part != PART_MENU_ITEM ))
-+        lastPopupRect = QRect();
-+
-     bool returnVal = true;
- 
-     QRect widgetRect = region2QRect(rControlRegion);
-@@ -414,24 +410,26 @@
-     }
-     else if (type == CTRL_LISTBOX)
-     {
--        if( part == PART_WINDOW )
--        {
--            lcl_drawFrame( QStyle::PE_Frame, m_image,
--                           vclStateValue2StateFlag(nControlState, value) );
--        }
--        else
--        {
--            QStyleOptionComboBox option;
--            if (part == PART_SUB_EDIT)
--            {
-+        QStyleOptionComboBox option;
-+        switch (part) {
-+            case PART_WINDOW:
-+                lcl_drawFrame( QStyle::PE_Frame, m_image,
-+                               vclStateValue2StateFlag(nControlState, value) );
-+                break;
-+            case PART_SUB_EDIT:
-                 draw( QStyle::CE_ComboBoxLabel, &option, m_image,
-                       vclStateValue2StateFlag(nControlState, value) );
--            }
--            else
--            {
-+                break;
-+            case PART_ENTIRE_CONTROL:
-+                draw( QStyle::CC_ComboBox, &option, m_image,
-+                      vclStateValue2StateFlag(nControlState, value) );
-+                break;
-+            case PART_BUTTON_DOWN:
-+                m_image->fill( Qt::transparent );
-+                option.subControls = QStyle::SC_ComboBoxArrow;
-                 draw( QStyle::CC_ComboBox, &option, m_image,
-                       vclStateValue2StateFlag(nControlState, value) );
--            }
-+                break;
-         }
-     }
-     else if (type == CTRL_LISTNODE)
-@@ -652,6 +650,12 @@
-                                              const OUString&,
-                                              Rectangle &nativeBoundingRegion, Rectangle &nativeContentRegion )
- {
-+    bool nativeSupport = IsNativeControlSupported( type, part );
-+    if( ! nativeSupport ) {
-+        assert( ! nativeSupport && "drawNativeControl called without native support!" );
-+        return false;
-+    }
-+
-     bool retVal = false;
- 
-     QRect boundingRect = region2QRect( controlRegion );
-@@ -733,8 +737,6 @@
-             {
-                 case PART_ENTIRE_CONTROL:
-                 {
--                    int size = QApplication::style()->pixelMetric(QStyle::PM_ComboBoxFrameWidth) - 2;
--
-                     // find out the minimum size that should be used
-                     // assume contents is a text ling
-                     int nHeight = QApplication::fontMetrics().height();
-@@ -747,8 +749,10 @@
-                     // FIXME: why this difference between comboboxes and listboxes ?
-                     // because a combobox has a sub edit and that is positioned
-                     // inside the outer bordered control ?
--                    if( type == CTRL_COMBOBOX )
-+                    if( type == CTRL_COMBOBOX ) {
-+                        int size = QApplication::style()->pixelMetric(QStyle::PM_ComboBoxFrameWidth) - 2;
-                         contentRect.adjust(-size,-size,size,size);
-+                    }
-                     retVal = true;
-                     break;
-                 }
-@@ -761,13 +765,22 @@
-                     retVal = true;
-                     break;
-                 case PART_SUB_EDIT:
-+                {
-                     contentRect = QApplication::style()->subControlRect(
-                         QStyle::CC_ComboBox, &cbo, QStyle::SC_ComboBoxEditField );
- 
--                    contentRect.translate( boundingRect.left(), boundingRect.top() );
-+                    int hmargin = QApplication::style()->pixelMetric(
-+                            QStyle::PM_FocusFrameHMargin, &styleOption);
-+                    int vmargin = QApplication::style()->pixelMetric(
-+                            QStyle::PM_FocusFrameVMargin, &styleOption);
-+
-+                    contentRect.translate( boundingRect.left() + hmargin, boundingRect.top() + vmargin );
-+                    contentRect.adjust( 0, 0, -2 * hmargin, -2 * vmargin );
-+                    boundingRect = contentRect;
- 
-                     retVal = true;
-                     break;
-+                }
-                 case PART_WINDOW:
-                     retVal = true;
-                     break;
diff --git a/app-office/libreoffice/files/libreoffice-4.4.4.3-fix-KDE4-FileDialog.patch b/app-office/libreoffice/files/libreoffice-4.4.4.3-fix-KDE4-FileDialog.patch
deleted file mode 100644
index 2247781443bd..000000000000
--- a/app-office/libreoffice/files/libreoffice-4.4.4.3-fix-KDE4-FileDialog.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From e7352d5ada69f212dc813c4cbd257d036e7a27c8 Mon Sep 17 00:00:00 2001
-From: Juergen Funk <juergen.funk_ml@cib.de>
-Date: Fri, 3 Jul 2015 08:33:03 +0200
-Subject: tdf#92517 KDE4-FileDialog: "Save as" has wrong Filter
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Fixing follow
- - The order of calling: first should be set the filter, after
-   that can be set the current filter
- - change the function from "setCurrentFilter" to "setCurrentItem"
-   When you set the filter over "setCurrentFilter" you need the full
-   search string "extention|description" e.g. "*.docx|Microsoft Word.."
- - Not need the escape of slash (with that can not find
-   "Microsoft Word 2007/2010 XML (.docx))"
-
-Change-Id: Ie4f7d6fd619b391487ee944c3e745c855600ee54
-Reviewed-on: https://gerrit.libreoffice.org/16721
-Tested-by: Jenkins <ci@libreoffice.org>
-Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>
-(cherry picked from commit a93cfd5afb9072de00fc4b2a070f23ebdad6e4fe)
-Reviewed-on: https://gerrit.libreoffice.org/16890
-Reviewed-by: Caolán McNamara <caolanm@redhat.com>
-Tested-by: Caolán McNamara <caolanm@redhat.com>
-
-diff --git a/vcl/unx/kde4/KDE4FilePicker.cxx b/vcl/unx/kde4/KDE4FilePicker.cxx
-index 4615bd4..a638955 100644
---- a/vcl/unx/kde4/KDE4FilePicker.cxx
-+++ b/vcl/unx/kde4/KDE4FilePicker.cxx
-@@ -250,6 +250,10 @@ sal_Int16 SAL_CALL KDE4FilePicker::execute()
- 
-     _dialog->clearFilter();
-     _dialog->setFilter(_filter);
-+
-+    if(!_currentFilter.isNull())
-+        _dialog->filterWidget()->setCurrentItem(_currentFilter);
-+
-     _dialog->filterWidget()->setEditable(false);
- 
-     VCLKDEApplication::preDialogSetup();
-@@ -384,9 +388,7 @@ void SAL_CALL KDE4FilePicker::setCurrentFilter( const OUString &title )
-         return Q_EMIT setCurrentFilterSignal( title );
-     }
- 
--    QString t = toQString(title);
--    t.replace("/", "\\/");
--    _dialog->filterWidget()->setCurrentFilter(t);
-+    _currentFilter = toQString(title);
- }
- 
- OUString SAL_CALL KDE4FilePicker::getCurrentFilter()
-@@ -633,6 +635,7 @@ void SAL_CALL KDE4FilePicker::initialize( const uno::Sequence<uno::Any> &args )
-     }
- 
-     _filter.clear();
-+    _currentFilter.clear();
- 
-     // parameter checking
-     uno::Any arg;
-diff --git a/vcl/unx/kde4/KDE4FilePicker.hxx b/vcl/unx/kde4/KDE4FilePicker.hxx
-index 98e9af6..ff3a8602 100644
---- a/vcl/unx/kde4/KDE4FilePicker.hxx
-+++ b/vcl/unx/kde4/KDE4FilePicker.hxx
-@@ -66,6 +66,8 @@ protected:
- 
-     //running filter string to add to dialog
-     QString _filter;
-+    // string to set the current filter
-+    QString _currentFilter;
- 
-     //mapping of SAL control ID's to created custom controls
-     QHash<sal_Int16, QWidget*> _customWidgets;
--- 
-cgit v0.10.2
-
diff --git a/app-office/libreoffice/files/libreoffice-4.4.4.3-improve-KDE4FilePicker.patch b/app-office/libreoffice/files/libreoffice-4.4.4.3-improve-KDE4FilePicker.patch
deleted file mode 100644
index d0350e489697..000000000000
--- a/app-office/libreoffice/files/libreoffice-4.4.4.3-improve-KDE4FilePicker.patch
+++ /dev/null
@@ -1,193 +0,0 @@
-Merged upstream commits:
-
-6fc55b9abd783b624241d56e34751ea495adbd7d	"KDE4: actually apply file dialog operation mode"
-b613270a730ace29dd1b16b29be2222b34f34a5d	"KDE4: improve default load and save dialog titles"
-2b999dd6da5a90db66afe852a007fab8c62ffaec	"vcl: kde4: loplugin:staticmethods"
-3e8c14df67a43d3088ed7df0a2b0d96a4bc42d57	"tdf#92353 FileSave: Not confirmed for overwrite a file (unix)"
-
-
-diff -u b/vcl/unx/kde4/KDE4FilePicker.cxx b/vcl/unx/kde4/KDE4FilePicker.cxx
---- b/vcl/unx/kde4/KDE4FilePicker.cxx
-+++ b/vcl/unx/kde4/KDE4FilePicker.cxx
-@@ -58,6 +58,8 @@
- 
- #include "generic/geninst.h"
- 
-+#include "svids.hrc"
-+
- using namespace ::com::sun::star;
- using namespace ::com::sun::star::ui::dialogs;
- using namespace ::com::sun::star::ui::dialogs::TemplateDescription;
-@@ -109,7 +111,6 @@
- 
- KDE4FilePicker::KDE4FilePicker( const uno::Reference<uno::XComponentContext>& )
-     : KDE4FilePicker_Base(_helperMutex)
--    , _resMgr( ResMgr::CreateResMgr("fps_office") )
-     , allowRemoteUrls( false )
- {
-     _extraControls = new QWidget();
-@@ -128,8 +129,6 @@
- #endif
- 
-     setMultiSelectionMode( false );
--    //default mode
--    _dialog->setOperationMode(KFileDialog::Opening);
- 
-     // XExecutableDialog functions
-     connect( this, SIGNAL( setTitleSignal( const OUString & ) ),
-@@ -202,7 +201,6 @@
-         SalYieldMutexReleaser aReleaser;
-         return Q_EMIT cleanupProxySignal();
-     }
--    delete _resMgr;
-     delete _dialog;
- }
- 
-@@ -524,6 +522,24 @@
-     return toOUString(label);
- }
- 
-+QString KDE4FilePicker::getResString( sal_Int16 aRedId )
-+{
-+    QString aResString;
-+
-+    if( aRedId < 0 )
-+        return aResString;
-+
-+    try
-+    {
-+        aResString = toQString(ResId(aRedId, *ImplGetResMgr()).toString());
-+    }
-+    catch(...)
-+    {
-+    }
-+
-+    return aResString.replace('~', '&');
-+}
-+
- void KDE4FilePicker::addCustomControl(sal_Int16 controlId)
- {
-     QWidget* widget = 0;
-@@ -532,37 +548,37 @@
-     switch (controlId)
-     {
-         case CHECKBOX_AUTOEXTENSION:
--            resId = STR_SVT_FILEPICKER_AUTO_EXTENSION;
-+            resId = STR_FPICKER_AUTO_EXTENSION;
-             break;
-         case CHECKBOX_PASSWORD:
--            resId = STR_SVT_FILEPICKER_PASSWORD;
-+            resId = STR_FPICKER_PASSWORD;
-             break;
-         case CHECKBOX_FILTEROPTIONS:
--            resId = STR_SVT_FILEPICKER_FILTER_OPTIONS;
-+            resId = STR_FPICKER_FILTER_OPTIONS;
-             break;
-         case CHECKBOX_READONLY:
--            resId = STR_SVT_FILEPICKER_READONLY;
-+            resId = STR_FPICKER_READONLY;
-             break;
-         case CHECKBOX_LINK:
--            resId = STR_SVT_FILEPICKER_INSERT_AS_LINK;
-+            resId = STR_FPICKER_INSERT_AS_LINK;
-             break;
-         case CHECKBOX_PREVIEW:
--            resId = STR_SVT_FILEPICKER_SHOW_PREVIEW;
-+            resId = STR_FPICKER_SHOW_PREVIEW;
-             break;
-         case CHECKBOX_SELECTION:
--            resId = STR_SVT_FILEPICKER_SELECTION;
-+            resId = STR_FPICKER_SELECTION;
-             break;
-         case PUSHBUTTON_PLAY:
--            resId = STR_SVT_FILEPICKER_PLAY;
-+            resId = STR_FPICKER_PLAY;
-             break;
-         case LISTBOX_VERSION:
--            resId = STR_SVT_FILEPICKER_VERSION;
-+            resId = STR_FPICKER_VERSION;
-             break;
-         case LISTBOX_TEMPLATE:
--            resId = STR_SVT_FILEPICKER_TEMPLATES;
-+            resId = STR_FPICKER_TEMPLATES;
-             break;
-         case LISTBOX_IMAGE_TEMPLATE:
--            resId = STR_SVT_FILEPICKER_IMAGE_TEMPLATE;
-+            resId = STR_FPICKER_IMAGE_TEMPLATE;
-             break;
-         case LISTBOX_VERSION_LABEL:
-         case LISTBOX_TEMPLATE_LABEL:
-@@ -581,16 +597,7 @@
-         case CHECKBOX_PREVIEW:
-         case CHECKBOX_SELECTION:
-         {
--            QString label;
--
--            if (_resMgr && resId != -1)
--            {
--                OUString s(ResId(resId, *_resMgr).toString());
--                label = toQString(s);
--                label.replace("~", "&");
--            }
--
--            widget = new QCheckBox(label, _extraControls);
-+            widget = new QCheckBox(getResString(resId), _extraControls);
- 
-             // the checkbox is created even for CHECKBOX_AUTOEXTENSION to simplify
-             // code, but the checkbox is hidden and ignored
-@@ -719,8 +726,23 @@
-                     1 );
-     }
- 
--    _dialog->setOperationMode(operationMode);
--    _dialog->setConfirmOverwrite(true);
-+    _dialog->setOperationMode( operationMode );
-+
-+    sal_Int16 resId = -1;
-+    switch (_dialog->operationMode())
-+    {
-+    case KFileDialog::Opening:
-+        resId = STR_FPICKER_OPEN;
-+        break;
-+    case KFileDialog::Saving:
-+        resId = STR_FPICKER_SAVE;
-+        _dialog->setConfirmOverwrite( true );
-+        break;
-+    default:
-+        break;
-+    }
-+
-+    _dialog->setCaption(getResString(resId));
- }
- 
- void SAL_CALL KDE4FilePicker::cancel()
-diff -u b/vcl/unx/kde4/KDE4FilePicker.hxx b/vcl/unx/kde4/KDE4FilePicker.hxx
---- b/vcl/unx/kde4/KDE4FilePicker.hxx
-+++ b/vcl/unx/kde4/KDE4FilePicker.hxx
-@@ -41,8 +41,6 @@
- class QWidget;
- class QLayout;
- 
--class ResMgr;
--
- typedef ::cppu::WeakComponentImplHelper5
- <   ::com::sun::star::ui::dialogs::XFilePicker2
- ,   ::com::sun::star::ui::dialogs::XFilePicker3
-@@ -61,8 +59,6 @@
- 
-     ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XFilePickerListener > m_xListener;
- 
--    ResMgr *_resMgr;
--
-     //the dialog to display
-     KFileDialog* _dialog;
- 
-@@ -225,6 +221,8 @@
-     //add a custom control widget to the file dialog
-     void addCustomControl(sal_Int16 controlId);
- 
-+    static QString getResString( sal_Int16 aRedId );
-+
- private Q_SLOTS:
-     void cleanupProxy();
-     void checkProtocol();
diff --git a/app-office/libreoffice/files/libreoffice-4.4.5.2-fix-KDE4-listbox-regression.patch b/app-office/libreoffice/files/libreoffice-4.4.5.2-fix-KDE4-listbox-regression.patch
deleted file mode 100644
index f4ee9859c2b3..000000000000
--- a/app-office/libreoffice/files/libreoffice-4.4.5.2-fix-KDE4-listbox-regression.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From ef126328c3ad35d51395abc461c3d64429f91c26 Mon Sep 17 00:00:00 2001
-From: Jan-Marek Glogowski <glogow@fbihome.de>
-Date: Thu, 30 Jul 2015 18:10:03 +0200
-Subject: tdf#92903 KDE4: fix listbox regression from 92115
-
-So at least in case of the CTRL_LISTBOX, getNativeControlRegion is
-called for a type and part unsupported by IsNativeControlSupported.
-
-For whatever reason, this results in broken listboxes drawn in
-Base's "Table Design" dialog, when selecting "field type", which
-draws the listbox on top of the cell.
-
-To make it worse, it seems the listbox is actually drawn to a
-smaller space then the actual requirement. Appearently it seems to
-use the content rect, instead of the bounding rect.
-
-So in addition to fixing the drawing, this patch increases the
-listbox bounding rect, which looks too large in normal dialogs, but
-makes the Base's listbox better readable.
-
-Change-Id: I112ec038fd20ad33facd260d16b5d68b508d2bd0
-Reviewed-on: https://gerrit.libreoffice.org/17438
-Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>
-Tested-by: Katarina Behrens <Katarina.Behrens@cib.de>
-
-diff --git a/vcl/unx/kde4/KDESalGraphics.cxx b/vcl/unx/kde4/KDESalGraphics.cxx
-index 3e79e1e..eeb741f 100644
---- a/vcl/unx/kde4/KDESalGraphics.cxx
-+++ b/vcl/unx/kde4/KDESalGraphics.cxx
-@@ -108,10 +108,7 @@ bool KDESalGraphics::IsNativeControlSupported( ControlType type, ControlPart par
-             return true;
- 
-         case CTRL_LISTBOX:
--            return (part == PART_ENTIRE_CONTROL
--                 || part == PART_SUB_EDIT
--                 || part == PART_WINDOW
--                 || part == PART_BUTTON_DOWN);
-+            return (part == PART_ENTIRE_CONTROL || part == HAS_BACKGROUND_TEXTURE);
- 
-         case CTRL_SPINBOX:
-             return (part == PART_ENTIRE_CONTROL || part == HAS_BACKGROUND_TEXTURE);
-@@ -650,12 +647,6 @@ bool KDESalGraphics::getNativeControlRegion( ControlType type, ControlPart part,
-                                              const OUString&,
-                                              Rectangle &nativeBoundingRegion, Rectangle &nativeContentRegion )
- {
--    bool nativeSupport = IsNativeControlSupported( type, part );
--    if( ! nativeSupport ) {
--        assert( ! nativeSupport && "drawNativeControl called without native support!" );
--        return false;
--    }
--
-     bool retVal = false;
- 
-     QRect boundingRect = region2QRect( controlRegion );
-@@ -753,6 +744,14 @@ bool KDESalGraphics::getNativeControlRegion( ControlType type, ControlPart part,
-                         int size = QApplication::style()->pixelMetric(QStyle::PM_ComboBoxFrameWidth) - 2;
-                         contentRect.adjust(-size,-size,size,size);
-                     }
-+                    else {
-+                        int hmargin = QApplication::style()->pixelMetric(
-+                                QStyle::PM_FocusFrameHMargin, &styleOption);
-+                        int vmargin = QApplication::style()->pixelMetric(
-+                                QStyle::PM_FocusFrameVMargin, &styleOption);
-+                        boundingRect.translate( -hmargin, -vmargin );
-+                        boundingRect.adjust( -hmargin, -vmargin, 2 * hmargin, 2 * vmargin );
-+                    }
-                     retVal = true;
-                     break;
-                 }
-@@ -776,7 +775,6 @@ bool KDESalGraphics::getNativeControlRegion( ControlType type, ControlPart part,
- 
-                     contentRect.translate( boundingRect.left() + hmargin, boundingRect.top() + vmargin );
-                     contentRect.adjust( 0, 0, -2 * hmargin, -2 * vmargin );
--                    boundingRect = contentRect;
- 
-                     retVal = true;
-                     break;
--- 
-cgit v0.10.2
-