diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2014-04-29 12:58:56 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-04-29 15:24:27 +0100 |
| commit | b25871da62facc20387ebfa2b908422578ca8ce9 (patch) | |
| tree | 56f8e2fcf19ec36ccd9984bb404bd3b088ef8aa4 /sw | |
| parent | f670aaaabf23f13ae5ebf61ba61824794137c597 (diff) | |
fix crash found when exploring fdo#50697
Change-Id: Ie781c2534cb41104dd3d91d4370639e98baa8112
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/core/frmedt/fefly1.cxx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sw/source/core/frmedt/fefly1.cxx b/sw/source/core/frmedt/fefly1.cxx index 1b41d1ebbccb..d46ba5a71c88 100644 --- a/sw/source/core/frmedt/fefly1.cxx +++ b/sw/source/core/frmedt/fefly1.cxx @@ -316,10 +316,11 @@ const SwFrmFmt* SwFEShell::IsFlyInFly() aPoint.setX(aPoint.getX() - 1); //do not land in the fly!! GetLayout()->GetCrsrOfst( &aPos, aPoint, &aState ); // determine text frame by left-top-corner of object - pTxtFrm = aPos.nNode.GetNode().GetCntntNode()->getLayoutFrm( GetLayout(), &aTmpPos, 0, false ); + SwCntntNode *pNd = aPos.nNode.GetNode().GetCntntNode(); + pTxtFrm = pNd ? pNd->getLayoutFrm(GetLayout(), &aTmpPos, 0, false) : NULL; } - const SwFrm *pTmp = ::FindAnchor( pTxtFrm, aTmpPos ); - const SwFlyFrm *pFly = pTmp->FindFlyFrm(); + const SwFrm *pTmp = pTxtFrm ? ::FindAnchor(pTxtFrm, aTmpPos) : NULL; + const SwFlyFrm *pFly = pTmp ? pTmp->FindFlyFrm() : NULL; if( pFly ) return pFly->GetFmt(); return NULL; |