mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

crashtesting: crash on import of ooo33887.sxw

Browse Source 
since

commit a172f854b6
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 <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
This commit is contained in:
Caolán McNamara
2017-12-08 09:59:49 +00:00
parent acebe3ea2b
commit a691cd7aa6
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sw/source/core/layout/frmtool.cxx
View File

@@ -547,8 +547,11 @@ SwLayNotify::~SwLayNotify()
if ( bPos && pLay->Lower() && !IsLowersComplete() ) if ( bPos && pLay->Lower() && !IsLowersComplete() )
{ {
pLay->Lower()->InvalidatePos(); pLay->Lower()->InvalidatePos();
if(pLay->Lower()->IsFootnoteFrame()) SwFootnoteFrame* pFtnFrame = pLay->Lower()->IsFootnoteFrame() ?
static_cast<SwFootnoteFrame*>(pLay->Lower())->Lower()->InvalidatePos(); static_cast<SwFootnoteFrame*>(pLay->Lower()) : nullptr;
SwFrame* pFtnLower = pFtnFrame ? pFtnFrame->Lower() : nullptr;
if (pFtnLower)
pFtnLower->InvalidatePos();
} }
if ( bPrtPos ) if ( bPrtPos )