pool/libreoffice
SHA256
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 908526 from LibreOffice:7.1

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/908526
OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=975
This commit is contained in:
Markéta Machová 2021-07-27 08:01:29 +00:00 committed by Git OBS Bridge
parent fe2e7d45e0
commit 5ec7fb7dc3
16 changed files with 67 additions and 173 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
bsc1185505.patch
View File

@ -1,37 +0,0 @@
From 097fcc9721d24f6a634b98a0033dbdf9a5a21122 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=BCl=C5=9Fah=20K=C3=B6se?= <gulsah.kose@collabora.com>
Date: Wed, 19 May 2021 14:37:36 +0300
Subject: [PATCH] tdf#96061 Unset the highlight property
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
When we have highlight property on specific part of the text
the following texts were highligthing. To prevent this we unset the
highlight property when we have not highlight property anymore.
Change-Id: I802cde1c784afe47201a9ba4f41827dd0c705035
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115800
Tested-by: Jenkins
Reviewed-by: Gülşah Köse <gulsah.kose@collabora.com>
Signed-off-by: Xisco Fauli <xiscofauli@libreoffice.org>
---
.../drawingml/textcharacterproperties.cxx | 2 +
sd/qa/unit/data/pptx/tdf96061.pptx | Bin 0 -> 21022 bytes
sd/qa/unit/export-tests-ooxml2.cxx | 35 ++++++++++++++++++
3 files changed, 37 insertions(+)
create mode 100644 sd/qa/unit/data/pptx/tdf96061.pptx
diff --git a/oox/source/drawingml/textcharacterproperties.cxx b/oox/source/drawingml/textcharacterproperties.cxx
index 20965e33abb1..4eb5acaffb56 100644
--- a/oox/source/drawingml/textcharacterproperties.cxx
+++ b/oox/source/drawingml/textcharacterproperties.cxx
@@ -177,6 +177,8 @@ void TextCharacterProperties::pushToPropMap( PropertyMap& rPropMap, const XmlFil
if( maHighlightColor.isUsed() )
rPropMap.setProperty( PROP_CharBackColor, maHighlightColor.getColor( rFilter.getGraphicHelper() ));
+ else
+ rPropMap.setProperty( PROP_CharBackColor, sal_Int32(-1));
}
static void pushToGrabBag( PropertySet& rPropSet, const std::vector<PropertyValue>& aVectorOfPropertyValues )

72
bsc1185797.patch
View File

@ -1,72 +0,0 @@
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.

3
libreoffice-7.1.4.2.tar.xz
View File

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

16
libreoffice-7.1.4.2.tar.xz.asc
View File

@ -1,16 +0,0 @@
-----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-----

3
libreoffice-7.1.5.2.tar.xz Normal file
View File

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

16
libreoffice-7.1.5.2.tar.xz.asc Normal file
View File

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmDx/XsACgkQ9DSh76/u
rqNmoA//dMLWq+KgYcBsG24UfAsoHC3yqA1TYT0sbEMpgtFe7uavMJtphv9waPfA
9GmKZbHdDXD5BWQ6Bv8BlsCukpWEytw1NsDEhEZFURqp8fdO84Gcp7CFn3uI0ovO
yEznp3zAR60ut3tuCZyOB11h+BSldA/W73Z5xRR2ORfUDj4GuHi2+4/IKr5JtF+6
YAj4AaHqgxp3MwxE5t/UdfVZLXP6SUvxLU7eoLhcnMLOd5oJAwfhABd5d85yzWZr
ZubXD239mYaMKJD1DGERlpqqfRSaMQOzJogIJVCiXr2fmFIsu0IKJVntb99pL/X4
DleQsYMiFHS8XHDZpTduhI4GxAwy2YZ/HBm/iUxvbqICuII2UbVVzQJNNqogN4eD
pLybFxwdQwpuZn6M6GttmiOR6z6+USX4hzpMXPjNyDmGxlcw56uiF6Q4dmPG5/I7
yyobJZWlpJ1WNJ9Qifv25Z8qkTdvfpSBCJxLxeN0SHkAHzYtbcCB9Uq/den0YY5v
QgaRRU5CPP0cC8X+zGkdgKI7wngj2NrvSpmG/lat1Rwqh8KlkPTc/yYXlIKoYnoU
Hc0EmHxvUxTiE0iKg2WboNG/bGufp0hBisbME10VPLmp5QVwkm4uxfGAjY3kiXol
E8G2jebIP6FCcYpC9rdNnQFGTAlRAf4dUoC2CwMLqlRdOy+7+A0=
=20Eu
-----END PGP SIGNATURE-----

3
libreoffice-help-7.1.4.2.tar.xz
View File

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

16
libreoffice-help-7.1.4.2.tar.xz.asc
View File

@ -1,16 +0,0 @@
-----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-----

3
libreoffice-help-7.1.5.2.tar.xz Normal file
View File

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

