36ba140ae2
- old-boost.patch: update patch to fix build with Boost from SLE-12 OBS-URL: https://build.opensuse.org/request/show/686905 OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=774
57 lines
2.0 KiB
Diff
57 lines
2.0 KiB
Diff
Index: libreoffice-6.2.2.1/vcl/unx/gtk3_kde5/gtk3_kde5_filepicker_ipc.cxx
|
|
===================================================================
|
|
--- libreoffice-6.2.2.1.orig/vcl/unx/gtk3_kde5/gtk3_kde5_filepicker_ipc.cxx
|
|
+++ libreoffice-6.2.2.1/vcl/unx/gtk3_kde5/gtk3_kde5_filepicker_ipc.cxx
|
|
@@ -58,7 +58,7 @@ OUString applicationDirPath()
|
|
const auto utf8Path = applicationSystemPath.toUtf8();
|
|
auto ret = boost::filesystem::path(utf8Path.getStr(), utf8Path.getStr() + utf8Path.getLength());
|
|
ret.remove_filename();
|
|
- return OUString::fromUtf8(OString(ret.c_str(), ret.size()));
|
|
+ return OUString::fromUtf8(OString(ret.c_str(), strlen(ret.c_str())));
|
|
}
|
|
|
|
OUString findPickerExecutable()
|
|
Index: libreoffice-6.2.2.1/sw/source/core/crsr/findtxt.cxx
|
|
===================================================================
|
|
--- libreoffice-6.2.2.1.orig/sw/source/core/crsr/findtxt.cxx
|
|
+++ libreoffice-6.2.2.1/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
|
|
}
|
|
}
|
|
|
|
Index: libreoffice-6.2.2.1/sw/source/core/inc/txtfrm.hxx
|
|
===================================================================
|
|
--- libreoffice-6.2.2.1.orig/sw/source/core/inc/txtfrm.hxx
|
|
+++ libreoffice-6.2.2.1/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);
|