diff options
| author | Tomáš Chvátal <tchvatal@suse.com> | 2019-08-23 09:44:01 +0200 |
|---|---|---|
| committer | Michael Stahl <Michael.Stahl@cib.de> | 2019-08-27 11:05:47 +0200 |
| commit | 3780d305ae1607458029af3c9452bad251490461 (patch) | |
| tree | a4b5561e5c4b0b55fb0b039bc40d169e9709f1c6 /sw/source/core/layout/flowfrm.cxx | |
| parent | ffad51e9e625a22f1efab3da7886baf4134b444f (diff) | |
Fix old boost build for good
With the previous approach the code could lead to crashes in
the flowfrm.cxx
Change-Id: I3b56ed46db9d37a606a1cd793a20b8aff22db6e2
Reviewed-on: https://gerrit.libreoffice.org/78001
Reviewed-by: Tomáš Chvátal <tchvatal@suse.com>
Tested-by: Tomáš Chvátal <tchvatal@suse.com>
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
Diffstat (limited to 'sw/source/core/layout/flowfrm.cxx')
| -rw-r--r-- | sw/source/core/layout/flowfrm.cxx | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sw/source/core/layout/flowfrm.cxx b/sw/source/core/layout/flowfrm.cxx index dbe7d9c7feec..77617dc5cfa9 100644 --- a/sw/source/core/layout/flowfrm.cxx +++ b/sw/source/core/layout/flowfrm.cxx @@ -2517,7 +2517,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 @@ -2528,7 +2532,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 |