commit 0e4ea2d08a2bf7bda47815ed32b19e70c0d7e905
author Tomáš Chvátal <tchvatal@suse.com> Wed Mar 20 12:05:39 2019 +0100
committer Tomáš Chvátal <tchvatal@suse.cz> Fri Mar 22 11:44:11 2019 +0100
tree 341c0dbd9f2ff109cada66774f950cb65d6b0082
parent 2a41c31a0627bf752a625f23a64eaf4d3fe82fb9

Add few more fixes to build with Boost < 1.56

Change-Id: Ifbdbf7f2d44d569c491b1822d9d842433a9978a1
Reviewed-on: https://gerrit.libreoffice.org/69462
Tested-by: Jenkins
Reviewed-by: Tomáš Chvátal <tchvatal@suse.cz>

sw/source/core/crsr/findtxt.cxx

diff --git a/sw/source/core/crsr/findtxt.cxx b/sw/source/core/crsr/findtxt.cxx
index eeba141..8503a98 100644
--- a/sw/source/core/crsr/findtxt.cxx
+++ b/sw/source/core/crsr/findtxt.cxx
@@ -151,7 +151,11 @@ public:
    {
        if (pFrame)
        {
#if BOOST_VERSION < 105600
            m_oMergedIter.reset(*pFrame);
#else
            m_oMergedIter.emplace(*pFrame);
#endif
        }
    }

sw/source/core/inc/txtfrm.hxx

diff --git a/sw/source/core/inc/txtfrm.hxx b/sw/source/core/inc/txtfrm.hxx
index 4cf13bb..51eaf62 100644
--- a/sw/source/core/inc/txtfrm.hxx
+++ b/sw/source/core/inc/txtfrm.hxx
@@ -24,6 +24,8 @@
#include <ndtxt.hxx>
#include "TextFrameIndex.hxx"

#include <boost/version.hpp>

namespace com { namespace sun { namespace star { namespace linguistic2 { class XHyphenatedWord; } } } }

namespace sw { namespace mark { class IMark; } }
@@ -978,8 +980,13 @@ 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);