[Libreoffice-commits] core.git: Branch 'private/swe/libreoffice-5-2+backports' - sw/source

[Tamás Zolnai]

 sw/source/core/layout/frmtool.cxx |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit db51a3721b5e52afc1bd54bfef7f03e895a2670e
Author: Tamás Zolnai <tamas.zolnai at collabora.com>
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: I5fd29bdad4afae4947e0701e5727482958453d03
    Reviewed-on: https://gerrit.libreoffice.org/45756
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Tamás Zolnai <tamas.zolnai at collabora.com>
    (cherry picked from commit a172f854b6e1d61bf0fe0fe4efc3058bb7a760bf)
    Reviewed-on: https://gerrit.libreoffice.org/45765
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
    Tested-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>

diff --git a/sw/source/core/layout/frmtool.cxx b/sw/source/core/layout/frmtool.cxx
index 70c1409a0dc0..f94b859474ed 100644
--- a/sw/source/core/layout/frmtool.cxx
+++ b/sw/source/core/layout/frmtool.cxx
@@ -560,7 +560,11 @@ SwLayNotify::~SwLayNotify()
     const bool bSize = pLay->Frame().SSize() != maFrame.SSize();
 
     if ( bPos && pLay->Lower() && !IsLowersComplete() )
+    {
         pLay->Lower()->InvalidatePos();
+        if(pLay->Lower()->IsFootnoteFrame())
+            static_cast<SwFootnoteFrame*>(pLay->Lower())->Lower()->InvalidatePos();
+    }
 
     if ( bPrtPos )
         pLay->SetCompletePaint();