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

Stephan Bergmann sbergman at redhat.com
Mon Jan 18 00:39:02 PST 2016


 sw/source/core/layout/flowfrm.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 1452fb6332d64b7c980c50a7050403c99b7f47c8
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon Jan 18 09:35:32 2016 +0100

    loplugin:bodynotinblock
    
    ...probably an oversight in 0d127baed75929e744d5b6249f510012cfbc0e88 "tdf#91083
    - .doc: emulate table keep-with-next paragraph."  The following comment had been
    oddly hanging around there ever since 84a3db80b4fd66c6854b3135b5f69b61fd828e62
    "initial import," leaving it unclear whether it belongs to the preceding or
    following code, so just keep it hanging there oddly...
    
    Change-Id: I0c5cea5955b4b91efcffa499019975c810e6c983

diff --git a/sw/source/core/layout/flowfrm.cxx b/sw/source/core/layout/flowfrm.cxx
index d7ec51e..44c1254 100644
--- a/sw/source/core/layout/flowfrm.cxx
+++ b/sw/source/core/layout/flowfrm.cxx
@@ -118,7 +118,7 @@ bool SwFlowFrame::IsKeepFwdMoveAllowed( bool bIgnoreMyOwnKeepValue )
     // the 'keep' attribute set, and the first of the chain's
     // IsFwdMoveAllowed returns false, then we're not allowed to move.
     SwFrame *pFrame = &m_rThis;
-    if ( !pFrame->IsInFootnote() )
+    if ( !pFrame->IsInFootnote() ) {
         if ( bIgnoreMyOwnKeepValue && pFrame->GetIndPrev() )
             pFrame = pFrame->GetIndPrev();
         do
@@ -127,7 +127,7 @@ bool SwFlowFrame::IsKeepFwdMoveAllowed( bool bIgnoreMyOwnKeepValue )
             else
                 return true;
         } while ( pFrame );
-
+    }
                   //See IsFwdMoveAllowed()
     bool bRet = false;
     if ( pFrame && pFrame->GetIndPrev() )


More information about the Libreoffice-commits mailing list