rpm/libreoffice
SHA256
1
0
Fork 0
forked from pool/libreoffice
Code Pull Requests Activity

Accepting request 731894 from LibreOffice:Factory

Browse Source 
- Update to 6.3.2.2:
  * Fixes for full 6.3.2 release included

- Add patch to fix building on SLE12:
  * 0001-Check-for-EMOJI-content-only-on-ICU-57-and-newer.patch

- Update to 6.3.2.1:
  * Contain fixes for the bellow CVE issues and also few
    stability tweaks
- Drop merged patches:
  * old-boost.patch
  * old-boost2.patch
- Add Silesian language

- Update to 6.2.7.1:
  bsc#1149944 VUL-0: CVE-2019-9854 Unsafe URL assembly flaw
  bsc#1149943 VUL-0: CVE-2019-9855 path equivalence handling flaw
- Drop merged patch:
  * 0001-Fix-buidling-with-older-boost.patch

OBS-URL: https://build.opensuse.org/request/show/731894
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libreoffice?expand=0&rev=187
This commit is contained in:
Yuchen Lin 2019-09-21 15:28:07 +00:00 committed by Git OBS Bridge
commit c789b51442
18 changed files with 126 additions and 227 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
0001-Check-for-EMOJI-content-only-on-ICU-57-and-newer.patch Normal file
View File

@ -0,0 +1,33 @@
From 40eb50bde3922f23cd071c1e8e0b2cce5ca2d747 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.com>
Date: Wed, 11 Sep 2019 09:58:43 +0200
Subject: [PATCH] Check for EMOJI content only on ICU 57 and newer
The older ICU does not have the logic to work with there as it is
feature of the new icu only:
http://bugs.icu-project.org/trac/ticket/11802
Change-Id: Icd21be1e20b7cb988e94d107406a4f81d00116a7
---
vcl/unx/generic/fontmanager/fontconfig.cxx | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/vcl/unx/generic/fontmanager/fontconfig.cxx b/vcl/unx/generic/fontmanager/fontconfig.cxx
index c7bfbb47e9bd..a36dfc868329 100644
--- a/vcl/unx/generic/fontmanager/fontconfig.cxx
+++ b/vcl/unx/generic/fontmanager/fontconfig.cxx
@@ -798,7 +798,11 @@ namespace
bool isEmoji(sal_uInt32 nCurrentChar)
{
+#if U_ICU_VERSION_MAJOR_NUM >= 57
return u_hasBinaryProperty(nCurrentChar, UCHAR_EMOJI);
+#else
+ return false;
+#endif
}
//returns true if the given code-point couldn't possibly be in rLangTag.
--
2.23.0

55
0001-Fix-buidling-with-older-boost.patch
View File

@ -1,55 +0,0 @@
From 85a60cfe498f278087edbf88d221929a32e8f2e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.com>
Date: Mon, 19 Aug 2019 13:30:23 +0200
Subject: [PATCH] Fix buidling with older boost
Change-Id: I49691e8bf708aa9146d5c4f61532e7a215f4ac2d
---
sw/source/core/layout/calcmove.cxx | 8 ++++++++
sw/source/core/layout/flowfrm.cxx | 4 ++++
2 files changed, 12 insertions(+)
diff --git a/sw/source/core/layout/calcmove.cxx b/sw/source/core/layout/calcmove.cxx
index 1856e6b69d40..ff2befe5d969 100644
--- a/sw/source/core/layout/calcmove.cxx
+++ b/sw/source/core/layout/calcmove.cxx
@@ -409,12 +409,20 @@ void SwFrame::PrepareCursor()
if ( bTab )
{
+#if BOOST_VERSION < 105600
+ tabGuard.reset(static_cast<SwTabFrame*>(this)); // tdf#125741
+#else
tabGuard.emplace(static_cast<SwTabFrame*>(this)); // tdf#125741
+#endif
pThis = static_cast<SwTabFrame*>(this);
}
else if (IsRowFrame())
{
+#if BOOST_VERSION < 105600
+ rowGuard.reset(SwFrameDeleteGuard(this)); // tdf#125741 keep this alive
+#else
rowGuard.emplace(this); // tdf#125741 keep this alive
+#endif
}
else if( IsSctFrame() )
{
diff --git a/sw/source/core/layout/flowfrm.cxx b/sw/source/core/layout/flowfrm.cxx
index 6c9e61595f23..dbe7d9c7feec 100644
--- a/sw/source/core/layout/flowfrm.cxx
+++ b/sw/source/core/layout/flowfrm.cxx
@@ -2527,7 +2527,11 @@ bool SwFlowFrame::MoveBwd( bool &rbReformat )
&& pTabFrame->GetFirstNonHeadlineRow() == m_rThis.GetUpper()->GetUpper())
{
// lock follow-flow-row (similar to sections above)
+#if BOOST_VERSION < 105600
+ g.reset(SwFrameDeleteGuard(m_rThis.GetUpper()->GetUpper()));
+#else
g.emplace(m_rThis.GetUpper()->GetUpper());
+#endif
assert(m_rThis.GetUpper()->GetUpper()->IsDeleteForbidden());
}
}
--
2.22.0

