summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas K. Huettel (dilfridge) <dilfridge@gentoo.org>2015-11-28 01:11:47 +0100
committerAndreas K. Huettel (dilfridge) <dilfridge@gentoo.org>2015-11-28 01:11:47 +0100
commitbc39edf16bae36a38856a164a2aac92fc80f579a (patch)
treef5e4d105dfd14806c6e8f54507eb2f8526b43b9d /app-office/libreoffice/files
parentx11-libs/libqxt: shorten DESCRIPTION to make repoman happy (diff)
downloadgentoo-bc39edf16bae36a38856a164a2aac92fc80f579a.tar.gz
gentoo-bc39edf16bae36a38856a164a2aac92fc80f579a.tar.bz2
gentoo-bc39edf16bae36a38856a164a2aac92fc80f579a.zip
app-office/libreoffice: Remove old
Package-Manager: portage-2.2.25
Diffstat (limited to 'app-office/libreoffice/files')
-rw-r--r--app-office/libreoffice/files/libreoffice-4.4.0.3-gcc-4.9-Os-link-failure.patch80
-rw-r--r--app-office/libreoffice/files/libreoffice-4.4.1.2-improve-KDE4FilePicker.patch192
2 files changed, 0 insertions, 272 deletions
diff --git a/app-office/libreoffice/files/libreoffice-4.4.0.3-gcc-4.9-Os-link-failure.patch b/app-office/libreoffice/files/libreoffice-4.4.0.3-gcc-4.9-Os-link-failure.patch
deleted file mode 100644
index 0f39688e5ea8..000000000000
--- a/app-office/libreoffice/files/libreoffice-4.4.0.3-gcc-4.9-Os-link-failure.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From 0e4b1d2127957459b79f41a96f1fa0061d399b3b Mon Sep 17 00:00:00 2001
-From: Michael Stahl <mstahl@redhat.com>
-Date: Sat, 14 Feb 2015 00:17:06 +0100
-Subject: tdf#78174: toolkit: work around GCC 4.9 -Os link failure
-
-A build with gcc (GCC) 4.9.2 20141101 (Red Hat 4.9.2-1) for 32-bit x86
-fails because of these undefined symbols:
-
-> nm --demangle workdir/CxxObject/svx/source/fmcomp/fmgridif.o | grep
- \\bWindowListenerMultiplexer::acquire
- U non-virtual thunk to WindowListenerMultiplexer::acquire()
-
-They should probably be generated inline. Work around by out-lining the
-definition of the methods.
-
-https://gcc.gnu.org/bugzilla/show_bug.cgi?id=64812
-
-Change-Id: I318f7c39bdf1243be385bc6dc0a47862b22e92c5
-(cherry picked from commit 6b3aa0fe4094e87290bd33a30bd6cd99ee78ce38)
-Reviewed-on: https://gerrit.libreoffice.org/14509
-Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
-Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
-
-diff --git a/include/toolkit/helper/macros.hxx b/include/toolkit/helper/macros.hxx
-index e048e75..b212dff 100644
---- a/include/toolkit/helper/macros.hxx
-+++ b/include/toolkit/helper/macros.hxx
-@@ -112,8 +112,8 @@ class ClassName : public ListenerMultiplexerBase, public InterfaceName \
- public: \
- ClassName( ::cppu::OWeakObject& rSource ); \
- ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; \
-- void SAL_CALL acquire() throw() SAL_OVERRIDE { ListenerMultiplexerBase::acquire(); } \
-- void SAL_CALL release() throw() SAL_OVERRIDE { ListenerMultiplexerBase::release(); } \
-+ void SAL_CALL acquire() throw() SAL_OVERRIDE; \
-+ void SAL_CALL release() throw() SAL_OVERRIDE; \
- void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-
-
-@@ -124,8 +124,8 @@ class TOOLKIT_DLLPUBLIC ClassName : public ListenerMultiplexerBase, public Inter
- public: \
- ClassName( ::cppu::OWeakObject& rSource ); \
- ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; \
-- void SAL_CALL acquire() throw() SAL_OVERRIDE { ListenerMultiplexerBase::acquire(); } \
-- void SAL_CALL release() throw() SAL_OVERRIDE { ListenerMultiplexerBase::release(); } \
-+ void SAL_CALL acquire() throw() SAL_OVERRIDE; \
-+ void SAL_CALL release() throw() SAL_OVERRIDE; \
- void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-
-
-@@ -140,6 +140,8 @@ ClassName::ClassName( ::cppu::OWeakObject& rSource ) \
- : ListenerMultiplexerBase( rSource ) \
- { \
- } \
-+void SAL_CALL ClassName::acquire() throw() { ListenerMultiplexerBase::acquire(); } \
-+void SAL_CALL ClassName::release() throw() { ListenerMultiplexerBase::release(); } \
- ::com::sun::star::uno::Any ClassName::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) \
- { \
- ::com::sun::star::uno::Any aRet = ::cppu::queryInterface( rType, \
-diff --git a/toolkit/source/helper/listenermultiplexer.cxx b/toolkit/source/helper/listenermultiplexer.cxx
-index 797fad2..b109c5f 100644
---- a/toolkit/source/helper/listenermultiplexer.cxx
-+++ b/toolkit/source/helper/listenermultiplexer.cxx
-@@ -47,6 +47,15 @@ EventListenerMultiplexer::EventListenerMultiplexer( ::cppu::OWeakObject& rSource
- {
- }
-
-+void SAL_CALL EventListenerMultiplexer::acquire() throw ()
-+{
-+ return ListenerMultiplexerBase::acquire();
-+}
-+void SAL_CALL EventListenerMultiplexer::release() throw ()
-+{
-+ return ListenerMultiplexerBase::release();
-+}
-+
- // ::com::sun::star::uno::XInterface
- ::com::sun::star::uno::Any EventListenerMultiplexer::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception)
- {
---
-cgit v0.10.2
diff --git a/app-office/libreoffice/files/libreoffice-4.4.1.2-improve-KDE4FilePicker.patch b/app-office/libreoffice/files/libreoffice-4.4.1.2-improve-KDE4FilePicker.patch
deleted file mode 100644
index 61e036eec1ce..000000000000
--- a/app-office/libreoffice/files/libreoffice-4.4.1.2-improve-KDE4FilePicker.patch
+++ /dev/null
@@ -1,192 +0,0 @@
-Merged upstream commits:
-
-6fc55b9abd783b624241d56e34751ea495adbd7d "KDE4: actually apply file dialog operation mode"
-b613270a730ace29dd1b16b29be2222b34f34a5d "KDE4: improve default load and save dialog titles"
-
-
-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,7 @@
- #endif
-
- setMultiSelectionMode( false );
-- //default mode
-- _dialog->setOperationMode(KFileDialog::Opening);
-+ _dialog->setConfirmOverwrite( true );
-
- // XExecutableDialog functions
- connect( this, SIGNAL( setTitleSignal( const OUString & ) ),
-@@ -202,7 +202,6 @@
- SalYieldMutexReleaser aReleaser;
- return Q_EMIT cleanupProxySignal();
- }
-- delete _resMgr;
- delete _dialog;
- }
-
-@@ -524,6 +523,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 +549,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 +598,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 +727,22 @@
- 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;
-+ break;
-+ default:
-+ break;
-+ }
-+
-+ _dialog->setCaption(getResString(resId));
- }
-
- void SAL_CALL KDE4FilePicker::cancel()
-only in patch2:
-unchanged:
---- a/vcl/unx/kde4/KDE4FilePicker.hxx
-+++ b/vcl/unx/kde4/KDE4FilePicker.hxx
-@@ -41,8 +41,6 @@ class KFileDialog;
- 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 @@ protected:
-
- ::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 @@ private:
- //add a custom control widget to the file dialog
- void addCustomControl(sal_Int16 controlId);
-
-+ QString getResString( sal_Int16 aRedId );
-+
- private Q_SLOTS:
- void cleanupProxy();
- void checkProtocol();