diff options
-rw-r--r-- | sd/qa/unit/data/ppt/pass/ofz21531-1.ppt | bin | 0 -> 35567 bytes | |||
-rw-r--r-- | sd/source/core/sdpage2.cxx | 4 |
2 files changed, 3 insertions, 1 deletions
diff --git a/sd/qa/unit/data/ppt/pass/ofz21531-1.ppt b/sd/qa/unit/data/ppt/pass/ofz21531-1.ppt Binary files differnew file mode 100644 index 000000000000..0d93e5b845ff --- /dev/null +++ b/sd/qa/unit/data/ppt/pass/ofz21531-1.ppt diff --git a/sd/source/core/sdpage2.cxx b/sd/source/core/sdpage2.cxx index 35dd423e2372..d6b29fa96594 100644 --- a/sd/source/core/sdpage2.cxx +++ b/sd/source/core/sdpage2.cxx @@ -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 |