3
libreoffice-6.3.1.1.tar.xz
View File

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

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

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAl1W4awACgkQ9DSh76/u
rqMIBBAAz0CmWVd96uuKGAuG4wUh77lSQDpBnNBPpnvu/AST5Bon6Em6t0568ZIx
GZF77JaJ4uRPd98iiK/pAUjeXM0sEVgeLz1WAMIBG064znWvuYefabwZ/AF88S2K
dk1Xnotvb/Zb9t4yKLpDqHa4N0BjfxWcNHATZpZQs5AowP0xkNFxvS6r41qWXqgq
us84Z43oam8vxAA/hX2m6EXsTVrzeRELlgXt7RWjzdLy3fB4BaGzwVgiHzLtH8nf
4LtuieCEPEm30qDb1EiZiaQU4DALg+VMyknPzrIyeJSwqnVHVWOHbno3/XE5X2d8
Psm+kUhr61IjKv0vOFHiub3TYni231+KEWUoL1s4KuwuVXoXI7exOyrlOfiUglxw
GneidpdVr0PjfIeWZ3oKtjgorEvOQPsbqkNQkqRE3m4jvVig4hcGJA1Ymuci1HEJ
JQo0zMQ1QI8SwikhadMXWB/h0o2IuGs1hXmXHObp+arnpr5gTSNLiFtIOtc0WefP
tWMpawdF4d+bm5NME6FbtkXa3+cm/XJCP7CY/Y9tvJk2GEamBQ73XQnPc/EZQRRX
yyV1XanpOc//ruvW408h5jvUoNIe+kw0xV3LTU9IniiE7qZPoTETeZtihvb585dQ
0zfVjifeG+yxMBcDafyQckp6vOMmWH7enFpMf2x3RqfZUOp3imY=
=Fd5B
-----END PGP SIGNATURE-----

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

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

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

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAl2CRREACgkQ9DSh76/u
rqO+VRAArSG3wX1Zna+l4OxnLvnZAcq9vDyFJnEXQXM4VUndRtyOSJtaqSYAIcMN
fz3p1QBuu985AhxtYV3WCiOYoaTP6ARcRW0FUtdo1CSqDfw4W/235ZdBYWXpCw3N
44+aaKk/6zSUIsW30eCIYo3txHlLznW9MamBdqeunqGjSV3PxBELPMWb4NOm0qEZ
ShefgcAiSexd2/IhTQs3v1o2BXvnl7vbUJLwyRqe7s6WtfS7QtsRM6pt5tqInGKS
oY+qcljennDAsc9wjb1S1KV+iRzeK/Gg7EpvQob8LlSw9xBUJ1vfTr3qHZujYOQN
JpSMT2nWkORg3PBsaSRS2M5c7T9um8+2ZJwZXinVGudmk44lQHZsGECTi3rpje6w
woXFPdyw2j0T3t1JAYU/eUjjlEqk5veE+cb3wH+SDN9kkjg3+2aEu1TlXiAaf9B3
O1IQeBfuxjLrz8yK6FBSLBekpn9Psjl7Tgoi2DhN/Hz/hBkENYhaN8dZhCwRt6pd
5SJyRHm+FXF50JIiOSNNw0ao7W6GEXJM16TupdGD7xyISxMQzeLOJeu8m2ZeZGS4
I+3sGk4XXhcHDJ8bpUaIrG67FE1FQvBZqsHUKEIW50casmlfnDulKqmngV+eg33j
0bPwqjryS5a/EKPEeyiLxUHlpHWAPTTHKcWOLjZvlDwVSM+mQek=
=42nS
-----END PGP SIGNATURE-----

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

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

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

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAl1W4bEACgkQ9DSh76/u
rqPcsBAArShmY/RyK/T6FGI1Ramw6uc9jTXZjYmS9shWFPPf2EzNhgN8UoWhGObc
rTgk0SmzccDH5/rTswG0j/YOOqgplutTT+4qavMJCMx6Aq84vhh/fR82yizHscYW
UeyO8uA6cMA49vOKcnM+3jftS+XmxGdBMiIp+Vvcb/DTlb7gfVSgp6etCfwL5mTe
ytIlCAKWptqKNZeb3W3MnBgoKixhilN8uE8v+5vEMqnfr29H935vrC87ez/RErvW
M7jf1OCUBCyKNnEWTzs9KfY+7ulDHiDVX59GSsBslG0RzuywHPpXoRjbtpBnpucc
igD/6rTifvL/OwmMxzFqIXD1I3QyZyoC11+hhhlPtQhvSwyFXaIvRVA4i8ZgSR6o
COeoxyojkNFtEaA99bLtPLUh3dttN3jG5lZ63oIjakA9FyIAOXCu6Kv5+NWULYTd
vFHK0PomVSWetFEkmHnNq/4ZBU77W0LBuMbdi/gcYIH5Px/kpyMNIjYb/MKGrVCg
GiyKLOL4ZWCR014b+Nj+lWHCTMikkSoB9si1+SKyXniD6TRPr8+AYuE9qFa8TXkC
VkdzEJp+oWkrkV3rP5BY7UlNC2Yz9H/CY5bsMRgGFxjtwomP0jrXTla3I0ReFMVk
t16lz/tWahs73YdWl93MjczdVOcH78MvAZ7A6+ZGnaipET2uv6U=
=FC9v
-----END PGP SIGNATURE-----

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

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

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

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAl2CRRUACgkQ9DSh76/u
rqPH0A/8CGN4k95jMkgF6pgvni2ZVE1ZQPeGz7U0LfkfQoDmHua7Y8/rj9k+Q1qI
f0IK6QmJXRkk/mqabFmnxLEfYlQXmFyg1E3SO7F6svOj9FWL7Kic3Iz4A5TpnWKF
TyHo02O7Uq8vxDic6yxB3GT9IyZS/5NmLykeM3gVd9DJX6z4L/IxCPS7kryHkuxe
RmhaQqOknLBdbJwp9d2iccoYkWbAAE2f2lLZ5dI49qYNZVihrD3dmlLqUE3RFCN7
g3pv0eWzlYdYyx7zNBVsks/1xUQAcaGJqMmeulomUCn0s7ttZcMr/9YVTHE79E8W
LLhBmISLNanopFXKISuwrSvZQ3IGZ9dw72fxy3MBP2/VEFtE5WNF/G0sSWUN+09A
QGJDAS1X5Z2eDxBuz+T7/uQFpefrtZzLp32017pzMnieOPaXsw6P9DiBVx613sf+
G3zdn91+nXlM3F+vPCCXA2tzrWcY7zLHZWgoBaQTBvQy3Gs+YDjmtRS6ug0E4LXH
o8WrDuPhkhR8U65dHOtmLLoFehlunZAfAfqPba5ExOZPRPieQNLamEnCuawKRsh1
bkwLKfGh1yxoJaPuofZFqSRfwwGfovvZcIej4nnwPDKPnd2OS/he9lIKcLl1IUkB
t922qRjp/jA4NbxoP2LSu1QYK91N5hXpeJnHjH8nRBYAaavKMuM=
=WfHu
-----END PGP SIGNATURE-----

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

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

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

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAl1W4bEACgkQ9DSh76/u
rqNjSA//YLyI9cbII5/cMop2Vkbdcpm/unngKvwtT7JPQZ+IBtEbXmvC2/Sy1Bqq
lrKrsSRsfSAtQrVCvlxA1t+DtOR1GBMICtq+AZ8/QMKnukNvrnVEXPmGOH4vPBER
6/nSq4rQYniLp3Mpl72rZh0s73JFYELwxpvg/BYlTMreOnw6lGWJCUnA2N3qTIed
ZJhya26IguaMgVNaqBoaPI4an/4m1fbRDmcFn11nCZVFCdyRqUQDl5tFMWcnwg1o
FSr4bAwZyW1oM+wz+2iKZ9acnHVHCln/QBMxa/wHwBx76GRVak6BdsGFsHJL56oL
YIRxAG/466bKS7qseWPkANl375CBvN0rEcLol/e3PuGmQkSaVblf7cdEV0PfQniE
RZCRU+NUoCdZhs+1wAQXBiGYdPs+8l/66Yw/2MN5k2CbfJ4zRkx1dNqQ2y7UbNlL
RIn9FvD7I/ADfASaYIrAUc3h4RMwd3Ytj1+RNyfG+xohonEAzRqtNMj7ayuOq3Vg
xP7XWubGFZGc5JJksomc+/OJ6cUkjJi9kZ0QkspV+PwKXEa7myNggklqQjEh6ayo
DEAHc9xUHSbVBemB7+q0e5h8KQOCqiqjMLerbTjD91qE3QGJ9sNC7JrQGMpl65KE
SVfjq9ejg4VCQVo46gcNFugfFhcjBSmtowKFprtSH1EJfTKdIK4=
=93I4
-----END PGP SIGNATURE-----

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

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

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

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAl2CRRYACgkQ9DSh76/u
rqMpkA/+KVaGu80jSMTNf6uNqnWqZQ8j1zQUFE6Tl08xpyt5J+YDiSpjkzZWHnAe
FOykFOwQlTD6xltXkhYiBa2W5hcJ0qZk0XwGPIYHm5NsZnCjQqKMMVJiv+M3gpLF
0sBZM36rIBHON76HQ8oRKXI9rTOBiNDtV2EeXafuD+vwhb1aufJavzz0SueYy/0W
tqlHPkuZc0YyhzGBHfmMMEKwUwLO/6kMTnqp8QiBG10TrCaf3FVAp5iTg261L2kz
UUX8ZVdUOAZPRV/Jp9iNGnuKlK5GKPoHDieyomqqkHeseJ3SC+xgw2AlRfTdJa8z
EV1HZIgp5R+GSSGGOYOQ5WlSR1iYLYsUmSrfdbyDouLlI1UBm/jhVK6jHUzOdOIj
25rc5SNQIm2eovV/IE17ayo2lGYhbtmFFhvCnG8TMQgEjKKRVAhxpdeDQJOQoejs
sVtKxp28UoPuUfyvdRt56GqqOl0O4mwF8yb/z4I0oh674XwnrtdpZYTSzdKlauQP
iaEWHgpjNdb6lEzhZhzf/vbvPDz7ZNDLXtCtB8Kl1LQvO0CiVC2xcL764xLu3KT3
6tpIwqMBnNPJQaP63EwvtCFh+Ki53UkawvMOhqs/XWiIx4Ota9dtmwuk4z25Sbuz
3rFpqjuu1vTlfMY7z0YPoTQkSQb9PHLSL2KVF9kYrB7kftp8GkU=
=c+Hn
-----END PGP SIGNATURE-----

