[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - sw/source

[Tomáš Chvátal (via logerrit)]

 sw/source/core/layout/calcmove.cxx |    8 ++++++++
 sw/source/core/layout/flowfrm.cxx  |    4 ++++
 2 files changed, 12 insertions(+)

New commits:
commit 3dd86101182543dcbad4df0c2e746ede26f1cbbb
Author:     Tomáš Chvátal <tchvatal at suse.com>
AuthorDate: Mon Aug 19 13:30:23 2019 +0200
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Tue Aug 20 11:15:44 2019 +0200

    Fix buidling with older boost
    
    Change-Id: I49691e8bf708aa9146d5c4f61532e7a215f4ac2d
    Reviewed-on: https://gerrit.libreoffice.org/77716
    Reviewed-by: Tomáš Chvátal <tchvatal at suse.com>
    Tested-by: Tomáš Chvátal <tchvatal at suse.com>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

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());
                 }
             }