rpm/libreoffice
SHA256
1
0
Fork 0
forked from pool/libreoffice
Code Pull Requests Activity

OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=818

Browse Source
This commit is contained in:
Tomáš Chvátal 2019-08-23 07:51:52 +00:00 committed by Git OBS Bridge
parent 19c487de72
commit fb3c06f3da
1 changed files with 28 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
old-boost2.patch
View File

@ -1,18 +1,30 @@
From e63ec6c40c9cb6a265c2060c28491405413b3200 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.com>
Date: Fri, 23 Aug 2019 09:44:01 +0200
Subject: [PATCH] Fix old boost build for good
With the previous approach the code could lead to crashes in
the flowfrm.cxx
Change-Id: I3b56ed46db9d37a606a1cd793a20b8aff22db6e2
---
sw/source/core/inc/frame.hxx | 5 +++++
sw/source/core/layout/calcmove.cxx | 9 +++++++--
sw/source/core/layout/flowfrm.cxx | 6 +++++-
3 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/sw/source/core/inc/frame.hxx b/sw/source/core/inc/frame.hxx
index 6e0d653690c4..52a68b3b995d 100644
index ab1047d0348f..312957a02593 100644
--- a/sw/source/core/inc/frame.hxx
+++ b/sw/source/core/inc/frame.hxx
@@ -1245,11 +1245,15 @@ public:
m_pForbidFrame->ForbidDelete();
}
@@ -1238,7 +1238,12 @@ public:
//it in e.g. SwSectionFrame::MergeNext etc because we will need it
//again after the SwFrameDeleteGuard dtor
explicit SwFrameDeleteGuard(SwFrame* pFrame);
+
+ SwFrameDeleteGuard(const SwFrameDeleteGuard&) =delete;
+
~SwFrameDeleteGuard()
{
if (m_pForbidFrame)
m_pForbidFrame->AllowDelete();
}
~SwFrameDeleteGuard();
+
+ SwFrameDeleteGuard& operator=(const SwFrameDeleteGuard&) =delete;
};
@ -53,10 +65,10 @@ index 3502450c2a47..cb956d8f916c 100644
rowGuard.emplace(this); // tdf#125741 keep this alive
#endif
diff --git a/sw/source/core/layout/flowfrm.cxx b/sw/source/core/layout/flowfrm.cxx
index ea9df3300d11..c7cfd3006f06 100644
index 54f0bdd4e567..fb87c6025061 100644
--- a/sw/source/core/layout/flowfrm.cxx
+++ b/sw/source/core/layout/flowfrm.cxx
@@ -2523,7 +2523,11 @@ bool SwFlowFrame::MoveBwd( bool &rbReformat )
@@ -2522,7 +2522,11 @@ bool SwFlowFrame::MoveBwd( bool &rbReformat )
{
auto const pOld = m_rThis.GetUpper();
@ -68,7 +80,7 @@ index ea9df3300d11..c7cfd3006f06 100644
if (m_rThis.GetUpper()->IsCellFrame())
{
// note: IsFollowFlowRow() is never set for new-style tables
@@ -2534,7 +2538,7 @@ bool SwFlowFrame::MoveBwd( bool &rbReformat )
@@ -2533,7 +2537,7 @@ bool SwFlowFrame::MoveBwd( bool &rbReformat )
{
// lock follow-flow-row (similar to sections above)
#if BOOST_VERSION < 105600
@ -77,3 +89,6 @@ index ea9df3300d11..c7cfd3006f06 100644
#else
g.emplace(m_rThis.GetUpper()->GetUpper());
#endif
--
2.22.0