[Libreoffice-commits] core.git: sw/source

[Jan-Marek Glogowski (via logerrit)]

 sw/source/core/inc/ftnfrm.hxx     |    4 ++--
 sw/source/core/layout/flowfrm.cxx |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 642cdf2d8341f0b202f01718ccb63ac1b976e18e
Author:     Jan-Marek Glogowski <jan-marek.glogowski at extern.cib.de>
AuthorDate: Tue Mar 24 18:59:22 2020 +0100
Commit:     Jan-Marek Glogowski <glogow at fbihome.de>
CommitDate: Tue Mar 24 21:00:57 2020 +0100

    tdf#131530 keep prepending footnote frame
    
    Fix function name typo and actually prepend the footnote frame,
    as the original code did. So much about "easy refactoring" :-(
    
    Regression from commit 24caeee8236576abd92086974c1dbbf15b81a4c5
    ("Refactor a bit of the footnote handling code").
    
    Change-Id: I227e30bc169fdfc237a5239d3ade6f035d85ca6e
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91004
    Tested-by: Jenkins
    Reviewed-by: Jan-Marek Glogowski <glogow at fbihome.de>

diff --git a/sw/source/core/inc/ftnfrm.hxx b/sw/source/core/inc/ftnfrm.hxx
index 0cedbad4f40c..34dc89bc146c 100644
--- a/sw/source/core/inc/ftnfrm.hxx
+++ b/sw/source/core/inc/ftnfrm.hxx
@@ -53,7 +53,7 @@ public:
     const SwFootnoteFrame* FindFootNote() const;
 
     static inline SwFootnoteFrame* AppendChained(SwFrame* pThis, bool bDefaultFormat);
-    static inline SwFootnoteFrame* PrepedChained(SwFrame* pThis, bool bDefaultFormat);
+    static inline SwFootnoteFrame* PrependChained(SwFrame* pThis, bool bDefaultFormat);
 
     virtual SwTwips ShrinkFrame( SwTwips, bool bTst = false, bool bInfo = false ) override;
     virtual SwTwips GrowFrame  ( SwTwips, bool bTst = false, bool bInfo = false ) override;
@@ -71,7 +71,7 @@ inline SwFootnoteFrame* SwFootnoteContFrame::AppendChained(SwFrame* pThis, bool
     return AddChained(true, pThis, bDefaultFormat);
 }
 
-inline SwFootnoteFrame* SwFootnoteContFrame::PrepedChained(SwFrame* pThis, bool bDefaultFormat)
+inline SwFootnoteFrame* SwFootnoteContFrame::PrependChained(SwFrame* pThis, bool bDefaultFormat)
 {
     return AddChained(false, pThis, bDefaultFormat);
 }
diff --git a/sw/source/core/layout/flowfrm.cxx b/sw/source/core/layout/flowfrm.cxx
index 685efcf791db..b4c8aeb27931 100644
--- a/sw/source/core/layout/flowfrm.cxx
+++ b/sw/source/core/layout/flowfrm.cxx
@@ -2473,7 +2473,7 @@ bool SwFlowFrame::MoveBwd( bool &rbReformat )
         if ( pNewUpper->IsFootnoteContFrame() )
         {
             // I may have gotten a Container
-            SwFootnoteFrame *pNew = SwFootnoteContFrame::AppendChained(&m_rThis, false);
+            SwFootnoteFrame *pNew = SwFootnoteContFrame::PrependChained(&m_rThis, false);
             pNew->Paste( pNewUpper );
             pNewUpper = pNew;
         }