From 07557c923b0bd5b500930d1eda97ec00c469300d Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Sun, 26 Nov 2017 13:18:04 +0000 Subject: ofz#4435 Bad-cast Change-Id: Ie0364c758af84097cee93e4f6c5e8af2816359d4 Reviewed-on: https://gerrit.libreoffice.org/45287 Reviewed-by: Michael Stahl Tested-by: Michael Stahl (cherry picked from commit cd1613eb5fcdd7f5a1176a3f8c4be9447b97c5b1) --- filter/source/msfilter/msdffimp.cxx | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) (limited to 'filter') diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx index ebe09e3c614b..07c2fa852ea7 100644 --- a/filter/source/msfilter/msdffimp.cxx +++ b/filter/source/msfilter/msdffimp.cxx @@ -4104,11 +4104,15 @@ SdrObject* SvxMSDffManager::ImportGroup( const DffRecordHeader& rHd, SvStream& r return pRet; sal_Int32 nShapeId; SdrObject* pTmp = ImportGroup( aRecHd2, rSt, pClientData, aGroupClientAnchor, aGroupChildAnchor, nCalledByGroup + 1, &nShapeId ); - if ( pTmp && pRet && static_cast(pRet)->GetSubList() ) + if (pTmp) { - static_cast(pRet)->GetSubList()->NbcInsertObject( pTmp ); - if( nShapeId ) - insertShapeId( nShapeId, pTmp ); + SdrObjGroup* pGroup = dynamic_cast(pRet); + if (pGroup && pGroup->GetSubList()) + { + pGroup->GetSubList()->NbcInsertObject(pTmp); + if (nShapeId) + insertShapeId(nShapeId, pTmp); + } } } else if ( aRecHd2.nRecType == DFF_msofbtSpContainer ) @@ -4117,11 +4121,15 @@ SdrObject* SvxMSDffManager::ImportGroup( const DffRecordHeader& rHd, SvStream& r return pRet; sal_Int32 nShapeId; SdrObject* pTmp = ImportShape( aRecHd2, rSt, pClientData, aClientRect, aGlobalChildRect, nCalledByGroup + 1, &nShapeId ); - if ( pTmp && pRet && static_cast(pRet)->GetSubList()) + if (pTmp) { - static_cast(pRet)->GetSubList()->NbcInsertObject( pTmp ); - if( nShapeId ) - insertShapeId( nShapeId, pTmp ); + SdrObjGroup* pGroup = dynamic_cast(pRet); + if (pGroup && pGroup->GetSubList()) + { + pGroup->GetSubList()->NbcInsertObject(pTmp); + if (nShapeId) + insertShapeId(nShapeId, pTmp); + } } } if (!aRecHd2.SeekToEndOfRecord(rSt)) -- cgit v1.2.3