sw/source/core/crsr/findtxt.cxx | 4 ---- sw/source/core/inc/txtfrm.hxx | 5 ----- sw/source/core/layout/calcmove.cxx | 13 ------------- sw/source/core/layout/flowfrm.cxx | 8 -------- 4 files changed, 30 deletions(-)
New commits: commit 7190e6f114eccd921e6cb6beef793b053cf50856 Author: Stephan Bergmann <sberg...@redhat.com> AuthorDate: Fri Nov 5 08:22:35 2021 +0100 Commit: Stephan Bergmann <sberg...@redhat.com> CommitDate: Fri Nov 5 10:09:01 2021 +0100 Remove conditional code for Boost < 1.56.0 ...after 0b9a6cfc443d84158fb0db6f40b953e1410178d8 "Set Boost baseline to 1.66, and enforce it" Change-Id: I3cb2c7916983c185298d4221b06f268ae70ed6a6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124727 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sberg...@redhat.com> diff --git a/sw/source/core/crsr/findtxt.cxx b/sw/source/core/crsr/findtxt.cxx index f4ecf1eafce6..6e29c3614e55 100644 --- a/sw/source/core/crsr/findtxt.cxx +++ b/sw/source/core/crsr/findtxt.cxx @@ -153,11 +153,7 @@ public: { if (pFrame) { -#if BOOST_VERSION < 105600 - m_oMergedIter.reset(*pFrame); -#else m_oMergedIter.emplace(*pFrame); -#endif } } diff --git a/sw/source/core/inc/txtfrm.hxx b/sw/source/core/inc/txtfrm.hxx index fa1d9be39a0f..f1016eb9a1e0 100644 --- a/sw/source/core/inc/txtfrm.hxx +++ b/sw/source/core/inc/txtfrm.hxx @@ -984,13 +984,8 @@ struct MergedPara class MergedAttrIterBase { protected: -#if BOOST_VERSION < 105600 - sw::MergedPara const* m_pMerged; - SwTextNode const* m_pNode; -#else sw::MergedPara const*const m_pMerged; SwTextNode const*const m_pNode; -#endif size_t m_CurrentExtent; size_t m_CurrentHint; MergedAttrIterBase(SwTextFrame const& rFrame); diff --git a/sw/source/core/layout/calcmove.cxx b/sw/source/core/layout/calcmove.cxx index a87b50adcae4..1bc2506a72f4 100644 --- a/sw/source/core/layout/calcmove.cxx +++ b/sw/source/core/layout/calcmove.cxx @@ -409,31 +409,18 @@ void SwFrame::PrepareCursor() const bool bTab = IsTabFrame(); bool bNoSect = IsInSct(); -#if BOOST_VERSION < 105600 - std::list<FlowFrameJoinLockGuard> tabGuard; - std::list<SwFrameDeleteGuard> rowGuard; -#else std::optional<FlowFrameJoinLockGuard> tabGuard; std::optional<SwFrameDeleteGuard> rowGuard; -#endif SwFlowFrame* pThis = bCnt ? static_cast<SwContentFrame*>(this) : nullptr; if ( bTab ) { -#if BOOST_VERSION < 105600 - tabGuard.emplace_back(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.emplace_back(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 2ad57e726bc8..53f3881f1d56 100644 --- a/sw/source/core/layout/flowfrm.cxx +++ b/sw/source/core/layout/flowfrm.cxx @@ -2618,11 +2618,7 @@ bool SwFlowFrame::MoveBwd( bool &rbReformat ) { auto const pOld = m_rThis.GetUpper(); -#if BOOST_VERSION < 105600 - std::list<SwFrameDeleteGuard> g; -#else ::std::optional<SwFrameDeleteGuard> g; -#endif if (m_rThis.GetUpper()->IsCellFrame()) { // note: IsFollowFlowRow() is never set for new-style tables @@ -2632,11 +2628,7 @@ bool SwFlowFrame::MoveBwd( bool &rbReformat ) && pTabFrame->GetFirstNonHeadlineRow() == m_rThis.GetUpper()->GetUpper()) { // lock follow-flow-row (similar to sections above) -#if BOOST_VERSION < 105600 - g.emplace_back(m_rThis.GetUpper()->GetUpper()); -#else g.emplace(m_rThis.GetUpper()->GetUpper()); -#endif assert(m_rThis.GetUpper()->GetUpper()->IsDeleteForbidden()); } }