sw/source/filter/ww8/wrtw8esh.cxx | 4 ++++
1 file changed, 4 insertions(+)
New commits:
commit ffb06e5eaadabf2d80277a3f8808957fca8b3b0e
Author: Michael Stahl <mst...@redhat.com>
Date: Tue Oct 9 13:32:15 2012 +0200
fdo#54648: WW8 export: test that FlyFrm actually has layout frm
The bugdoc has 2 "hidden" drawing objects that are invisible.
Change-Id: I58179f2e620348db5357b38f834e1edca1f20ae2
(cherry picked from commit c1d2eed375293d7c27bb885f344cc24ec0cd40ca)
Reviewed-on: https://gerrit.libreoffice.org/845
Reviewed-by: Muthu Subramanian K <muthus...@gmail.com>
Reviewed-by: Miklos Vajna <vmik...@suse.cz>
Tested-by: Miklos Vajna <vmik...@suse.cz>
diff --git a/sw/source/filter/ww8/wrtw8esh.cxx
b/sw/source/filter/ww8/wrtw8esh.cxx
index cfaf64b..88055d2 100644
--- a/sw/source/filter/ww8/wrtw8esh.cxx
+++ b/sw/source/filter/ww8/wrtw8esh.cxx
@@ -1665,6 +1665,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)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