16
libreoffice-help-7.1.5.2.tar.xz.asc Normal file
View File

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmDx/YQACgkQ9DSh76/u
rqPJ6g/9GLHnDRA48oPHKaXpZCZ0J7pzNlRFMrSuEpAyyRlkYX5/XRrWQKRUbalJ
qFCybU2nTiNRb8N3xiWb7y24+aNpPUZkx7rnU7Vm69TNe19WR9xKxkBhdWBkQLrD
tEv/mR0xOBHLdc+Q7cNCVzrQ3UWZIRChfmeNAgIl+DzVX1qMi60v8oANfuGJJxAa
l6Yj8lYm+04qfX8dPk4XZM9kTgJQMlLZMSbbPFwuoaJjuIsBi3Wu33Ppxvf37LpS
H6418wROajZ74Owa0htB2aAjQwIZjS/90noqY2SxGPBNf9gMNRmRTCX/mudAFUgZ
smkqRjoBZm+ZCDq2Oz8k4oEHsj1TUtIs5QhZI8VqToIA/y53SBn3bq42yME+0P/V
2V4pe6Qy0hv9u/YXsBAbLbXXVbr0LOaBe3BNK0dbdGBu1NWt8WLP1FBYpcKNl2Xw
0Ee/mS6JHoT1EGmKKaghml29zvqoQhqx1fUHN/l6zuxwvaTr18Ob8KRHsksXUde8
4ULdO/O7QLTcNnI8CaPD3giIcihBEWvoMHtWUWHG1b39EUEfUs+djzyzK7jQZ3Ux
btUMDUUDth2sY8HVVdg3p4HUbehiRooEDRJCg/XxLsasA3d6siwPy2/vEciadmEi
iMTTyFxv5mQd1Bcg+lCPJRQ8ohL0GUeaFeMpSp3BF8uI3zq9NdM=
=Ej8U
-----END PGP SIGNATURE-----

3
libreoffice-translations-7.1.4.2.tar.xz
View File

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

16
libreoffice-translations-7.1.4.2.tar.xz.asc
View File

@ -1,16 +0,0 @@
-----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-----

3
libreoffice-translations-7.1.5.2.tar.xz Normal file
View File

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

16
libreoffice-translations-7.1.5.2.tar.xz.asc Normal file
View File

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmDx/YUACgkQ9DSh76/u
rqN76g//Z2aFAo46O/8ODbH4tIF6Cvc9JgI3Sy6DP6nlDHontrAfeENUpe2y3eRv
xJe2Ksu9P7HqGSndCDWdjZkD8ClBKG/CT9kj3+mn2ehzopZU+pBFhvhqanR48LXZ
S8wbntPHhUvi+xN0qapMx4dGAXNNCZfSMyrAkC8g1e8Bbc3PViwSjwZaBl2dPMm3
mZpnobviWS34LYcCgvRdnoJxvNLwem2eOV7WNkKJvmhEZ9NrzYIxorIrTxQBm0Ri
/qli+4p1KTyTn8cRnCsaspmi124y62f1z4ml9Sji0hQwFVRI0pCWce7OeqR1VgH6
LjJVhq8yea5UFVvXq1h/5txlW6+49tX/ot9vOrFfp+Z1zgf52YA0Bdz6lsxiCw1S
kzb36UWFJ2Ydj3J+JJnnLri4psuH1EazOcEmK9iAGV6FwbtmI9StrDLuYg+Ag6mr
036kGJd/Bl0bvXiZkQudPuF1CTAhSg1lPej08AC2KRn9IFvr+5yJVfrR7zWQXyF4
4N3hWNDBuPcYLaWpwtak1IjMtNlIRr+C7BiZdPXJB2NKJcBwBqcRVRNU8LEVSpVY
YLXnGKlzXtCRrtIE2bcUa64/RHx/mCaiCJkTXdwvNxy/e2PiWy7oPWMQzH0QodZs
R6h0hcXz+hC8m59e9/ecQH+oso8ct9PCmkq50J78Dx7gsu35X3o=
=FjrM
-----END PGP SIGNATURE-----

9
libreoffice.changes
View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Thu Jul 8 13:22:19 UTC 2021 - Markéta Machová <mmachova@suse.com>
- Update to 7.1.5.2
* 7.1.5 final release
- Dropped patches:
* bsc1185505.patch
* bsc1185797.patch
-------------------------------------------------------------------
Mon Jun 28 08:00:24 UTC 2021 - Andras Timar <andras.timar@collabora.com>

8
libreoffice.spec
View File

@ -46,7 +46,7 @@
%endif
%bcond_with firebird
Name: libreoffice
Version: 7.1.4.2
Version: 7.1.5.2
Release: 0
Summary: A Free Office Suite (Framework)
License: LGPL-3.0-or-later AND MPL-2.0+
@ -103,10 +103,6 @@ Patch3: mediawiki-no-broken-help.diff
Patch4: use-comphelper.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
# bsc#1182969 Multi column textbox in editengine
Patch9: bsc1182969.patch
# tdf#142839 Fix a regression caused by "Multi column textbox in editengine"
@ -987,8 +983,6 @@ Provides %{langname} translations and additional resources (help files, etc.) fo
%patch3
%patch4 -p1
%patch6 -p1
%patch7 -p1
%patch8 -p1
%patch9 -p1
%patch10 -p1
%patch11 -p1