diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-11-26 13:18:04 +0000 |
|---|---|---|
| committer | Michael Stahl <Michael.Stahl@cib.de> | 2019-08-01 15:57:18 +0200 |
| commit | 07557c923b0bd5b500930d1eda97ec00c469300d (patch) | |
| tree | 088ee54a47bbd182b9d4c579518330c20923ed6d /filter | |
| parent | e7e251c368f53a09f1f1b0ccfde3ddf1d681c91b (diff) | |
ofz#4435 Bad-cast
Change-Id: Ie0364c758af84097cee93e4f6c5e8af2816359d4
Reviewed-on: https://gerrit.libreoffice.org/45287
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
(cherry picked from commit cd1613eb5fcdd7f5a1176a3f8c4be9447b97c5b1)
Diffstat (limited to 'filter')
| -rw-r--r-- | filter/source/msfilter/msdffimp.cxx | 24 |
1 files changed, 16 insertions, 8 deletions
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<SdrObjGroup*>(pRet)->GetSubList() ) + if (pTmp) { - static_cast<SdrObjGroup*>(pRet)->GetSubList()->NbcInsertObject( pTmp ); - if( nShapeId ) - insertShapeId( nShapeId, pTmp ); + SdrObjGroup* pGroup = dynamic_cast<SdrObjGroup*>(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<SdrObjGroup*>(pRet)->GetSubList()) + if (pTmp) { - static_cast<SdrObjGroup*>(pRet)->GetSubList()->NbcInsertObject( pTmp ); - if( nShapeId ) - insertShapeId( nShapeId, pTmp ); + SdrObjGroup* pGroup = dynamic_cast<SdrObjGroup*>(pRet); + if (pGroup && pGroup->GetSubList()) + { + pGroup->GetSubList()->NbcInsertObject(pTmp); + if (nShapeId) + insertShapeId(nShapeId, pTmp); + } } } if (!aRecHd2.SeekToEndOfRecord(rSt)) |