sw/source/core/layout/calcmove.cxx | 8 ++++++++ sw/source/core/layout/flowfrm.cxx | 4 ++++ 2 files changed, 12 insertions(+)
New commits: commit 35208b451b5d8bdf496f83dd8acaf5917131b50b Author: Tomáš Chvátal <[email protected]> AuthorDate: Mon Aug 19 13:30:23 2019 +0200 Commit: Andras Timar <[email protected]> CommitDate: Thu Aug 29 11:33:04 2019 +0200 Fix buidling with older boost Change-Id: I49691e8bf708aa9146d5c4f61532e7a215f4ac2d Reviewed-on: https://gerrit.libreoffice.org/77716 Reviewed-by: Tomáš Chvátal <[email protected]> Tested-by: Tomáš Chvátal <[email protected]> Reviewed-by: Caolán McNamara <[email protected]> Tested-by: Caolán McNamara <[email protected]> Reviewed-on: https://gerrit.libreoffice.org/77922 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Andras Timar <[email protected]> diff --git a/sw/source/core/layout/calcmove.cxx b/sw/source/core/layout/calcmove.cxx index 8ae94ce1fe7b..2f700131c2a9 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()); } } _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
