[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - sw/source

[Michael Stahl]

 sw/source/core/layout/atrfrm.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 2951a80e79fdc71b231eeadf2231c265307cabe9
Author: Michael Stahl <mstahl at redhat.com>
Date:   Thu Apr 27 15:03:21 2017 +0200

    sw: fix always-true condition in lcl_DelHFFormat ...
    
    ... that prevents headers from being deleted if they have a client.
    
    (regression from d4267231754c1e6b03c7723a6fecc46750e7c780)
    
    Change-Id: I71f52f8806e59c97b81aa14144c700c14c5527b0
    (cherry picked from commit 99777c5a15df2d92bb8a9ddb6329fc3df1b2b8bf)
    Reviewed-on: https://gerrit.libreoffice.org/37031
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx
index 1a9168d257ee..a436e9bad595 100644
--- a/sw/source/core/layout/atrfrm.cxx
+++ b/sw/source/core/layout/atrfrm.cxx
@@ -118,7 +118,7 @@ static void lcl_DelHFFormat( SwClient *pToRemove, SwFrameFormat *pFormat )
         // It's suboptimal if the format is deleted beforehand.
         SwIterator<SwClient,SwFrameFormat> aIter(*pFormat);
         for(SwClient* pLast = aIter.First(); bDel && pLast; pLast = aIter.Next())
-            if(dynamic_cast<const SwFrame*>( pLast ) ==  nullptr || !SwXHeadFootText::IsXHeadFootText(pLast))
+            if (dynamic_cast<const SwFrame*>(pLast) == nullptr && !SwXHeadFootText::IsXHeadFootText(pLast))
                 bDel = false;
     }