summaryrefslogtreecommitdiff
path: root/sw/source/core/layout/ssfrm.cxx
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2019-07-19 16:56:12 +0100
committerCaolán McNamara <caolanm@redhat.com>2019-07-21 18:17:16 +0200
commit135c1d6d0acd7270237f0a2410507114e7c14129 (patch)
tree118c5b27864128ea3bcd1c3614f42bfa4f21b4b1 /sw/source/core/layout/ssfrm.cxx
parent01782ecd9fb1e712925cdeb29694faad3c6beed7 (diff)
crashtesting: failures on swfootnoteframe_colunlock_heap_use_after_free.sample
undo forcepoint80 hackery and try a different solution Change-Id: I52b5f9b41074e122bd32e70967e198ce9f86aec7 Reviewed-on: https://gerrit.libreoffice.org/76072 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sw/source/core/layout/ssfrm.cxx')
-rw-r--r--sw/source/core/layout/ssfrm.cxx41
1 files changed, 1 insertions, 40 deletions
diff --git a/sw/source/core/layout/ssfrm.cxx b/sw/source/core/layout/ssfrm.cxx
index 8ff47322e0c0..043752c6d9e9 100644
--- a/sw/source/core/layout/ssfrm.cxx
+++ b/sw/source/core/layout/ssfrm.cxx
@@ -469,33 +469,6 @@ void SwTextFrame::RegisterToNode(SwTextNode & rNode, bool const isForceNodeAsFir
}
}
-//Flag pFrame for SwFrameDeleteGuard lifetime that we shouldn't delete
-//it in e.g. SwSectionFrame::MergeNext etc because we will need it
-//again after the SwFrameDeleteGuard dtor
-SwFrameDeleteGuard::SwFrameDeleteGuard(SwFrame* pFrame)
- : m_pForbidFrame((pFrame && !pFrame->IsDeleteForbidden()) ? pFrame : nullptr)
-{
- if (m_pForbidFrame)
- {
- m_pForbidFrame->ForbidDelete();
- }
-}
-
-SwFrameDeleteGuard::~SwFrameDeleteGuard()
-{
- if (m_pForbidFrame)
- {
- const bool bLogicErrorThrown = !m_pForbidFrame->IsDeleteForbidden();
- if (bLogicErrorThrown)
- {
- // see testForcepoint80
- SwFrame::DestroyFrame(m_pForbidFrame);
- return;
- }
- m_pForbidFrame->AllowDelete();
- }
-}
-
void SwLayoutFrame::DestroyImpl()
{
while (!m_VertPosOrientFramesFor.empty())
@@ -510,7 +483,6 @@ void SwLayoutFrame::DestroyImpl()
if( GetFormat() && !GetFormat()->GetDoc()->IsInDtor() )
{
- bool bFatalError = false;
while ( pFrame )
{
//First delete the Objs of the Frame because they can't unregister
@@ -549,20 +521,9 @@ void SwLayoutFrame::DestroyImpl()
}
}
pFrame->RemoveFromLayout();
- // see testForcepoint80
- if (pFrame->IsDeleteForbidden())
- {
- pFrame->AllowDelete();
- bFatalError = true;
- }
- else
- SwFrame::DestroyFrame(pFrame);
+ SwFrame::DestroyFrame(pFrame);
pFrame = m_pLower;
}
-
- if (bFatalError)
- throw std::logic_error("DeleteForbidden");
-
//Delete the Flys, the last one also deletes the array.
while ( GetDrawObjs() && GetDrawObjs()->size() )
{