- 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 - 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/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=821
This commit is contained in:
parent
72aac4f359
commit
89d13431fb
@ -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
|
||||
|
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:306e6f7d61aad09b5b9d83591ded0f220e5a9fe96b5f189d5a05185c4107437c
|
||||
size 224642560
|
@ -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.1.tar.xz
Normal file
3
libreoffice-6.3.2.1.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:d5887c16fdca32f38351474f1c8812e7c4e304599840b71b8b23953783b33549
|
||||
size 224734884
|
16
libreoffice-6.3.2.1.tar.xz.asc
Normal file
16
libreoffice-6.3.2.1.tar.xz.asc
Normal file
@ -0,0 +1,16 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAl1ySbIACgkQ9DSh76/u
|
||||
rqNsMhAAt2KFrkzPPLfLgrJFv6PWVDcR7b1FZj0fXUKJ9dmbh+qnvZSdKWf5+bOL
|
||||
jwsOsZHIJGL+4vB0mGDStvt2jsNhdZt1+Gg00FiT5SPHl2/2qXFabL1MB2XHTnuF
|
||||
M7Viwj0FXXak2ctwfzFZmLZ8Fd3fYCwgXFZWI+PORfhmB2FwH79kTGAR6TTSOg+z
|
||||
YWh0Q8cxhncxvVWETGjsq4vEjNM9RYin1GDlFsnTBEA3/npfi7cNjxvvcaqyThTR
|
||||
belXSeIcj50XE+0j5hqxs8nlnY7NF7hwgNeJF3U9FrspN2GLQeVrgUPJi8oeYfDw
|
||||
eUlyNYfPjsyV2zCC0Ur/hzA9roE/QRxg+jKS1Jw7hzArKpSe539AGO5Un9W4UHKW
|
||||
Rng1r1BVa6NgJ0N1XFlcdF/AT8ud0gdRW/9+DBCZuYF+Zq471yKXWmiefKUoIB6C
|
||||
DTDQaUXOo3BuS+XJ6UPKm3ZGkxZzirUxbJSUYpTH89pCa5PMe6o7dbfKlS2L1V+a
|
||||
lCtrhB2FQ1WFMP6Df4jQjwbZQTHgqhJiSYiYH+bQPgCLP3+DHKxpQ6WZ1/7m7zzt
|
||||
fvttCLemkiH21zER1Q30sDMbvKZownRSRv6qAsSr6vPJLs9Yaa8xRPlIZv0QmCaM
|
||||
vGbQI0JQ2dkGxrulyF4Y8LAA+gJrC5Zxr/t04oCyAKbd3vhMZhY=
|
||||
=fFXV
|
||||
-----END PGP SIGNATURE-----
|
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:eadd13a3341c2241db6a345139294d56b1bb408b2d08a2554cfa5aed864c8586
|
||||
size 13191792
|
@ -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.1.tar.xz
Normal file
3
libreoffice-help-6.3.2.1.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:68df747a28348e18a27216a92f024dab096a15b6ef96fa08b5a4b3a2d6184d45
|
||||
size 13192324
|
16
libreoffice-help-6.3.2.1.tar.xz.asc
Normal file
16
libreoffice-help-6.3.2.1.tar.xz.asc
Normal file
@ -0,0 +1,16 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAl1ySb8ACgkQ9DSh76/u
|
||||
rqN8ExAAjqT1tzX+6g33b2FGdlzhKcAHmHxs5ayyHe2ALsZsJRgIaxbDJs+RPdNh
|
||||
OweAJSsFOd6x7zQs5ZLepcWHWb6fqSCYvYah598ADgo/naDuwQqOXv9LGVaPmoIn
|
||||
CFXgc6hWLVwDWuIG8nI+QdP1O0pM3YMdeadGjo/kkwNJeb7Detg9vHRHEqWUS8kz
|
||||
jygtaX6yseITbZE3Hm4tvbnmp4/6i8Y6z2cU4TZdO8hRK4dImPNbGanczg+maDc/
|
||||
czFvSU+Krd7PVJUfU4SFk1reTiVEJ74GODSqhC/uW7dSQObkQoNIggdwpwL6JfAO
|
||||
keYnayxFDpIF2XWadgGgyq5TQE8TruRBLrEVdlEknK18PC8ATHGHdHWQMXXoU/rs
|
||||
OPpe1e+HOkdfYTcYSkUTMXGK9HmjpvDfk1lqeA3fp1wndjHkEZTh+LNGh+UV8oiF
|
||||
YfFQ1MvTZh4Y5IEi2cj2v0/nTL2sYo2xXjZwrykh2R+IBkF/tipYMLBp8sy2qSJP
|
||||
RoQD+WKv/YHkdkMrn/cZcqLFAkYHz0fsf0ikG98whz3MTKA6zdcNfe2DrDoWEf1O
|
||||
mlqsw5gpwWu+752vlu0nMdxQQtuoOX+ulG5ZkOaVxOyEPpvUkfGoSKnO1wGS2VO7
|
||||
oX0MdZDjyrRO6kdynGcumou2vDWUzK71/j0ROgtSBHM6ljgvpDw=
|
||||
=vzP1
|
||||
-----END PGP SIGNATURE-----
|
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:1c7f4f1412351c1d9d87d346097c730aeed61595450d5e875a8d9120765cd993
|
||||
size 146287660
|
@ -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.1.tar.xz
Normal file
3
libreoffice-translations-6.3.2.1.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:073139f280f590c60c79a0f80cdac36f3df084cf9094d6c7ff642dd82ac60b06
|
||||
size 146398012
|
16
libreoffice-translations-6.3.2.1.tar.xz.asc
Normal file
16
libreoffice-translations-6.3.2.1.tar.xz.asc
Normal file
@ -0,0 +1,16 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAl1yScAACgkQ9DSh76/u
|
||||
rqOC1g//aczkjPc8rKJOPqDtUw9Te8bW4pvaIFPgJO3PJY6kOUc2LWOOkVEI2z14
|
||||
KZEhWmQdyOarUtH4T/gdQu7hQgLUlDMFmBb0BjYjpXKzJNKqco/bK5JI4ecJeInG
|
||||
/u6ADmNZH+J2u2RtnDFBnJqHtL8TEOpniqLkt+dML/VLPxfu7SmPiJAhhBSeIEfS
|
||||
ldPzhY/oKc7AVeJVV+t8SlCzV5Eqlc9su/uESl64r3nfHRDIqn6STAvyuPBaBv0T
|
||||
VsejCCH4Ee4imqYvEK4Zmc/vCFejMCnzqIEMS7dJzNikfOLg4sgoBqj34XpAYhRe
|
||||
hYrZkP70SWB78e71gj+2xpFJ/SByg6RLoTNvhNMY/5IdWb1S9SSreYMrM5nBLHC+
|
||||
mBQUC9Mh/XU9MFAHS6AJgk6kFlLz/L9k6B0hP+G5CCIH3DfTIMIGzLFZ7pgMWPHg
|
||||
tc+QX0hNgRkS1Q44+bmJqFVS0VHnmqeeTBI0rEoTD99NC7FYGIlEAYmF5m9TiVRM
|
||||
hZzhyWEELwCdGAPUuHb5U6/j4uDC1l+5l3rPrQ/SBwa9ZkwvGn944j7Irh54Utli
|
||||
L/nb3Wvpciv+dKvcwi0k+dMa3xY5A4006WH1YLzs0/phwsZi5mp9XQyz71LLRv+0
|
||||
xFvSdnhCRbt0r2suB5kKwvUX53ncVm8fPDSWTysFhtTFrAWHyfg=
|
||||
=a7YC
|
||||
-----END PGP SIGNATURE-----
|
@ -1,3 +1,22 @@
|
||||
-------------------------------------------------------------------
|
||||
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
|
||||
|
||||
-------------------------------------------------------------------
|
||||
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>
|
||||
|
||||
|
@ -52,7 +52,7 @@
|
||||
%bcond_with gtk3
|
||||
%endif
|
||||
Name: libreoffice
|
||||
Version: 6.3.1.1
|
||||
Version: 6.3.2.1
|
||||
Release: 0
|
||||
Summary: A Free Office Suite (Framework)
|
||||
License: LGPL-3.0-or-later AND MPL-2.0+
|
||||
@ -101,9 +101,6 @@ 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
|
||||
# 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
|
||||
@ -988,9 +985,6 @@ Provides %{langname} translations and additional resources (help files, etc.) fo
|
||||
%patch2
|
||||
%patch3
|
||||
%patch5 -p1
|
||||
%patch6 -p1
|
||||
%patch7 -p1
|
||||
%patch8 -p1
|
||||
%patch990 -p1
|
||||
%patch991 -p1
|
||||
|
||||
|
@ -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)
|
||||
{
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user