From da8cef67529f4a746327d662c42084e3b1b9a917 Mon Sep 17 00:00:00 2001 From: namso-01 Date: Mon, 17 Aug 2015 22:38:18 +0300 Subject: [PATCH] libreoffice: patch delete --- ...0264-plausible-fix-for-reported-cras.patch | 76 ------- ...87-pasting-into-outline-view-crashes.patch | 48 ----- ...s-detecting-HTML-files-with-.xls-ext.patch | 96 --------- .../0001-disable-firebird-unit-test.patch | 24 --- ...p-useless-test-for-ant-apache-regexp.patch | 71 ------- ...ange-picture-option-by-rightclicking.patch | 78 ------- .../files/0001-fix-linker-error.patch | 35 ---- ...llow-to-export-an-empty-sheet-to-PDF.patch | 29 --- .../0001-scrolling-very-slow-in-calc.patch | 139 ------------- .../libreoffice-4.4.0.3-gcc_4_9_0-2.patch | 91 --------- ...ffice-4.4.1.2-improve-KDE4FilePicker.patch | 192 ------------------ ...fice.org-2.4.0.ooo86080.unopkg.bodge.patch | 47 ----- ...g-3.1.0.oooXXXXX.solenv.allowmissing.patch | 60 ------ 13 files changed, 986 deletions(-) delete mode 100644 office/libreoffice/libreoffice/files/0001-Related-rhbz-1130264-plausible-fix-for-reported-cras.patch delete mode 100644 office/libreoffice/libreoffice/files/0001-Resolves-fdo-81487-pasting-into-outline-view-crashes.patch delete mode 100644 office/libreoffice/libreoffice/files/0001-avoid-problems-detecting-HTML-files-with-.xls-ext.patch delete mode 100644 office/libreoffice/libreoffice/files/0001-disable-firebird-unit-test.patch delete mode 100644 office/libreoffice/libreoffice/files/0001-drop-useless-test-for-ant-apache-regexp.patch delete mode 100644 office/libreoffice/libreoffice/files/0001-fdo-82496-Change-picture-option-by-rightclicking.patch delete mode 100644 office/libreoffice/libreoffice/files/0001-fix-linker-error.patch delete mode 100644 office/libreoffice/libreoffice/files/0001-rhbz-1111216-allow-to-export-an-empty-sheet-to-PDF.patch delete mode 100644 office/libreoffice/libreoffice/files/0001-scrolling-very-slow-in-calc.patch delete mode 100644 office/libreoffice/libreoffice/files/libreoffice-4.4.0.3-gcc_4_9_0-2.patch delete mode 100644 office/libreoffice/libreoffice/files/libreoffice-4.4.1.2-improve-KDE4FilePicker.patch delete mode 100755 office/libreoffice/libreoffice/files/openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch delete mode 100755 office/libreoffice/libreoffice/files/openoffice.org-3.1.0.oooXXXXX.solenv.allowmissing.patch diff --git a/office/libreoffice/libreoffice/files/0001-Related-rhbz-1130264-plausible-fix-for-reported-cras.patch b/office/libreoffice/libreoffice/files/0001-Related-rhbz-1130264-plausible-fix-for-reported-cras.patch deleted file mode 100644 index 9594cc94fd..0000000000 --- a/office/libreoffice/libreoffice/files/0001-Related-rhbz-1130264-plausible-fix-for-reported-cras.patch +++ /dev/null @@ -1,76 +0,0 @@ -From eb21b6827e25b2c943025a662cde2049c0454a6b Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= -Date: Fri, 15 Aug 2014 15:59:58 +0100 -Subject: [PATCH] Related: rhbz#1130264 plausible fix for reported crash - -Change-Id: I4ccdf19bfc7986881f7022109f22f47a0f493591 ---- - avmedia/source/gstreamer/gstplayer.cxx | 20 ++++++++++++++++---- - avmedia/source/gstreamer/gstplayer.hxx | 3 +++ - 2 files changed, 19 insertions(+), 4 deletions(-) - -diff --git a/avmedia/source/gstreamer/gstplayer.cxx b/avmedia/source/gstreamer/gstplayer.cxx -index ceea8e2..836e89e 100644 ---- a/avmedia/source/gstreamer/gstplayer.cxx -+++ b/avmedia/source/gstreamer/gstplayer.cxx -@@ -74,7 +74,9 @@ Player::Player( const uno::Reference< lang::XMultiServiceFactory >& rxMgr ) : - mpXOverlay( NULL ), - mnDuration( 0 ), - mnWidth( 0 ), -- mnHeight( 0 ) -+ mnHeight( 0 ), -+ mnWatchID( 0 ), -+ mbWatchID( false ) - { - // Initialize GStreamer library - int argc = 1; -@@ -127,11 +129,15 @@ void SAL_CALL Player::disposing() - g_object_unref( G_OBJECT ( mpXOverlay ) ); - mpXOverlay = NULL; - } -+ -+ } -+ if (mbWatchID) -+ { -+ g_source_remove(mnWatchID); -+ mbWatchID = false; - } - } - -- -- - static gboolean pipeline_bus_callback( GstBus *, GstMessage *message, gpointer data ) - { - Player* pPlayer = static_cast(data); -@@ -357,7 +363,13 @@ void Player::preparePlaybin( const OUString& rURL, GstElement *pSink ) - g_object_set( G_OBJECT( mpPlaybin ), "uri", ascURL.getStr() , NULL ); - - pBus = gst_element_get_bus( mpPlaybin ); -- gst_bus_add_watch( pBus, pipeline_bus_callback, this ); -+ if (mbWatchID) -+ { -+ g_source_remove(mnWatchID); -+ mbWatchID = false; -+ } -+ mnWatchID = gst_bus_add_watch( pBus, pipeline_bus_callback, this ); -+ mbWatchID = true; - DBG( "%p set sync handler", this ); - #ifdef AVMEDIA_GST_0_10 - gst_bus_set_sync_handler( pBus, pipeline_bus_sync_handler, this ); -diff --git a/avmedia/source/gstreamer/gstplayer.hxx b/avmedia/source/gstreamer/gstplayer.hxx -index 2426eed..33c9e4d 100644 ---- a/avmedia/source/gstreamer/gstplayer.hxx -+++ b/avmedia/source/gstreamer/gstplayer.hxx -@@ -97,6 +97,9 @@ protected: - int mnWidth; - int mnHeight; - -+ guint mnWatchID; -+ bool mbWatchID; -+ - osl::Condition maSizeCondition; - }; - --- -1.9.3 - diff --git a/office/libreoffice/libreoffice/files/0001-Resolves-fdo-81487-pasting-into-outline-view-crashes.patch b/office/libreoffice/libreoffice/files/0001-Resolves-fdo-81487-pasting-into-outline-view-crashes.patch deleted file mode 100644 index 4cbecd542f..0000000000 --- a/office/libreoffice/libreoffice/files/0001-Resolves-fdo-81487-pasting-into-outline-view-crashes.patch +++ /dev/null @@ -1,48 +0,0 @@ -From a5793f5e0013b156600fd718d8f77870a9e73032 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= -Date: Fri, 18 Jul 2014 09:06:44 +0100 -Subject: [PATCH] Resolves: fdo#81487 pasting into outline view crashes impress - -CreateTitleTextObject will call indirectly ImpPageChange which -triggers tools::EventMultiplexerEvent::EID_PAGE_ORDER and so -in outlview.cxx without ignore page changes level in action -the outliner is filled in from the slide contents in -FillOutliner clearing the outliner contents and filling it -fresh, but.. - -a) this hack tower is not prepared for all the outliner -iterators to become invalid -b) the contents of this title object is empty, because -it was just created, and we didn't get a chance to fill -in its text. - -This all works for typing vs pasting because the KeyInput -uses the OutlineViewPageChangesGuard guard which sets the -ignore pages changes bit. - -So, given that OutlineView::UpdateDocument expects -the iterators of the outliner to be valid during -the lifetime of the method lock the full method with -the OutlineViewPageChangesGuard guard - -Change-Id: Iecbf37d54f5f0c5a181be5f27832f769a3d2e389 ---- - sd/source/ui/view/outlview.cxx | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/sd/source/ui/view/outlview.cxx b/sd/source/ui/view/outlview.cxx -index 268a32b..a76bb0b 100644 ---- a/sd/source/ui/view/outlview.cxx -+++ b/sd/source/ui/view/outlview.cxx -@@ -1535,6 +1535,8 @@ void OutlineView::EndModelChange() - /** updates all changes in the outliner model to the draw model */ - void OutlineView::UpdateDocument() - { -+ OutlineViewPageChangesGuard aGuard(this); -+ - const sal_uInt32 nPageCount = mrDoc.GetSdPageCount(PK_STANDARD); - Paragraph* pPara = mrOutliner.GetParagraph( 0 ); - sal_uInt32 nPage; --- -1.9.3 - diff --git a/office/libreoffice/libreoffice/files/0001-avoid-problems-detecting-HTML-files-with-.xls-ext.patch b/office/libreoffice/libreoffice/files/0001-avoid-problems-detecting-HTML-files-with-.xls-ext.patch deleted file mode 100644 index 85ba46252e..0000000000 --- a/office/libreoffice/libreoffice/files/0001-avoid-problems-detecting-HTML-files-with-.xls-ext.patch +++ /dev/null @@ -1,96 +0,0 @@ -From 86c6f18c2766aad43d6e3bfcf3530e40440ebca7 Mon Sep 17 00:00:00 2001 -From: David Tardon -Date: Tue, 8 Jul 2014 17:01:27 +0200 -Subject: [PATCH] avoid problems detecting HTML files with .xls ext. - -Change-Id: I9955223aac20f3f640fde51bb7231666c269ca70 ---- - filter/Configuration_filter.mk | 1 + - filter/source/config/fragments/types/calc_HTML.xcu | 35 ++++++++++++++++++++++ - filter/source/textfilterdetect/filterdetect.cxx | 6 ++-- - 3 files changed, 38 insertions(+), 4 deletions(-) - create mode 100644 filter/source/config/fragments/types/calc_HTML.xcu - -diff --git a/filter/Configuration_filter.mk b/filter/Configuration_filter.mk -index e035464..0465f17 100644 ---- a/filter/Configuration_filter.mk -+++ b/filter/Configuration_filter.mk -@@ -512,6 +512,7 @@ $(call filter_Configuration_add_ui_filters,fcfg_langpack,filter/source/config/fr - $(call filter_Configuration_add_types,fcfg_langpack,fcfg_calc_types.xcu,filter/source/config/fragments/types,\ - calc_DIF \ - calc_ODS_FlatXML \ -+ calc_HTML \ - generic_HTML \ - generic_Text \ - calc_Lotus \ -diff --git a/filter/source/config/fragments/types/calc_HTML.xcu b/filter/source/config/fragments/types/calc_HTML.xcu -new file mode 100644 -index 0000000..51bf8f1 ---- /dev/null -+++ b/filter/source/config/fragments/types/calc_HTML.xcu -@@ -0,0 +1,35 @@ -+ -+ -+ -+ com.sun.star.comp.filters.PlainTextFilterDetect -+ -+ xls -+ text/html -+ false -+ -+ -+ HTML Table -+ -+ -+ -diff --git a/filter/source/textfilterdetect/filterdetect.cxx b/filter/source/textfilterdetect/filterdetect.cxx -index ffad7fa..1d29dd4 100644 ---- a/filter/source/textfilterdetect/filterdetect.cxx -+++ b/filter/source/textfilterdetect/filterdetect.cxx -@@ -132,7 +132,7 @@ OUString SAL_CALL PlainTextFilterDetect::detect(uno::Sequence xInStream(aMediaDesc[MediaDescriptor::PROP_INPUTSTREAM()], uno::UNO_QUERY); - if (!xInStream.is() || !IsHTMLStream(xInStream)) -@@ -141,12 +141,10 @@ OUString SAL_CALL PlainTextFilterDetect::detect(uno::Sequence -Date: Mon, 3 Feb 2014 21:52:11 +0100 -Subject: [PATCH] disable firebird unit test - ---- - dbaccess/Module_dbaccess.mk | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/dbaccess/Module_dbaccess.mk b/dbaccess/Module_dbaccess.mk -index b9d7d56..824f3f5 100644 ---- a/dbaccess/Module_dbaccess.mk -+++ b/dbaccess/Module_dbaccess.mk -@@ -36,7 +36,6 @@ $(eval $(call gb_Module_add_l10n_targets,dbaccess,\ - - ifeq ($(ENABLE_FIREBIRD_SDBC),TRUE) - $(eval $(call gb_Module_add_check_targets,dbaccess,\ -- CppunitTest_dbaccess_firebird_test \ - )) - endif - --- -1.8.4.2 - diff --git a/office/libreoffice/libreoffice/files/0001-drop-useless-test-for-ant-apache-regexp.patch b/office/libreoffice/libreoffice/files/0001-drop-useless-test-for-ant-apache-regexp.patch deleted file mode 100644 index 961915b0bf..0000000000 --- a/office/libreoffice/libreoffice/files/0001-drop-useless-test-for-ant-apache-regexp.patch +++ /dev/null @@ -1,71 +0,0 @@ -From cb6511354b500d1b1bd8ff140fdf0ea106b174d4 Mon Sep 17 00:00:00 2001 -From: David Tardon -Date: Wed, 3 Sep 2014 16:20:40 +0200 -Subject: [PATCH] drop useless test for ant-apache-regexp - -It has not been needed since commit -1de48c417404464ca1e34e5c5d1c82a9342349bb 4 years ago. - -Change-Id: I53ceb5d8d6c02c7a13c86cdd884e4fc378a2c492 ---- - configure.ac | 44 -------------------------------------------- - 1 file changed, 44 deletions(-) - -diff --git a/configure.ac b/configure.ac -index f65ab66..897cb1e 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -12311,50 +12311,6 @@ EOF - AC_MSG_ERROR([no, you need at least Ant >= $ant_minver]) - fi - -- if test "$ENABLE_MEDIAWIKI" = "TRUE"; then -- AC_MSG_CHECKING([whether Ant supports mapper type="regexp"]) -- rm -rf confdir -- mkdir confdir -- cat > conftest.java << EOF -- public class conftest { -- int testmethod(int a, int b) { -- return a + b; -- } -- } --EOF -- -- cat > conftest.xml << EOF -- -- -- -- -- -- -- -- -- -- -- -- -- --EOF -- -- if test "$JAVACISGCJ" = "yes"; then -- JAVA_HOME=; export JAVA_HOME -- ant_gcj="-Dbuild.compiler=gcj" -- fi -- AC_TRY_COMMAND("$ANT" $ant_gcj -buildfile conftest.xml 1>&2) -- if test $? = 0 -a -f ./conftest.class; then -- AC_MSG_RESULT([yes]) -- rm -rf confdir -- else -- echo "configure: Ant test failed" >&5 -- cat conftest.java >&5 -- cat conftest.xml >&5 -- rm -rf confdir -- AC_MSG_ERROR([no. Did you install ant-apache-regexp?]) -- fi -- fi - rm -f conftest* core core.* *.core - fi - --- -1.9.3 - diff --git a/office/libreoffice/libreoffice/files/0001-fdo-82496-Change-picture-option-by-rightclicking.patch b/office/libreoffice/libreoffice/files/0001-fdo-82496-Change-picture-option-by-rightclicking.patch deleted file mode 100644 index 5cbab761a9..0000000000 --- a/office/libreoffice/libreoffice/files/0001-fdo-82496-Change-picture-option-by-rightclicking.patch +++ /dev/null @@ -1,78 +0,0 @@ -From caa08b214542fdf1bed3912b9c4fac36e5d87eb2 Mon Sep 17 00:00:00 2001 -From: Jennifer Liebel -Date: Tue, 2 Sep 2014 12:40:20 +0000 -Subject: [PATCH] fdo#82496: Change picture option by rightclicking - -Change-Id: I31fb1a1f89030610a9d11b9236e8cde22dbc0ca5 ---- - sw/sdi/_grfsh.sdi | 12 ++++++++++++ - sw/source/ui/app/mn.src | 1 + - sw/source/uibase/shells/grfsh.cxx | 3 +-- - 3 files changed, 14 insertions(+), 2 deletions(-) - -diff --git a/sw/sdi/_grfsh.sdi b/sw/sdi/_grfsh.sdi -index 15c00cc..2eb2ab2 100644 ---- a/sw/sdi/_grfsh.sdi -+++ b/sw/sdi/_grfsh.sdi -@@ -62,6 +62,13 @@ interface BaseTextGraphic - DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR"; - ] - -+ SID_CHANGE_PICTURE -+ [ -+ ExecMethod = Execute ; -+ StateMethod = GetAttrState ; -+ DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR"; -+ ] -+ - SID_EXTERNAL_EDIT - [ - ExecMethod = Execute ; -@@ -224,6 +231,11 @@ interface BaseTextGraphic - StateMethod = GetAttrState ; - DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR"; - ] -+ SID_CHANGE_PICTURE -+ [ -+ ExecMethod = FuTemporary ; -+ StateMethod = GetMenuState ; -+ ] - SID_GRFFILTER_SOLARIZE // status(final|play|rec) - [ - ExecMethod = ExecAttr ; -diff --git a/sw/source/ui/app/mn.src b/sw/source/ui/app/mn.src -index f62c8da..79b797d 100644 ---- a/sw/source/ui/app/mn.src -+++ b/sw/source/ui/app/mn.src -@@ -1239,6 +1239,7 @@ Menu MN_GRF_POPUPMENU - MN_FRM_CAPTION_ITEM - SEPARATOR; - MenuItem { ITEM_SAVE_GRAPHIC }; -+ MenuItem { ITEM_CHANGE_PICTURE }; - MenuItem { ITEM_COMPRESS_GRAPHIC }; - MenuItem { ITEM_EXTERNAL_EDIT }; - -diff --git a/sw/source/uibase/shells/grfsh.cxx b/sw/source/uibase/shells/grfsh.cxx -index d5ecec5..0e13b38 100644 ---- a/sw/source/core/uibase/shells/grfsh.cxx -+++ b/sw/source/core/uibase/shells/grfsh.cxx -@@ -178,7 +178,6 @@ void SwGrfShell::Execute(SfxRequest &rReq) - } - } - break; -- - case SID_EXTERNAL_EDIT: - { - // When the graphic is selected to be opened via some external tool -@@ -191,7 +190,7 @@ void SwGrfShell::Execute(SfxRequest &rReq) - } - } - break; -- -+ case SID_CHANGE_PICTURE: - case SID_INSERT_GRAPHIC: - { - // #i123922# implement slot independent from the two below to --- -1.9.3 - diff --git a/office/libreoffice/libreoffice/files/0001-fix-linker-error.patch b/office/libreoffice/libreoffice/files/0001-fix-linker-error.patch deleted file mode 100644 index 9e229180a5..0000000000 --- a/office/libreoffice/libreoffice/files/0001-fix-linker-error.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 63a5f3804578dc185a88b7f88cdbdfc53dde02b4 Mon Sep 17 00:00:00 2001 -From: David Tardon -Date: Wed, 11 Feb 2015 22:56:53 +0100 -Subject: [PATCH] fix linker error - -/builddir/build/BUILD/libreoffice-4.4.1.1/workdir/CxxObject/svtools/source/misc/imageresourceaccess.o: In function `com::sun::star::uno::Reference::Reference(com::sun::star::io::XOutputStream*)': -/builddir/build/BUILD/libreoffice-4.4.1.1/include/com/sun/star/uno/Reference.hxx:137: undefined reference to `non-virtual thunk to utl::OSeekableOutputStreamWrapper::acquire()' - -Change-Id: Ic644a8299cf2f79f02c1e3ca0de9687520f402a9 ---- - include/unotools/streamwrap.hxx | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/include/unotools/streamwrap.hxx b/include/unotools/streamwrap.hxx -index e8027ce..8efc227 100644 ---- a/include/unotools/streamwrap.hxx -+++ b/include/unotools/streamwrap.hxx -@@ -123,12 +123,12 @@ typedef ::cppu::ImplHelper1 < css::io::XSeekable - /** helper class for wrapping an SvStream into an com.sun.star.io::XOutputStream - which is seekable (i.e. supports the com.sun.star.io::XSeekable interface). - */ --class OSeekableOutputStreamWrapper -+class UNOTOOLS_DLLPUBLIC OSeekableOutputStreamWrapper - :public OOutputStreamWrapper - ,public OSeekableOutputStreamWrapper_Base - { - public: -- UNOTOOLS_DLLPUBLIC OSeekableOutputStreamWrapper(SvStream& _rStream); -+ OSeekableOutputStreamWrapper(SvStream& _rStream); - - private: - virtual ~OSeekableOutputStreamWrapper(); --- -2.1.0 - diff --git a/office/libreoffice/libreoffice/files/0001-rhbz-1111216-allow-to-export-an-empty-sheet-to-PDF.patch b/office/libreoffice/libreoffice/files/0001-rhbz-1111216-allow-to-export-an-empty-sheet-to-PDF.patch deleted file mode 100644 index c3c6e86825..0000000000 --- a/office/libreoffice/libreoffice/files/0001-rhbz-1111216-allow-to-export-an-empty-sheet-to-PDF.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 0b793116deaf35ce67245c1106e5ed5a722c7560 Mon Sep 17 00:00:00 2001 -From: David Tardon -Date: Thu, 19 Jun 2014 16:57:03 +0200 -Subject: [PATCH] rhbz#1111216 allow to export an empty sheet to PDF - -This is to consolidate Calc's behaviour with the other applications, -which always present at least one page for printing / PDF export. - -Change-Id: Iedf438618020c1e6d8ded5ac950c8ca2b12ad439 ---- - sc/source/ui/unoobj/docuno.cxx | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx -index 9aeceb7..75cabca 100644 ---- a/sc/source/ui/unoobj/docuno.cxx -+++ b/sc/source/ui/unoobj/docuno.cxx -@@ -958,7 +958,7 @@ sal_Int32 SAL_CALL ScModelObj::getRendererCount(const uno::Any& aSelection, - StringRangeEnumerator aRangeEnum( aPagesStr, 0, nPages-1 ); - nSelectCount = aRangeEnum.size(); - } -- return nSelectCount; -+ return (nSelectCount > 0) ? nSelectCount : 1; - } - - static sal_Int32 lcl_GetRendererNum( sal_Int32 nSelRenderer, const OUString& rPagesStr, sal_Int32 nTotalPages ) --- -1.9.3 - diff --git a/office/libreoffice/libreoffice/files/0001-scrolling-very-slow-in-calc.patch b/office/libreoffice/libreoffice/files/0001-scrolling-very-slow-in-calc.patch deleted file mode 100644 index 30143c3737..0000000000 --- a/office/libreoffice/libreoffice/files/0001-scrolling-very-slow-in-calc.patch +++ /dev/null @@ -1,139 +0,0 @@ -From 52ac64848e41c6c3bba86c98361757aaf89ef3c6 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= -Date: Tue, 15 Jul 2014 16:42:42 +0100 -Subject: [PATCH] scrolling very slow in calc - -even on a short spreadsheet scrolling up and down leaves -the first/last row (depending on the direction of scroll) -unchanged until the scrolling stops. - -http://people.freedesktop.org/~mst/calc_4.2_scrolling.webm - -On larger document there are rendering artifacts during scrolling which go away -after scrolling for me and mstahl, but a bunch of people can show us piles of -horribly broken spreadsheets after scrolling, esp wheel scrolling - -Revert "fdo#75026: Sometimes we need to update grid view... - -while not being active." - -This reverts commit 52cc88d6191ba0c4b6477e5c4b9c5d0f0228030d. - -Revert "fdo#68961: Check visible range during scrolling, and re-paint if necessary." - -This reverts commit e36c8a674845ab19577fc06d44b780549757e1e7. - -Revert "Repaint grid view when the visible area changes." - -This reverts commit b54c1a53b4d400b1c2d282c186af1fa8f151894e. - -Conflicts: - sc/source/ui/app/scmod.cxx - -Revert "Update visible ranges when updating the scroll bars." - -This reverts commit 391a57ef65687f2e373bac8d410e551aafa780ec. - -Change-Id: Ie170308cba18a9a74c7c72daf07dfa0a4ef7bd13 ---- - sc/source/ui/inc/tabview.hxx | 6 ------ - sc/source/ui/view/gridwin4.cxx | 2 ++ - sc/source/ui/view/tabview.cxx | 4 ---- - sc/source/ui/view/tabview3.cxx | 10 ---------- - sc/source/ui/view/tabview4.cxx | 7 ++++++- - 5 files changed, 8 insertions(+), 21 deletions(-) - -diff --git a/sc/source/ui/inc/tabview.hxx b/sc/source/ui/inc/tabview.hxx -index a5d7392..891af9e 100644 ---- a/sc/source/ui/inc/tabview.hxx -+++ b/sc/source/ui/inc/tabview.hxx -@@ -204,12 +204,6 @@ private: - - void PaintRangeFinderEntry (ScRangeFindData* pData, SCTAB nTab); - -- /** -- * Check the visible grid area to see if the visible range has changed. If -- * so, update the stored visible range, and re-paint the grid area. -- */ -- void UpdateGrid(); -- - protected: - void UpdateHeaderWidth( const ScVSplitPos* pWhich = NULL, - const SCROW* pPosY = NULL ); -diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx -index fa697ee5..a60fb82 100644 ---- a/sc/source/ui/view/gridwin4.cxx -+++ b/sc/source/ui/view/gridwin4.cxx -@@ -390,6 +390,8 @@ void ScGridWindow::Draw( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, ScUpdateMod - - OSL_ENSURE( ValidCol(nX2) && ValidRow(nY2), "GridWin Draw Bereich zu gross" ); - -+ UpdateVisibleRange(); -+ - if (nX2 < maVisibleRange.mnCol1 || nY2 < maVisibleRange.mnRow1) - return; - // unsichtbar -diff --git a/sc/source/ui/view/tabview.cxx b/sc/source/ui/view/tabview.cxx -index aafd114..02b99b9 100644 ---- a/sc/source/ui/view/tabview.cxx -+++ b/sc/source/ui/view/tabview.cxx -@@ -1198,8 +1198,6 @@ void ScTabView::ScrollX( long nDeltaX, ScHSplitPos eWhich, bool bUpdBars ) - if (pColOutline[eWhich]) pColOutline[eWhich]->ScrollPixel( nDiff ); - if (bUpdBars) - UpdateScrollBars(); -- else -- UpdateGrid(); - } - - if (nDeltaX==1 || nDeltaX==-1) -@@ -1285,8 +1283,6 @@ void ScTabView::ScrollY( long nDeltaY, ScVSplitPos eWhich, bool bUpdBars ) - if (pRowOutline[eWhich]) pRowOutline[eWhich]->ScrollPixel( nDiff ); - if (bUpdBars) - UpdateScrollBars(); -- else -- UpdateGrid(); - } - - if (nDeltaY==1 || nDeltaY==-1) -diff --git a/sc/source/ui/view/tabview3.cxx b/sc/source/ui/view/tabview3.cxx -index 7053037..50066ba 100644 ---- a/sc/source/ui/view/tabview3.cxx -+++ b/sc/source/ui/view/tabview3.cxx -@@ -2089,16 +2089,6 @@ void ScTabView::PaintRangeFinderEntry (ScRangeFindData* pData, const SCTAB nTab) - } - } - --void ScTabView::UpdateGrid() --{ -- if (!UpdateVisibleRange()) -- // Visible range hasn't changed. No need to re-paint. -- return; -- -- SC_MOD()->AnythingChanged(); // if visible area has changed -- PaintGrid(); --} -- - void ScTabView::PaintRangeFinder( long nNumber ) - { - ScInputHandler* pHdl = SC_MOD()->GetInputHdl( aViewData.GetViewShell() ); -diff --git a/sc/source/ui/view/tabview4.cxx b/sc/source/ui/view/tabview4.cxx -index 2f72a20..8528431 100644 ---- a/sc/source/ui/view/tabview4.cxx -+++ b/sc/source/ui/view/tabview4.cxx -@@ -421,7 +421,12 @@ void ScTabView::UpdateScrollBars() - } - - // set visible area for online spelling -- UpdateGrid(); -+ -+ if ( aViewData.IsActive() ) -+ { -+ if (UpdateVisibleRange()) -+ SC_MOD()->AnythingChanged(); // if visible area has changed -+ } - } - - #ifndef HDR_SLIDERSIZE --- -1.9.3 - diff --git a/office/libreoffice/libreoffice/files/libreoffice-4.4.0.3-gcc_4_9_0-2.patch b/office/libreoffice/libreoffice/files/libreoffice-4.4.0.3-gcc_4_9_0-2.patch deleted file mode 100644 index a93bf02184..0000000000 --- a/office/libreoffice/libreoffice/files/libreoffice-4.4.0.3-gcc_4_9_0-2.patch +++ /dev/null @@ -1,91 +0,0 @@ -Submitted By: Ken Moffat - new version: Fernando de Oliveira -Date: 2015-02-17 -Initial Package Version: 4.4.0.3 -Upstream Status: Fixed -Origin: Upstream -URL: http://lists.freedesktop.org/archives/libreoffice-commits/2015-February/092644.html -Description: Let libreoffice compile with gcc-4.9.0 -Comment: Included text part of the commit below - - -commit 0e4b1d2127957459b79f41a96f1fa0061d399b3b -Author: Michael Stahl -Date: Sat Feb 14 00:17:06 2015 +0100 - - 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 - Tested-by: Miklos Vajna - -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) - { diff --git a/office/libreoffice/libreoffice/files/libreoffice-4.4.1.2-improve-KDE4FilePicker.patch b/office/libreoffice/libreoffice/files/libreoffice-4.4.1.2-improve-KDE4FilePicker.patch deleted file mode 100644 index 61e036eec1..0000000000 --- a/office/libreoffice/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& ) - : 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(); diff --git a/office/libreoffice/libreoffice/files/openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch b/office/libreoffice/libreoffice/files/openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch deleted file mode 100755 index b5a7ff7e83..0000000000 --- a/office/libreoffice/libreoffice/files/openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch +++ /dev/null @@ -1,47 +0,0 @@ ---- openoffice.org.orig/desktop/scripts/unopkg.sh 2008-01-14 15:55:26.000000000 +0000 -+++ openoffice.org/desktop/scripts/unopkg.sh 2008-02-14 10:52:10.000000000 +0000 -@@ -62,6 +62,33 @@ - ;; - esac - -+isnotuser=0 -+for arg in $@ -+do -+if [ "$arg" = "--shared" -o "$arg" = "--bundled" ]; then -+ isnotuser=1 -+fi -+done -+if [ $isnotuser -eq 1 ]; then -+ echo $@ | grep -q env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY -+ if [ $? -ne 0 ]; then -+ set -- $@ '-env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1' -+ fi -+ echo $@ | grep -q env:UNO_JAVA_JFW_INSTALL_DATA -+ if [ $? -ne 0 -a -w $sd_prog/../share/config/javasettingsunopkginstall.xml ]; then -+ set -- $@ '-env:UNO_JAVA_JFW_INSTALL_DATA=$$ORIGIN/../share/config/javasettingsunopkginstall.xml' -+ fi -+ echo $@ | grep -q env:UserInstallation -+ if [ $? -ne 0 ]; then -+ INSTDIR=`/bin/mktemp -d --tmpdir unoinstall.XXXXXX` -+ if [ $? -ne 0 ]; then -+ echo "Could not create tmp dir" >&2 -+ exit 1 -+ fi -+ set -- $@ '-env:UserInstallation=file://'$INSTDIR -+ fi -+fi -+ - #collect all bootstrap variables specified on the command line - #so that they can be passed as arguments to javaldx later on - for arg in $@ -@@ -110,6 +137,8 @@ - # SAL_NO_XINITTHREADS=true; export SAL_NO_XINITTHREADS - - # execute binary --exec "$sd_prog/unopkg.bin" "$@" \ -+"$sd_prog/unopkg.bin" "$@" \ - "-env:INIFILENAME=vnd.sun.star.pathname:$sd_prog/redirectrc" -- -+if [ -n "$INSTDIR" ]; then -+ rm -rf $INSTDIR -+fi diff --git a/office/libreoffice/libreoffice/files/openoffice.org-3.1.0.oooXXXXX.solenv.allowmissing.patch b/office/libreoffice/libreoffice/files/openoffice.org-3.1.0.oooXXXXX.solenv.allowmissing.patch deleted file mode 100755 index 06410546c9..0000000000 --- a/office/libreoffice/libreoffice/files/openoffice.org-3.1.0.oooXXXXX.solenv.allowmissing.patch +++ /dev/null @@ -1,60 +0,0 @@ -Index: bin/modules/installer/scriptitems.pm -=================================================================== -RCS file: /cvs/tools/solenv/bin/modules/installer/scriptitems.pm,v -retrieving revision 1.17 -diff -u -p -r1.17 scriptitems.pm ---- openoffice.org.orig/solenv/bin/modules/installer/scriptitems.pm 24 Feb 2005 16:21:15 -0000 1.17 -+++ openoffice.org/solenv/bin/modules/installer/scriptitems.pm 18 Mar 2005 22:39:42 -0000 -@@ -1356,11 +1356,10 @@ - - if ( ! $installer::globals::languagepack && !$installer::globals::helppack) - { -- $infoline = "ERROR: Removing file $filename from file list.\n"; -+ $infoline = "WARNING: Removing file $filename from file list.\n"; - push( @installer::globals::logfileinfo, $infoline); - -- push(@missingfiles, "ERROR: File not found: $filename\n"); -- $error_occurred = 1; -+ push(@missingfiles, "WARNING: File not found: $filename\n"); - - next; # removing this file from list, if sourcepath is empty - } -@@ -1368,11 +1367,10 @@ - { - if (( $onefile->{'ismultilingual'} ) || ( $styles =~ /\bFORCELANGUAGEPACK\b/ )) - { -- $infoline = "ERROR: Removing file $filename from file list.\n"; -+ $infoline = "WARNING: Removing file $filename from file list.\n"; - push( @installer::globals::logfileinfo, $infoline); - -- push(@missingfiles, "ERROR: File not found: $filename\n"); -- $error_occurred = 1; -+ push(@missingfiles, "WARNING: File not found: $filename\n"); - - next; # removing this file from list, if sourcepath is empty - } -@@ -1390,11 +1388,10 @@ - { - if (( $onefile->{'ismultilingual'} ) || ( $styles =~ /\bFORCEHELPPACK\b/ )) - { -- $infoline = "ERROR: Removing file $filename from file list.\n"; -+ $infoline = "WARNING: Removing file $filename from file list.\n"; - push( @installer::globals::logfileinfo, $infoline); - -- push(@missingfiles, "ERROR: File not found: $filename\n"); -- $error_occurred = 1; -+ push(@missingfiles, "WARNING: File not found: $filename\n"); - - next; # removing this file from list, if sourcepath is empty - } ---- openoffice.org.orig/solenv/bin/modules/installer/simplepackage.pm 2010-07-12 10:27:26.000000000 +0100 -+++ openoffice.org/solenv/bin/modules/installer/simplepackage.pm 2010-07-12 10:27:54.000000000 +0100 -@@ -53,7 +53,7 @@ - ( $installer::globals::packageformat eq "archive" )) - { - $installer::globals::is_simple_packager_project = 1; -- $installer::globals::patch_user_dir = 1; -+ $installer::globals::patch_user_dir = 1; - } - elsif( $installer::globals::packageformat eq "dmg" ) - {