32
libreoffice.changes
View File

@ -1,3 +1,35 @@
-------------------------------------------------------------------
Thu Sep 19 08:36:59 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com>
- Update to 6.3.2.2:
* Fixes for full 6.3.2 release included
-------------------------------------------------------------------
Wed Sep 11 08:03:08 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com>
- Add patch to fix building on SLE12:
* 0001-Check-for-EMOJI-content-only-on-ICU-57-and-newer.patch
-------------------------------------------------------------------
Mon Sep 9 08:17:52 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com>
- Update to 6.3.2.1:
* Contain fixes for the bellow CVE issues and also few
stability tweaks
- Drop merged patches:
* old-boost.patch
* old-boost2.patch
- Add Silesian language
-------------------------------------------------------------------
Mon Sep 9 08:14:37 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com>
- Update to 6.2.7.1:
bsc#1149944 VUL-0: CVE-2019-9854 Unsafe URL assembly flaw
bsc#1149943 VUL-0: CVE-2019-9855 path equivalence handling flaw
- Drop merged patch:
* 0001-Fix-buidling-with-older-boost.patch
-------------------------------------------------------------------
Thu Aug 29 01:37:24 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com>

12
libreoffice.spec
View File

@ -52,7 +52,7 @@
%bcond_with gtk3
%endif
Name: libreoffice
Version: 6.3.1.1
Version: 6.3.2.2
Release: 0
Summary: A Free Office Suite (Framework)
License: LGPL-3.0-or-later AND MPL-2.0+
@ -101,9 +101,7 @@ Patch1: scp2-user-config-suse.diff
Patch2: nlpsolver-no-broken-help.diff
Patch3: mediawiki-no-broken-help.diff
Patch5: mdds-1-5.patch
Patch6: 0001-Fix-buidling-with-older-boost.patch
Patch7: old-boost.patch
Patch8: old-boost2.patch
Patch6: 0001-Check-for-EMOJI-content-only-on-ICU-57-and-newer.patch
# try to save space by using hardlinks
Patch990: install-with-hardlinks.diff
# save time by relying on rpm check rather than doing stupid find+grep
@ -121,7 +119,6 @@ BuildRequires: curl-devel
# Needed for tests
BuildRequires: dejavu-fonts
BuildRequires: doxygen >= 1.8.4
# Dot is used by doxygen
BuildRequires: fdupes
BuildRequires: flex >= 2.6.0
BuildRequires: flute
@ -229,10 +226,10 @@ BuildRequires: pkgconfig(serf-1) >= 1.1.0
BuildRequires: pkgconfig(xmlsec1-nss) >= 1.2.24
BuildRequires: pkgconfig(xrandr)
BuildRequires: pkgconfig(xt)
# We need at least english to launch ourselves.
Requires: liberation-fonts
Requires: libreoffice-branding >= 6.0
Requires: libreoffice-icon-themes = %{version}
# We need at least english to launch ourselves
Requires: libreoffice-l10n-en = %{version}
Requires: python3
Recommends: dejavu-fonts
@ -960,6 +957,7 @@ Provides %{langname} translations and additional resources (help files, etc.) fo
%langpack -l st -n Southern_Sotho
%langpack -l sv -n Swedish -X -m sv_SE -T
%langpack -l sw_TZ -n Swahili -M -L sw-TZ -g sw_TZ -j sw_TZ
%langpack -l szl -n Silesian
%langpack -l ta -n Tamil -s ctl -T
%langpack -l te -n Telugu -m te_IN
%langpack -l tg -n Tajik -T
@ -989,8 +987,6 @@ Provides %{langname} translations and additional resources (help files, etc.) fo
%patch3
%patch5 -p1
%patch6 -p1
%patch7 -p1
%patch8 -p1
%patch990 -p1
%patch991 -p1

