sfx2/source/doc/objstor.cxx | 2 +- sw/source/core/layout/objectformattertxtfrm.cxx | 1 + sw/source/core/layout/ssfrm.cxx | 3 +++ 3 files changed, 5 insertions(+), 1 deletion(-)
New commits: commit 1440777eec33f59dc1c8a2fe9e5b46a5fe08da1b Author: Caolán McNamara <caol...@redhat.com> AuthorDate: Wed Oct 10 17:21:06 2018 +0100 Commit: Caolán McNamara <caol...@redhat.com> CommitDate: Wed Oct 10 21:23:04 2018 +0200 forcepoint#74 crash in layout Change-Id: Iad5770b512d7c49483ac823aa4f51212f281bbca Reviewed-on: https://gerrit.libreoffice.org/61628 Reviewed-by: Caolán McNamara <caol...@redhat.com> Tested-by: Caolán McNamara <caol...@redhat.com> diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx index d8deaf5df902..9ff4ce357c2b 100644 --- a/sfx2/source/doc/objstor.cxx +++ b/sfx2/source/doc/objstor.cxx @@ -2442,7 +2442,7 @@ bool SfxObjectShell::ExportTo( SfxMedium& rMedium ) } return xFilter->filter( aArgs ); - }catch(const uno::Exception&) + }catch(...) {} } diff --git a/sw/source/core/layout/objectformattertxtfrm.cxx b/sw/source/core/layout/objectformattertxtfrm.cxx index 341c7845a10e..8e73cfc2a2f9 100644 --- a/sw/source/core/layout/objectformattertxtfrm.cxx +++ b/sw/source/core/layout/objectformattertxtfrm.cxx @@ -702,6 +702,7 @@ void SwObjectFormatterTextFrame::FormatAnchorFrameAndItsPrevs( SwTextFrame& _rAn } if ( pSectFrame && pSectFrame->IsSctFrame() ) { + SwFrameDeleteGuard aDeleteGuard(&_rAnchorTextFrame); // #i44049# _rAnchorTextFrame.LockJoin(); SwFrame* pFrame = pSectFrame->GetUpper()->GetLower(); diff --git a/sw/source/core/layout/ssfrm.cxx b/sw/source/core/layout/ssfrm.cxx index 8550f4a7f4f6..47e5b598b99b 100644 --- a/sw/source/core/layout/ssfrm.cxx +++ b/sw/source/core/layout/ssfrm.cxx @@ -517,6 +517,9 @@ void SwLayoutFrame::DestroyImpl() } } pFrame->RemoveFromLayout(); + //forcepoint#74, testcase swanchoredobject_considerobjwrapinfluenceonobjpos + if (pFrame->IsDeleteForbidden()) + throw std::logic_error("DeleteForbidden"); SwFrame::DestroyFrame(pFrame); pFrame = m_pLower; } _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits