ofz#21531 limit to ord number under total obj count
which fails recently since... commitb74798941dAuthor: Julien Nabet <serval2412@yahoo.fr> Date: Mon Mar 30 09:42:08 2020 +0200 Simplify SdrObjList::GetObj (svx/svdpage) commit8bbd58eca1Date: Sun Mar 29 22:44:52 2020 +0200 Replace OSL_ASSERT by assert in GetObj (svx/svdpage) Change-Id: Ieaafe4af370ecb83a95246010f2a973f503d12c3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91422 Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Jenkins
This commit is contained in:
Binary file not shown.
@@ -367,9 +367,11 @@ void SdPage::lateInit(const SdPage& rSrcPage)
|
||||
|
||||
// use shape list directly to preserve constness of rSrcPage
|
||||
const std::list< SdrObject* >& rShapeList = rSrcPage.maPresentationShapeList.getList();
|
||||
const size_t nObjCount = GetObjCount();
|
||||
for( SdrObject* pObj : rShapeList )
|
||||
{
|
||||
InsertPresObj(GetObj(pObj->GetOrdNum()), rSrcPage.GetPresObjKind(pObj));
|
||||
size_t nOrdNum = pObj->GetOrdNum();
|
||||
InsertPresObj(nOrdNum < nObjCount ? GetObj(nOrdNum) : nullptr, rSrcPage.GetPresObjKind(pObj));
|
||||
}
|
||||
|
||||
// header footer
|
||||
|
||||
Reference in New Issue
Block a user