13
old-boost.patch
View File

@ -1,13 +0,0 @@
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index bad7d74672d0..07d3549e750d 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -1287,7 +1287,7 @@ void SfxViewFrame::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint )
OUString sSetupVersion = utl::ConfigManager::getProductVersion();
sal_Int32 iCurrent = sSetupVersion.getToken(0,'.').toInt32() * 10 + sSetupVersion.getToken(1,'.').toInt32();
OUString sLastVersion
- = officecfg::Setup::Product::ooSetupLastVersion::get().value_or("0.0");
+ = officecfg::Setup::Product::ooSetupLastVersion::get().get_value_or("0.0");
sal_Int32 iLast = sLastVersion.getToken(0,'.').toInt32() * 10 + sLastVersion.getToken(1,'.').toInt32();
if ((iCurrent > iLast) && !Application::IsHeadlessModeEnabled() && !bIsUITest)
{

94
old-boost2.patch
View File

@ -1,94 +0,0 @@
From e63ec6c40c9cb6a265c2060c28491405413b3200 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.com>
Date: Fri, 23 Aug 2019 09:44:01 +0200
Subject: [PATCH] Fix old boost build for good
With the previous approach the code could lead to crashes in
the flowfrm.cxx
Change-Id: I3b56ed46db9d37a606a1cd793a20b8aff22db6e2
---
sw/source/core/inc/frame.hxx | 5 +++++
sw/source/core/layout/calcmove.cxx | 9 +++++++--
sw/source/core/layout/flowfrm.cxx | 6 +++++-
3 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/sw/source/core/inc/frame.hxx b/sw/source/core/inc/frame.hxx
index ab1047d0348f..312957a02593 100644
--- a/sw/source/core/inc/frame.hxx
+++ b/sw/source/core/inc/frame.hxx
@@ -1238,7 +1238,12 @@ public:
//it in e.g. SwSectionFrame::MergeNext etc because we will need it
//again after the SwFrameDeleteGuard dtor
explicit SwFrameDeleteGuard(SwFrame* pFrame);
+
+ SwFrameDeleteGuard(const SwFrameDeleteGuard&) =delete;
+
~SwFrameDeleteGuard();
+
+ SwFrameDeleteGuard& operator=(const SwFrameDeleteGuard&) =delete;
};
typedef long (SwFrame:: *SwFrameGet)() const;
diff --git a/sw/source/core/layout/calcmove.cxx b/sw/source/core/layout/calcmove.cxx
index 3502450c2a47..cb956d8f916c 100644
--- a/sw/source/core/layout/calcmove.cxx
+++ b/sw/source/core/layout/calcmove.cxx
@@ -404,14 +404,19 @@ void SwFrame::PrepareCursor()
const bool bTab = IsTabFrame();
bool bNoSect = IsInSct();
+#if BOOST_VERSION < 105600
+ std::list<FlowFrameJoinLockGuard> tabGuard;
+ std::list<SwFrameDeleteGuard> rowGuard;
+#else
boost::optional<FlowFrameJoinLockGuard> tabGuard;
boost::optional<SwFrameDeleteGuard> rowGuard;
+#endif
SwFlowFrame* pThis = bCnt ? static_cast<SwContentFrame*>(this) : nullptr;
if ( bTab )
{
#if BOOST_VERSION < 105600
- tabGuard.reset(static_cast<SwTabFrame*>(this)); // tdf#125741
+ tabGuard.emplace_back(static_cast<SwTabFrame*>(this)); // tdf#125741
#else
tabGuard.emplace(static_cast<SwTabFrame*>(this)); // tdf#125741
#endif
@@ -420,7 +425,7 @@ void SwFrame::PrepareCursor()
else if (IsRowFrame())
{
#if BOOST_VERSION < 105600
- rowGuard.reset(SwFrameDeleteGuard(this)); // tdf#125741 keep this alive
+ rowGuard.emplace_back(this); // tdf#125741 keep this alive
#else
rowGuard.emplace(this); // tdf#125741 keep this alive
#endif
diff --git a/sw/source/core/layout/flowfrm.cxx b/sw/source/core/layout/flowfrm.cxx
index 54f0bdd4e567..fb87c6025061 100644
--- a/sw/source/core/layout/flowfrm.cxx
+++ b/sw/source/core/layout/flowfrm.cxx
@@ -2522,7 +2522,11 @@ bool SwFlowFrame::MoveBwd( bool &rbReformat )
{
auto const pOld = m_rThis.GetUpper();
+#if BOOST_VERSION < 105600
+ std::list<SwFrameDeleteGuard> g;
+#else
::boost::optional<SwFrameDeleteGuard> g;
+#endif
if (m_rThis.GetUpper()->IsCellFrame())
{
// note: IsFollowFlowRow() is never set for new-style tables
@@ -2533,7 +2537,7 @@ bool SwFlowFrame::MoveBwd( bool &rbReformat )
{
// lock follow-flow-row (similar to sections above)
#if BOOST_VERSION < 105600
- g.reset(SwFrameDeleteGuard(m_rThis.GetUpper()->GetUpper()));
+ g.emplace_back(m_rThis.GetUpper()->GetUpper());
#else
g.emplace(m_rThis.GetUpper()->GetUpper());
#endif
--
2.22.0