diff options
| author | Michael Stahl <mstahl@redhat.com> | 2012-10-09 13:32:15 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-10-09 18:00:36 +0200 |
| commit | c1d2eed375293d7c27bb885f344cc24ec0cd40ca (patch) | |
| tree | 4a5478773a3c4cef4cc054f469492790a900f443 /sw | |
| parent | remove some unnecessary headers (diff) | |
| download | core-c1d2eed375293d7c27bb885f344cc24ec0cd40ca.tar.gz core-c1d2eed375293d7c27bb885f344cc24ec0cd40ca.zip | |
fdo#54648: WW8 export: test that FlyFrm actually has layout frm
The bugdoc has 2 "hidden" drawing objects that are invisible.
Change-Id: I58179f2e620348db5357b38f834e1edca1f20ae2
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/filter/ww8/wrtw8esh.cxx | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sw/source/filter/ww8/wrtw8esh.cxx b/sw/source/filter/ww8/wrtw8esh.cxx index c71bae931b7d..6d8866804d11 100644 --- a/sw/source/filter/ww8/wrtw8esh.cxx +++ b/sw/source/filter/ww8/wrtw8esh.cxx @@ -1648,6 +1648,10 @@ bool lcl_isInHeader(const SwFrmFmt& rFmt) if (!pFlyFrmFmt) return false; SwFlyFrm* pFlyFrm = const_cast<SwFlyFrm*>(pFlyFrmFmt->GetFrm()); + if (!pFlyFrm) // fdo#54648: "hidden" drawing object has no layout frame + { + return false; + } SwPageFrm* pPageFrm = pFlyFrm->FindPageFrmOfAnchor(); SwFrm* pHeader = pPageFrm->Lower(); if (pHeader->GetType() == FRM_HEADER) |