diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2016-11-29 17:18:20 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2016-11-29 17:18:20 +0100 |
commit | 2eb991561c3ca6751bfe3bd674de28d7677e993d (patch) | |
tree | 6552f51b9c607b55ab11195d776c842390629742 /sw/source/core/layout/calcmove.cxx | |
parent | 1c717c06c486155bf48aef3ed5e5c140f4205e6e (diff) |
Rewrite some (trivial) assignments inside if/while conditions: sw
Change-Id: I288c5125a1316828df74f73aeaac85392638ffd8
Diffstat (limited to 'sw/source/core/layout/calcmove.cxx')
-rw-r--r-- | sw/source/core/layout/calcmove.cxx | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/sw/source/core/layout/calcmove.cxx b/sw/source/core/layout/calcmove.cxx index c7ebf84ae900..8f65b8ed8da9 100644 --- a/sw/source/core/layout/calcmove.cxx +++ b/sw/source/core/layout/calcmove.cxx @@ -269,14 +269,18 @@ void SwFrame::PrepareMake(vcl::RenderContext* pRenderContext) bFoll = pThis->IsFollow(); bNoSect = false; } - else if ( bCnt && (bFoll = pThis->IsFollow()) && GetPrev() ) + else if ( bCnt ) { - //Do not follow the chain when we need only one instance - const SwTextFrame* pMaster = static_cast<SwContentFrame*>(this)->FindMaster(); - if ( pMaster && pMaster->IsLocked() ) + bFoll = pThis->IsFollow(); + if ( bFoll && GetPrev() ) { - MakeAll(pRenderContext); - return; + //Do not follow the chain when we need only one instance + const SwTextFrame* pMaster = static_cast<SwContentFrame*>(this)->FindMaster(); + if ( pMaster && pMaster->IsLocked() ) + { + MakeAll(pRenderContext); + return; + } } } |