summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomáš Chvátal <tchvatal@suse.com>2019-08-19 13:30:23 +0200
committerCaolán McNamara <caolanm@redhat.com>2019-08-20 11:15:44 +0200
commit3dd86101182543dcbad4df0c2e746ede26f1cbbb (patch)
treeba550351a32eb4a2cfe5a0e1766dd20a085518c4
parent52f7aa318722bd17c77ee5c4fa8307936e7b53af (diff)
Fix buidling with older boost
Change-Id: I49691e8bf708aa9146d5c4f61532e7a215f4ac2d Reviewed-on: https://gerrit.libreoffice.org/77716 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.cxx8
-rw-r--r--sw/source/core/layout/flowfrm.cxx4
2 files changed, 12 insertions, 0 deletions
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<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());
}
}