sw/source/core/layout/frmtool.cxx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
New commits: commit e5321eba2ddf439ac9e066365b53e5fc772d8b4c Author: Mike Kaganski <mike.kagan...@collabora.com> AuthorDate: Sun Apr 28 16:23:36 2019 +0200 Commit: Mike Kaganski <mike.kagan...@collabora.com> CommitDate: Sun Apr 28 18:07:59 2019 +0200 Remove unneeded check See commit 60dca2de31ad6a187e35b3a2d751ea674f7f0d9d, which converted preceeding OSL_ENSURE into asserts - so nullptr is considered impossible here. Change-Id: Ia6d8f226d94c84a66bad67ce1b5f702864d61fdc Reviewed-on: https://gerrit.libreoffice.org/71475 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com> diff --git a/sw/source/core/layout/frmtool.cxx b/sw/source/core/layout/frmtool.cxx index 8e7c4a3700ff..b5e458e5c24d 100644 --- a/sw/source/core/layout/frmtool.cxx +++ b/sw/source/core/layout/frmtool.cxx @@ -1640,8 +1640,7 @@ void InsertCnt_( SwLayoutFrame *pLay, SwDoc *pDoc, //Close the section, where appropriate activate the surrounding //section again. - SwActualSection *pActualSectionUpper1 = pActualSection ? pActualSection->GetUpper() : nullptr; - pActualSection.reset(pActualSectionUpper1); + pActualSection.reset(pActualSection->GetUpper()); pLay = pLay->FindSctFrame(); if ( pActualSection ) { _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits