Accepting request 899602 from LibreOffice:Factory

OBS-URL: https://build.opensuse.org/request/show/899602
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libreoffice?expand=0&rev=229

bsc1184961.patch

@@ -1,42 +0,0 @@
-From 9fed7b07af44792012028eb57900640a5ee833cb Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
-Date: Tue, 4 May 2021 09:15:25 +0100
-Subject: [PATCH] tdf#141930 document set as unmodified if editengine didn't
- modify on keyevent
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-this appears to have always happened for cursor keys, and since
-
-commit 0154f04e8c64df937b793c73ac58d553637f324f
-Author: Caolán McNamara <caolanm@redhat.com>
-Date:   Wed Feb 24 14:32:21 2021 +0000
-
-    Resolves: rhbz#1931423 start update timer in IM events as well as keyevents
-
-also happens on Input Engine events which don't cause changes
-
-Change-Id: Ic5cdd9ef4f1bed1cc2b2c17fc847f196a9c6e23a
-Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115055
-Tested-by: Jenkins
-Reviewed-by: Caolán McNamara <caolanm@redhat.com>
----
- starmath/source/edit.cxx | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-Index: libreoffice-7.1.3.2/starmath/source/edit.cxx
-===================================================================
---- libreoffice-7.1.3.2.orig/starmath/source/edit.cxx
-+++ libreoffice-7.1.3.2/starmath/source/edit.cxx
-@@ -513,8 +513,8 @@ void SmEditWindow::UserPossiblyChangedTe
-     // cursor travelling and such things...
-     SmDocShell *pDocShell = GetDoc();
-     EditEngine *pEditEngine = GetEditEngine();
--    if (pDocShell && pEditEngine)
--        pDocShell->SetModified(pEditEngine->IsModified());
-+    if (pDocShell && pEditEngine && pEditEngine->IsModified())
-+        pDocShell->SetModified(true);
-     aModifyIdle.Start();
- }
- 

bsc1185797.patch

@@ -0,0 +1,72 @@
+From db6efbaf5f9d6ae818afccec6a9fab219268b621 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Toma=C5=BE=20Vajngerl?= <tomaz.vajngerl@collabora.co.uk>
+Date: Sun, 6 Jun 2021 20:55:28 +0900
+Subject: [PATCH] tdf#142478 fix crash when searching and a viewshell change
+ occurs
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+When searching a impress document for a word, and the word is in
+notes as welll as in the document, a crash happens (only when
+searching with "find all"). The regressing commit changed that the
+search is now bound to a view (and to a viewshell). When searching
+for words in notes and document, at the transition from "standard"
+to "notes" page kind mode, the view and viewshells are destroyed
+and the new one created again. The problem lies here as when we
+destroy the viewshell, we also destroy the search context and
+FuSearch objects, but we are still executing the search -> crash.
+
+The solution for this is that when we change the page kind,
+we take the FuSearch object from the old viewshell and put it
+into the newly created viewshell, so that we keep the FuSearch
+object alive and don't throw away the search context too.
+
+Change-Id: I50931cca2a20c5704f7450e3cc8b3466af4c5a3e
+Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116758
+Tested-by: Jenkins
+Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
+(cherry picked from commit 3b75f9add7ed80e803b0771d86892d6ca0f47e71)
+Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116703
+Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
+---
+ sd/source/ui/view/Outliner.cxx | 12 +++++++++++-
+ 1 file changed, 11 insertions(+), 1 deletion(-)
+
+diff --git a/sd/source/ui/view/Outliner.cxx b/sd/source/ui/view/Outliner.cxx
+index 59e740b4bda1..70df0bd17bfe 100644
+--- a/sd/source/ui/view/Outliner.cxx
++++ b/sd/source/ui/view/Outliner.cxx
+@@ -61,6 +61,7 @@
+ #include <comphelper/lok.hxx>
+ #include <comphelper/scopeguard.hxx>
+ #include <VectorGraphicSearchContext.hxx>
++#include <fusearch.hxx>
+ 
+ using namespace ::com::sun::star;
+ using namespace ::com::sun::star::uno;
+@@ -1550,6 +1551,11 @@ void SdOutliner::SetViewMode (PageKind ePageKind)
+     bool bMatchMayExist = mbMatchMayExist;
+ 
+     sd::ViewShellBase& rBase = pViewShell->GetViewShellBase();
++
++    rtl::Reference<sd::FuSearch> xFuSearch;
++    if (pViewShell->GetView())
++        xFuSearch = pViewShell->GetView()->getSearchContext().getFunctionSearch();
++
+     SetViewShell(std::shared_ptr<sd::ViewShell>());
+     sd::framework::FrameworkHelper::Instance(rBase)->RequestView(
+         sViewURL,
+@@ -1560,7 +1566,11 @@ void SdOutliner::SetViewMode (PageKind ePageKind)
+     // instead.  But that would involve major restructuring of the
+     // Outliner code.
+     sd::framework::FrameworkHelper::Instance(rBase)->RequestSynchronousUpdate();
+-    SetViewShell(rBase.GetMainViewShell());
++
++    auto pNewViewShell = rBase.GetMainViewShell();
++    SetViewShell(pNewViewShell);
++    if (xFuSearch.is() && pNewViewShell->GetView())
++        pNewViewShell->GetView()->getSearchContext().setSearchFunction(xFuSearch);
+ 
+     // Switching to another view shell has intermediatly called
+     // EndSpelling().  A PrepareSpelling() is pending, so call that now.

libreoffice-7.1.3.2.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:35af7fd104b253704f770a205f835aee0e82ccc889ebf0949a89d9b3276229bf
-size 244104432

libreoffice-7.1.3.2.tar.xz.asc

@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmCJmd0ACgkQ9DSh76/u
-rqOeHQ/9EWVwuLTeEzTp4C1QmD/azlT4Y/DSyfTJ3nnTFtReHpXLDeqRfeFSE2sh
-33v+tvAN6BOQkWV8YwkMG0AECuQjGgM+rUADSibosbJMStSxIUswY/lqqYzUl6w4
-+L2Yk28XyaxPcE5izKh7fPXLhg0KeyePkNE+RQcoKQP3QXWFIRM/Sb6cMx8NzyMH
-1iow3FLeyylzrDJaP+wbg639myrAWph85xFLMaeCyTrUXaMuTOUZ0LjpeCbY8MQz
-NbwYKNr3QrrTOVI3UmT5g4/DT/hncsI9KFQkB9I8rVqtonBr+RZSK1SunuelKx0r
-0hu1NmAjwm1Rv+H1C2L/Qi/ZUpkgnC605VkS5RSmgzl74rd4veh6+KdeTQKhjDnn
-UzDlpXVEo1soWH3qqyQMtsJGUYVvB9EiC5JL4YGvrBJMQ25xJ5GbhU0HoBYITY9M
-ngUFwGgj2DpFRQCbIItSDJkJ3IjLzyIFm5ZfsH4QTB8JAFsez3LAQMymUBryhlkp
-uhN53DVFqoiWazx2Yqbt4lbHTiFS9HLwb95YyfLPdomV0Ng9iIsHeGYwYUAPcNSh
-S3AJvhM62ZyKIIZfOa+vk6NBGAlNnhqUOK9qdFC/v7Jyqr3iZS/zEFRWfldJcEkC
-9/HV9E5mjDOCPd61IlGmVDB2HJt5v8CLldIBmgg+IkgFKqOmH+Y=
-=c9zE
------END PGP SIGNATURE-----

libreoffice-7.1.4.2.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:758466369f30c933595b62d0fc50b3f9b9827b436c4e119ac147654f2d9c5acb
+size 244336900

libreoffice-7.1.4.2.tar.xz.asc

@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmC6P68ACgkQ9DSh76/u
+rqM+wQ//bYdawPTV38Kr3ySvo9qnj7SO7t2hMv8KsbY94HCryfZymXA7N0AYbkZq
+u1GbXtIPIh2KmHp3R857XiqlEyVom/ErfGyXDuXk1Q7QcD7S47UUmvqpj2flPWjq
+rdZbrugTLjr3dS9xQq9U+p5OjmnjcT1ycSqlhGwe/KALzW93Q1HOJDIIM1KHN+xE
+eVwT1HZpwH6oA0VUvGhd8vqFipyLmPypeyJz69i9wdKNv2eKmkbmOnzoMTHdrYY1
+tLPIBMfDGfdiEQtoIGeI0iwVdcSQ4aD69UQek280BL2o8D8PDKniSUkszpqf7tKv
+GjZs84y5V1kuT3mnTHiPVjv3j9yySTJbr2D/zD7RXwgAdoiuJDMtsGqJbbYX6U2+
+MtdatHCQZUXVV5mmMeHCoItwbDAtrcbOQpecZUlJNt/VfK1yiscKcEYgrDaC9zXa
+C78X81u2wo68wpfAD5NXA3ZkgKNngb+8/xdgEpUHJ7/QNwWWEYNIyQtI/uSDz52E
+gVKsYPfvak+eJzaOZRUpV5APNm6E6fT4Uma9ocojQ0g66OT/4mlz16g3DoIyj+vx
+GehjI1f/LtMlW3nI1YPue187A0rAQ3IFUQbZyf0+oxNaQMc1W6xAMHPFYHQG9JcS
+KCQ6HTcXLi15vmsi/1IhSNOxljBrKlJ1vZsXptgc2k6t34AgduM=
+=+4JZ
+-----END PGP SIGNATURE-----

libreoffice-help-7.1.3.2.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e0f14b4db1585506761ad2ceeb43850cb594f2ec8a20fc9ca7bcb95e77408935
-size 111785416

libreoffice-help-7.1.3.2.tar.xz.asc

@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmCJmeQACgkQ9DSh76/u
-rqO7Hg//QG0EMbDa6CQL0gPfGDjp4PIbV8//wPVIwvBJPqd5lgzFh3xQfWUHO7h1
-N/1CQ2fHeqrkp+LTRqjghxn0ShNbWD6xILjPDpjNfC+eoD2MRLJuxni55Xzj6i6X
-Y1vagDf80Vc2fHH0/a2nNndSV2UuVCvyLsdnQMgzHTtaSnGt0DBHnCYm3P4clb7r
-pOEXSF/pRuTvRzzGHMhXaTQ6AfneBLkc9GIOOOa/elmR+J7GH8KyjAGLX7367hx+
-Fq8OXFXRcpQPBk/UfwHKF6PadLSp+ilruEiop7uSiuwdIiSAvnfmCegga74Y6MZr
-PxcaTVl4m8opve7QzIg70K2dnQMexj5cITUUYuyiP6EoxrYftPN27C9LVZib1QL7
-AsLK50fSn+GDAEiVVmpwlfpxJvK7z8H6cT5hrQSEZCOHKsrSo/Vcn7vtbxMwf/p9
-lC+XJjju8Ord7S0FeUdUHbcpJ9gy652s0KsVR4cRq9V71QJKln0tthZW1UxmyLri
-B0QbIrFPG4Vz1XTJWB3bd3SGdxnNrEU+wbnh1D2sMlwUYoUZDoYRwp1vu3sxrawb
-QLvigaIxAxJcMRCnvtzaufUkWrU/cLS+2RY2rt3H1pX9cMbuCyzAjGSQt8rHAwdD
-w/8QgXC1PITBdVABlxvtEaUSk+YGHSLDBFRviU3hIFjhX5jVJds=
-=3/LI
------END PGP SIGNATURE-----

libreoffice-help-7.1.4.2.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:185173047be42e7f696eac2610d0dd7d433663addf070546d8fbf58943853e24
+size 111785284

libreoffice-help-7.1.4.2.tar.xz.asc

@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmC6P7QACgkQ9DSh76/u
+rqPeLhAAoJUSk1qhZEDJgYPxSW76Nfmdcvkl64PFglLP6x/Ewr0U9Y2v/J4vduoo
+BOyFtwrQ4yXTDdkJj0ZSSFgkZhokLIQ7FvIyiMbKxsGZLjadUrBdMnolVwHrD7hH
+1jB3P5P73EO4yVnBIYKTJiSlx9W+Jbd99AcXsCn5wlevYYTOb+aH16z0VLONxF9I
+MMDFINfnOSbKBqFdkrbEDQC8N8I7zOwqUevLV/RBTJirUZjhnGLFtJeTeMKFzGf5
+x3dKL2xSl0TgDpeSeOcrG5uHqM4qJDqFpaXOQiNbgQ++2YvRCy3I05TNnDf+tjJu
+PVRLWZvTcN9Yz8L0c0zNM/xEw+CVxAzQdLaIUohi3fTjfkExDxYSWLlzvSKgIyqV
+RORV791awrgGCS/h6GFDHmtUuNbPHYYlwlVbhQDMwMLVRkN53BoWel96hb2bKIaL
+kvxBFvhORedHRiDXC1BdZ5Kk6kG1VlX44nxut6QaScF9iKnZvP8OGL26uAzRu08g
+jgKjLF22Ir9pAkcR1BuSAy27D9HjEQfHV4rhoIQsHaFykY5JNeHGiiXlDQj4YA2k
+04MwuyF2HwD12wtDb3NXSUswRehJE7BfTwJmDv7LNv5eYRXcLfqFwVuUSfIiyjlx
+Xnxh/UOIhGNxCXHmMmRSFobIX6Ex7XqVZqMrA+Dld3RfV0bkqL0=
+=wTI1
+-----END PGP SIGNATURE-----

libreoffice-translations-7.1.3.2.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:86138935d274d46d27e4ce92a72d759e7d4491d7b227be952e05735ba5c9b327
-size 184886096

libreoffice-translations-7.1.3.2.tar.xz.asc

@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmCJmeUACgkQ9DSh76/u
-rqOUmA/9HRT5E660Lv+sx2UdKe8/UA+T63IZlkRJSdLcr4VJEEX9q0vf7vK+NLyx
-9HFC6hswUwPj5hUyITWnxzGIaSCb0AWfmlgU37gi2GlZNthXSUHoxMWn0abLMrvY
-jdmBVHij2Tz+9p5eHEOPHSUgiqO1icDAcZv57bgFaIOYAp0+e633oKSWuaIj/LD6
-ZFkNjrijydmY0EV+MsrDXgzQzfZ+MR02ruxm4QlU5UfI4g7JUxCumvXcw1em+FyH
-TsfsfEWIB8vKmgSmzbzyLR8ELxC57ZCfYIFSy3Kc8G1DmYEThpdeKe6CmhegjG/A
-xAqNkHeVnxqOUYiQGo/FOw4mE4F5B4Pkr34AfCrXBRlnMd9wakvngMtzaxKiNqwi
-2zcgFY/8agenisXreLvC3UgwwLcJeg0q45bOz0rCJB4+lxhD9wlh747O6BeNkY5P
-SeL1d964wkDNyliXxOUZ7+SaW6/FnBvtdt+JxJFRNvqH7ZkbjefleNbUZcCAw9vR
-80hqde42Z5zLh5PlDsat+R9JG4xh1qfqAlBIEFX/ho5d9lFK5FPx0AgXQh2SRb8C
-8TO7x7DmtM0M1K8kHos4me/mrGAZLFhO45dWKSrIACnjFodqNYb9X0bopgYaUB03
-/PvwVymsrU/K3bXX7EgJQyD0CM/XaGC/Jp54r4UxURyLeaTffPE=
-=+y28
------END PGP SIGNATURE-----

libreoffice-translations-7.1.4.2.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:47629f1b8e89dfa793b401c2f0c255b57d067bee7e71432d3c3cb0582efc5433
+size 184948704

libreoffice-translations-7.1.4.2.tar.xz.asc

@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmC6P7UACgkQ9DSh76/u
+rqOsIQ/+N2srSZgH4YA7PY+55wynucQKDl0PmJWbxEjuYVoCovWIRLlvmIM9ZY37
++Nygwd3fRg/Cv358VW4ujvl5/7RqO7Pavd3BteoOo+2R0S2nK0g+Vha3GuwNk3ds
+SFHdgCSkhW1ndhaj8V6v8sFaFIVdPTqrXoEo3OHlbjsbUF0XCx6FfS44rgzKMgyq
+lzhlrfrToRCYKJLLMSi2Fueirm/+0r6LH3XzXulrhH67KjeED9w3l7OaahjLkdf3
+jPPSsExCLk/Hiv/at/bmJwr8JGoE5w2Q4kcSNOXrGy2KvyuN04rynvkkOIDWauSw
+1rmMO77Y1JN3NBdg3i0X7UDhzpnjo8ajF1JuJ+RpaHrvd4hLNJci3qMyO6jdqkct
+jXV16Ik+kuojWm8umQj7h4wwtLWcGJXd5fZjL6bPEv45eTvRalnOmXS1F2VZMwlj
+pDSoOGT31H0TGlNE1+KZ9UpA5XSpE37crAKhPnCevsqAUBFzVWwP/oWg71YDKLjS
+3J/9HELOUohxMPBZ/wMPlWDiE88fL+QNEtn0d2s98qUt0mvSR/1ujO8rMRtkt9s7
+MKF9TP4hLupFg1weTklr81dOwrq0A9uP/deDL4ZI0BNEHTjxcFXZGV+1J5uIfEHc
+AMN9KnxJwn1lgDtjfAQ/R4zbXGqQioktafXuDa+rxy2tlEJvPpQ=
+=RX/5
+-----END PGP SIGNATURE-----

libreoffice.changes

@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Thu Jun 10 12:31:56 UTC 2021 - Markéta Machová <mmachova@suse.com>
+
+- Update to 7.1.4.2 (bsc#1178806)
+  * 7.1.4 final release
+- Dropped patches:
+  * bsc1184961.patch
+
+-------------------------------------------------------------------
+Thu May 27 11:27:04 UTC 2021 - Markéta Machová <mmachova@suse.com>
+
+- Fix bsc#1185797:  Searching in PPTX document makes LibreOffice crash
+  * bsc1185797.patch
+
 -------------------------------------------------------------------
 Wed May 26 13:32:48 UTC 2021 - Andras Timar <andras.timar@collabora.com>
 

libreoffice.spec

@@ -46,7 +46,7 @@
 %endif
 %bcond_with firebird
 Name:           libreoffice
-Version:        7.1.3.2
+Version:        7.1.4.2
 Release:        0
 Summary:        A Free Office Suite (Framework)
 License:        LGPL-3.0-or-later AND MPL-2.0+
@@ -101,12 +101,12 @@ Patch2:         nlpsolver-no-broken-help.diff
 Patch3:         mediawiki-no-broken-help.diff
 # PATCH-FIX-UPSTREAM https://github.com/LibreOffice/core/commit/f14b83b38d35a585976ef5d422754d8e0d0266a6 ucp: fix call to getComponentContext
 Patch4:         use-comphelper.patch
-# PATCH-FIX-UPSTREAM https://github.com/LibreOffice/core/commit/9fed7b07af44792012028eb57900640a5ee833cb tdf#141930 document set as unmodified if editengine didn't modify on keyevent
-Patch5:         bsc1184961.patch
 # PATCH-FIX-OPENSUSE boo#1186110 fix GCC 11 error
 Patch6:         gcc11-fix-error.patch
 # bsc#1185505 - LO-L3: Text highlight "bleeds" when saving as PPTX
 Patch7:         bsc1185505.patch
+# bsc#1185797 Searching in PPTX document makes LibreOffice crash
+Patch8:         bsc1185797.patch
 # Build with java 8
 Patch101:       0001-Revert-java-9-changes.patch
 # try to save space by using hardlinks
@@ -978,9 +978,9 @@ Provides %{langname} translations and additional resources (help files, etc.) fo
 %patch2
 %patch3
 %patch4 -p1
-%patch5 -p1
 %patch6 -p1
 %patch7 -p1
+%patch8 -p1
 %if 0%{?suse_version} < 1500
 %patch101 -p1
 %endif