Kaydet (Commit) b25871da authored tarafından Caolán McNamara's avatar Caolán McNamara

fix crash found when exploring fdo#50697

Change-Id: Ie781c2534cb41104dd3d91d4370639e98baa8112
üst f670aaaa
......@@ -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;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment