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

@@ -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

@@ -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);