diff --git a/0001-Fix-buidling-with-older-boost.patch b/0001-Fix-buidling-with-older-boost.patch new file mode 100644 index 0000000..d3fb8a1 --- /dev/null +++ b/0001-Fix-buidling-with-older-boost.patch @@ -0,0 +1,55 @@ +From 85a60cfe498f278087edbf88d221929a32e8f2e9 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= +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(this)); // tdf#125741 ++#else + tabGuard.emplace(static_cast(this)); // tdf#125741 ++#endif + pThis = static_cast(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 + diff --git a/gcc.patch b/gcc.patch deleted file mode 100644 index 7d24477..0000000 --- a/gcc.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 913120fe50ee770e60bd82e2e60047242872111a Mon Sep 17 00:00:00 2001 -From: Lionel Elie Mamane -Date: Wed, 10 Jul 2019 10:27:19 +0200 -Subject: build failure - disambiguate Calendar return class -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Change-Id: I892281f85f6cc9c2de2c341ae63240ae85d302c4 -Reviewed-on: https://gerrit.libreoffice.org/76595 -Reviewed-by: Tomáš Chvátal -Reviewed-by: Lionel Elie Mamane -Tested-by: Jenkins ---- - i18npool/source/calendar/calendarImpl.cxx | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/i18npool/source/calendar/calendarImpl.cxx b/i18npool/source/calendar/calendarImpl.cxx -index c9e22f7..228bed3 100644 ---- a/i18npool/source/calendar/calendarImpl.cxx -+++ b/i18npool/source/calendar/calendarImpl.cxx -@@ -128,7 +128,7 @@ CalendarImpl::getLoadedCalendar2() - return xCalendar->getLoadedCalendar2(); - } - --Calendar SAL_CALL -+::css::i18n::Calendar SAL_CALL - CalendarImpl::getLoadedCalendar() - { - if (!xCalendar.is()) --- -cgit v1.1 - diff --git a/libreoffice-6.3.0.4.tar.xz b/libreoffice-6.3.0.4.tar.xz deleted file mode 100644 index d7ce438..0000000 --- a/libreoffice-6.3.0.4.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:87830107b17fbf6c3831c8e6bf738e7d21fa7826debb88e4948d80caf2a7aed7 -size 224504440 diff --git a/libreoffice-6.3.0.4.tar.xz.asc b/libreoffice-6.3.0.4.tar.xz.asc deleted file mode 100644 index a700e64..0000000 --- a/libreoffice-6.3.0.4.tar.xz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAl1JwoAACgkQ9DSh76/u -rqNt6hAAqKS8z6mHLAHmUm648tFukr8DDfcX8+GfT9qAm78wOdISDgo7quIG4pL6 -NRRYZvWS/YimY59HFdBC9GJbVlPULLOHPWhKEeejky2FjjFwDB/5lTS2sO8/cMBO -/gQX/JZhA//UqWLWBjTXzKeitye53yF0wSLVzFKYu8mQpydpAtFpyMx1Zn8VHpOK -wSxsr8yXjVn0DloIxaHWNm43FOcNNiZEz8QgmizYxfmCzbjNkLYcyUmzylWXG/YL -bYVMk+RyQhu1MASjQn5pxI6W6mP7Eb2ZN+E89GA4MtFHr7sNV1yKA4ur2HpGUy6m -I+mhk3iMMVqyQhLykLSs1FZ0rfEIqY0ZQmNFnXwpQRNPrMDlznxGZHfi2mohXXuQ -UNS2kuWJCqqz5qxvLcLjTJiN2zw9bAs0e4nAqSRMw+VAGtgGOaKEzJJXFrFBWgyF -o6qmb7U66V0sK3lb3lW1BxNXKscrKg3bZZkKFvgE3lxlyZsswm2IhTTkm3X1Zgdl -UTbxo1FOnkqllUt0uKmmjxxL4ybHSSVClL9hJH4ixbGxcIT/aQkxrZPKBT66vp2D -AqtR5GFM54simCkhlRqv7H3EuCIkRPYedRf2u9KsYSveZorAF+r24MCE8HBr+5jM -zXhNtY3U1EYGqHoIqgsHxyJmlnetEmyWuux5AEhRpnVBu3Qnf9g= -=phCq ------END PGP SIGNATURE----- diff --git a/libreoffice-6.3.1.1.tar.xz b/libreoffice-6.3.1.1.tar.xz new file mode 100644 index 0000000..5eceb42 --- /dev/null +++ b/libreoffice-6.3.1.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:306e6f7d61aad09b5b9d83591ded0f220e5a9fe96b5f189d5a05185c4107437c +size 224642560 diff --git a/libreoffice-6.3.1.1.tar.xz.asc b/libreoffice-6.3.1.1.tar.xz.asc new file mode 100644 index 0000000..87c4b45 --- /dev/null +++ b/libreoffice-6.3.1.1.tar.xz.asc @@ -0,0 +1,16 @@ +-----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----- diff --git a/libreoffice-help-6.3.0.4.tar.xz b/libreoffice-help-6.3.0.4.tar.xz deleted file mode 100644 index f2b69ad..0000000 --- a/libreoffice-help-6.3.0.4.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9f5c5dac7e6d4fafe8b7e14d8b67454e4773cd0696be967cef7b97f33fc72bf1 -size 13191436 diff --git a/libreoffice-help-6.3.0.4.tar.xz.asc b/libreoffice-help-6.3.0.4.tar.xz.asc deleted file mode 100644 index 896bb2c..0000000 --- a/libreoffice-help-6.3.0.4.tar.xz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAl1JwoQACgkQ9DSh76/u -rqOebBAAmNy/uupc/v3BLwIMZw6ZjT6kmi9h+ZAZdJJgTsScf1B0R4pgeV0TNrne -s6qrgCo2A6UL4lirZ6aRx73N7sKtVPCQto0X3pSD+fVhyAgM1s0GMJV82LQQLAxU -Wm1K8tIAAtujdPSBm6yQv87J4qL2O6xiqR+PT6G/DdAJ+dIPX5LRbsQAQr/GGYxp -07BkodDBcM8efbLdY9/FIMx4nGuu7B+XmotRbPMEy49foYKkmSafkS/0xXPKI60R -SoI2w0vCqhWqw7ffMMdyrKDxdsNUfX31bSdZPoZklwGuXYPRemvayf+RIhgUh0ps -bXLbc7DLKsvPHA4TIkPI9N2zHhBkD0EXugKl0lwUPGmABhLvqJbMty0KwTDWazxq -tlijbCBpM7Uf1mr3q7Gknp+Ej3VP+2l1hSIyYxv/cAnevM8LAU53rYf2XyA72lrX -8bKVoBw9lbb+6EHLsbT+mCIqyW5VpvkxKE0sy0wi3EuUbRx5s/0H1aDMGFhI6czc -DxOOkFSCRomgqN98Xsr1wgawUxtc0iqo8j7ROCTncBg4TgsXmG/wonR8x0HKsMfq -CqTChi181/SZmwpdiIYHENZAM4e7qtaD0zqPK4ctB7pphUAFcnWb2h7FUfU1WtR4 -QaZIkYABcO9mW03V5ucz7EFpylx9JACh74r9EpCwGJhBtizIuJ8= -=PY2j ------END PGP SIGNATURE----- diff --git a/libreoffice-help-6.3.1.1.tar.xz b/libreoffice-help-6.3.1.1.tar.xz new file mode 100644 index 0000000..e003b27 --- /dev/null +++ b/libreoffice-help-6.3.1.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:eadd13a3341c2241db6a345139294d56b1bb408b2d08a2554cfa5aed864c8586 +size 13191792 diff --git a/libreoffice-help-6.3.1.1.tar.xz.asc b/libreoffice-help-6.3.1.1.tar.xz.asc new file mode 100644 index 0000000..8a567d2 --- /dev/null +++ b/libreoffice-help-6.3.1.1.tar.xz.asc @@ -0,0 +1,16 @@ +-----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----- diff --git a/libreoffice-translations-6.3.0.4.tar.xz b/libreoffice-translations-6.3.0.4.tar.xz deleted file mode 100644 index c648418..0000000 --- a/libreoffice-translations-6.3.0.4.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:090098f72f2c153ee361e9a01f7b2593b0447e93bf4d694a130b803c0577601c -size 146252828 diff --git a/libreoffice-translations-6.3.0.4.tar.xz.asc b/libreoffice-translations-6.3.0.4.tar.xz.asc deleted file mode 100644 index 92b2e08..0000000 --- a/libreoffice-translations-6.3.0.4.tar.xz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAl1JwoUACgkQ9DSh76/u -rqPoFQ/9FdehUSphZxeiclnzKXBoF1YEs+hvq+k4sDwUEfE2lJulZAlahJbFAYWP -goMTIwAmHTR3jhaRt4V8sldDFSEo80s9y+GBXjVyEmeorZcr+yEqfy/YIW4JlwpO -25fujPkUcDDnjcgQ57Q9NdgxwgmU7WYd3NsSN7XCjL7gHEs4ubQrkR6h4A2UF72w -kS6XcxL3xZl0dNetMVX0/bu/n8OwJtRR3wiPRePatNBXFGmqgtKBhYUAXJFNbNWy -k1TFnfCgDB+nQRVyskQoE8w36eZwHuqmRhTsJG/gOITvOo/AV9kbqgIPXVg04iP9 -GlJczl7RlH1SiJxMCj+Snva/jvTdvZDJEVSIooVz6ZSc6gUfccY1xxeMm/9TC8JY -NEHrnDwzRlQni/nIsBwctZPcrfMHARUdJVMug3vPglsqy08ZSaVtGwK9UoKG9/E1 -Hvc8JDVe3sPL3vHaxrCoQKcCX9PuhoS1jp7FW7ujiSOf74ShOVY8zAmEum/RuS/u -AOF8AeuqERPOlfzDjuhwZmFKcRv8qu95JtlzQCrH1LWWoqUemxTQsp5Zsh+hQBO8 -bMO+bsuZPg7AhP+cnFFO/JxTli2G5TBBwQVoWYqogGozzWxlBxboqhTw9DMC6PNx -UGfKvOKdjgQbOrh4FrSRf9r4wvEAb4P1TKy+n9brUeBsZxchSY0= -=wxx2 ------END PGP SIGNATURE----- diff --git a/libreoffice-translations-6.3.1.1.tar.xz b/libreoffice-translations-6.3.1.1.tar.xz new file mode 100644 index 0000000..8e78e97 --- /dev/null +++ b/libreoffice-translations-6.3.1.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1c7f4f1412351c1d9d87d346097c730aeed61595450d5e875a8d9120765cd993 +size 146287660 diff --git a/libreoffice-translations-6.3.1.1.tar.xz.asc b/libreoffice-translations-6.3.1.1.tar.xz.asc new file mode 100644 index 0000000..cccb7c8 --- /dev/null +++ b/libreoffice-translations-6.3.1.1.tar.xz.asc @@ -0,0 +1,16 @@ +-----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----- diff --git a/libreoffice.changes b/libreoffice.changes index 10fe929..73f5dea 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,29 @@ +------------------------------------------------------------------- +Thu Aug 29 01:37:24 UTC 2019 - Tomáš Chvátal + +- Update to 6.3.1.1: + * 6.3.1 RC1 +- Remove merged patch: + * gcc.patch + +------------------------------------------------------------------- +Fri Aug 23 07:36:16 UTC 2019 - Tomáš Chvátal + +- Add one more patch for the old boost: + * old-boost2.patch + +------------------------------------------------------------------- +Tue Aug 20 10:27:08 UTC 2019 - Tomáš Chvátal + +- Add patch to fix building on SLE12: + * old-boost.patch + +------------------------------------------------------------------- +Mon Aug 19 11:49:21 UTC 2019 - Tomáš Chvátal + +- Add patch to fix build with SLE12 boost: + * 0001-Fix-buidling-with-older-boost.patch + ------------------------------------------------------------------- Fri Aug 16 11:43:53 UTC 2019 - Tomáš Chvátal diff --git a/libreoffice.spec b/libreoffice.spec index fd40b9a..322efac 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -52,7 +52,7 @@ %bcond_with gtk3 %endif Name: libreoffice -Version: 6.3.0.4 +Version: 6.3.1.1 Release: 0 Summary: A Free Office Suite (Framework) License: LGPL-3.0-or-later AND MPL-2.0+ @@ -100,8 +100,10 @@ Patch1: scp2-user-config-suse.diff # FIXME: the right fix is to compile the help and produce the .db_, .ht_, and other files Patch2: nlpsolver-no-broken-help.diff Patch3: mediawiki-no-broken-help.diff -Patch4: gcc.patch 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 @@ -985,8 +987,10 @@ Provides %{langname} translations and additional resources (help files, etc.) fo %endif # Leap 42/SLE-12 %patch2 %patch3 -%patch4 -p1 %patch5 -p1 +%patch6 -p1 +%patch7 -p1 +%patch8 -p1 %patch990 -p1 %patch991 -p1 diff --git a/old-boost.patch b/old-boost.patch new file mode 100644 index 0000000..eca5324 --- /dev/null +++ b/old-boost.patch @@ -0,0 +1,13 @@ +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) + { diff --git a/old-boost2.patch b/old-boost2.patch new file mode 100644 index 0000000..ff9efbe --- /dev/null +++ b/old-boost2.patch @@ -0,0 +1,94 @@ +From e63ec6c40c9cb6a265c2060c28491405413b3200 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= +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 tabGuard; ++ std::list rowGuard; ++#else + boost::optional tabGuard; + boost::optional rowGuard; ++#endif + SwFlowFrame* pThis = bCnt ? static_cast(this) : nullptr; + + if ( bTab ) + { + #if BOOST_VERSION < 105600 +- tabGuard.reset(static_cast(this)); // tdf#125741 ++ tabGuard.emplace_back(static_cast(this)); // tdf#125741 + #else + tabGuard.emplace(static_cast(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 g; ++#else + ::boost::optional 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 +