sw/source/core/layout/frmtool.cxx | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
New commits:
commit f4b1a8d8df9c104bfe360aabb4d248f3c8e951f7
Author: Caolán McNamara <caol...@redhat.com>
Date: Fri Dec 8 09:59:49 2017 +0000
crashtesting: crash on import of ooo33887.sxw
since
commit a172f854b6e1d61bf0fe0fe4efc3058bb7a760bf
Date: Sun Dec 3 21:00:37 2017 +0100
tdf#74693: Footnotes text appearing above footnote separator line
When invalidate a footnoteframe, invalidate also the lower textframe,
so it will be recalculated before text rendering.
Change-Id: I95aec5e86bc53126de71bdebe7fbfada955be9c9
Reviewed-on: https://gerrit.libreoffice.org/46085
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
(cherry picked from commit a691cd7aa651f552a167d048273f1471c00c93da)
Reviewed-on: https://gerrit.libreoffice.org/46090
Tested-by: Thorsten Behrens <thorsten.behr...@cib.de>
Reviewed-by: Thorsten Behrens <thorsten.behr...@cib.de>
diff --git a/sw/source/core/layout/frmtool.cxx
b/sw/source/core/layout/frmtool.cxx
index f94b859474ed..61a9162ff5b8 100644
--- a/sw/source/core/layout/frmtool.cxx
+++ b/sw/source/core/layout/frmtool.cxx
@@ -562,8 +562,11 @@ SwLayNotify::~SwLayNotify()
if ( bPos && pLay->Lower() && !IsLowersComplete() )
{
pLay->Lower()->InvalidatePos();
- if(pLay->Lower()->IsFootnoteFrame())
-
static_cast<SwFootnoteFrame*>(pLay->Lower())->Lower()->InvalidatePos();
+ SwFootnoteFrame* pFtnFrame = pLay->Lower()->IsFootnoteFrame() ?
+ static_cast<SwFootnoteFrame*>(pLay->Lower()) : nullptr;
+ SwFrame* pFtnLower = pFtnFrame ? pFtnFrame->Lower() : nullptr;
+ if (pFtnLower)
+ pFtnLower->InvalidatePos();
}
if ( bPrtPos )
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
