diff options
| author | Tomáš Chvátal <tchvatal@suse.com> | 2019-08-19 13:30:23 +0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2019-08-21 11:56:51 +0200 |
| commit | f8c14525575ccd030afb124b09490e5f8c6efe2c (patch) | |
| tree | 36d7ff635b2354845b58db55447016b615efe0ff | |
| parent | 5f7e50ec1583e8b0a3fa916c1e2f41cbd544ff07 (diff) | |
Fix buidling with older boost
Change-Id: I49691e8bf708aa9146d5c4f61532e7a215f4ac2d
Reviewed-on: https://gerrit.libreoffice.org/77715
Tested-by: Jenkins
Reviewed-by: Tomáš Chvátal <tchvatal@suse.com>
Tested-by: Tomáš Chvátal <tchvatal@suse.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | sw/source/core/layout/calcmove.cxx | 8 | ||||
| -rw-r--r-- | sw/source/core/layout/flowfrm.cxx | 4 |
2 files changed, 12 insertions, 0 deletions
diff --git a/sw/source/core/layout/calcmove.cxx b/sw/source/core/layout/calcmove.cxx index c142221cedc5..3502450c2a47 100644 --- a/sw/source/core/layout/calcmove.cxx +++ b/sw/source/core/layout/calcmove.cxx @@ -410,12 +410,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 6e1b40986f73..54f0bdd4e567 100644 --- a/sw/source/core/layout/flowfrm.cxx +++ b/sw/source/core/layout/flowfrm.cxx @@ -2532,7 +2532,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()); } } |