diff options
| -rw-r--r-- | sw/source/core/crsr/findtxt.cxx | 4 | ||||
| -rw-r--r-- | sw/source/core/inc/txtfrm.hxx | 7 |
2 files changed, 11 insertions, 0 deletions
diff --git a/sw/source/core/crsr/findtxt.cxx b/sw/source/core/crsr/findtxt.cxx index f45516361c2d..03239dfb1063 100644 --- a/sw/source/core/crsr/findtxt.cxx +++ b/sw/source/core/crsr/findtxt.cxx @@ -152,7 +152,11 @@ 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 9af04de107a5..bf4c0ad8a316 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; } } @@ -980,8 +982,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); |