diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2014-04-29 12:58:56 +0100 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2014-05-03 06:40:59 +0000 |
| commit | 8ff260e47873674ca03a334f6b3198d66dc68db7 (patch) | |
| tree | d4ad175a266d5b3540c7182aa4324f0db4e0ad67 | |
| parent | 7fb9252b7f1f060d7afa6f3959be2f25a46e096c (diff) | |
fix crash found when exploring fdo#50697
(cherry picked from commit b25871da62facc20387ebfa2b908422578ca8ce9)
Conflicts:
sw/source/core/frmedt/fefly1.cxx
Change-Id: Ie781c2534cb41104dd3d91d4370639e98baa8112
Reviewed-on: https://gerrit.libreoffice.org/9202
Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
| -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 1931c734c3b7..025c7526613e 100644 --- a/sw/source/core/frmedt/fefly1.cxx +++ b/sw/source/core/frmedt/fefly1.cxx @@ -342,10 +342,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, sal_False ); + SwCntntNode *pNd = aPos.nNode.GetNode().GetCntntNode(); + pTxtFrm = pNd ? pNd->getLayoutFrm(GetLayout(), &aTmpPos, 0, sal_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; |