Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package libreoffice for openSUSE:Factory 
checked in at 2021-06-13 23:05:39
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libreoffice (Old)
 and      /work/SRC/openSUSE:Factory/.libreoffice.new.32437 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "libreoffice"

Sun Jun 13 23:05:39 2021 rev:229 rq:899602 version:7.1.4.2

Changes:
--------
--- /work/SRC/openSUSE:Factory/libreoffice/libreoffice.changes  2021-06-01 
10:34:18.100490239 +0200
+++ /work/SRC/openSUSE:Factory/.libreoffice.new.32437/libreoffice.changes       
2021-06-13 23:06:01.043654929 +0200
@@ -1,0 +2,14 @@
+Thu Jun 10 12:31:56 UTC 2021 - Mark??ta Machov?? <[email protected]>
+
+- 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?? <[email protected]>
+
+- Fix bsc#1185797:  Searching in PPTX document makes LibreOffice crash
+  * bsc1185797.patch
+
+-------------------------------------------------------------------

Old:
----
  bsc1184961.patch
  libreoffice-7.1.3.2.tar.xz
  libreoffice-7.1.3.2.tar.xz.asc
  libreoffice-help-7.1.3.2.tar.xz
  libreoffice-help-7.1.3.2.tar.xz.asc
  libreoffice-translations-7.1.3.2.tar.xz
  libreoffice-translations-7.1.3.2.tar.xz.asc

New:
----
  bsc1185797.patch
  libreoffice-7.1.4.2.tar.xz
  libreoffice-7.1.4.2.tar.xz.asc
  libreoffice-help-7.1.4.2.tar.xz
  libreoffice-help-7.1.4.2.tar.xz.asc
  libreoffice-translations-7.1.4.2.tar.xz
  libreoffice-translations-7.1.4.2.tar.xz.asc

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ libreoffice.spec ++++++
--- /var/tmp/diff_new_pack.2o0uhe/_old  2021-06-13 23:06:07.227666113 +0200
+++ /var/tmp/diff_new_pack.2o0uhe/_new  2021-06-13 23:06:07.231666120 +0200
@@ -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 @@
 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 @@
 %patch2
 %patch3
 %patch4 -p1
-%patch5 -p1
 %patch6 -p1
 %patch7 -p1
+%patch8 -p1
 %if 0%{?suse_version} < 1500
 %patch101 -p1
 %endif







++++++ bsc1184961.patch -> bsc1185797.patch ++++++
--- /work/SRC/openSUSE:Factory/libreoffice/bsc1184961.patch     2021-05-07 
16:45:01.792430470 +0200
+++ /work/SRC/openSUSE:Factory/.libreoffice.new.32437/bsc1185797.patch  
2021-06-13 23:05:52.299639119 +0200
@@ -1,42 +1,72 @@
-From 9fed7b07af44792012028eb57900640a5ee833cb Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <[email protected]>
-Date: Tue, 4 May 2021 09:15:25 +0100
-Subject: [PATCH] tdf#141930 document set as unmodified if editengine didn't
- modify on keyevent
+From db6efbaf5f9d6ae818afccec6a9fab219268b621 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Toma=C5=BE=20Vajngerl?= <[email protected]>
+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
 
-this appears to have always happened for cursor keys, and since
+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.
 
-commit 0154f04e8c64df937b793c73ac58d553637f324f
-Author: Caol??n McNamara <[email protected]>
-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
+Change-Id: I50931cca2a20c5704f7450e3cc8b3466af4c5a3e
+Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116758
 Tested-by: Jenkins
-Reviewed-by: Caol??n McNamara <[email protected]>
+Reviewed-by: Toma?? Vajngerl <[email protected]>
+(cherry picked from commit 3b75f9add7ed80e803b0771d86892d6ca0f47e71)
+Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116703
+Reviewed-by: Michael Stahl <[email protected]>
 ---
- starmath/source/edit.cxx | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
+ sd/source/ui/view/Outliner.cxx | 12 +++++++++++-
+ 1 file changed, 11 insertions(+), 1 deletion(-)
 
-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();
- }
+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 -> libreoffice-7.1.4.2.tar.xz ++++++
/work/SRC/openSUSE:Factory/libreoffice/libreoffice-7.1.3.2.tar.xz 
/work/SRC/openSUSE:Factory/.libreoffice.new.32437/libreoffice-7.1.4.2.tar.xz 
differ: char 27, line 1

++++++ libreoffice-help-7.1.3.2.tar.xz -> libreoffice-help-7.1.4.2.tar.xz ++++++
/work/SRC/openSUSE:Factory/libreoffice/libreoffice-help-7.1.3.2.tar.xz 
/work/SRC/openSUSE:Factory/.libreoffice.new.32437/libreoffice-help-7.1.4.2.tar.xz
 differ: char 27, line 1

++++++ libreoffice-translations-7.1.3.2.tar.xz -> 
libreoffice-translations-7.1.4.2.tar.xz ++++++
/work/SRC/openSUSE:Factory/libreoffice/libreoffice-translations-7.1.3.2.tar.xz 
/work/SRC/openSUSE:Factory/.libreoffice.new.32437/libreoffice-translations-7.1.4.2.tar.xz
 differ: char 26, line 1

Reply via email to