7 files changed, 17 insertions, 17 deletions
diff --git a/sw/source/core/layout/anchoreddrawobject.cxx b/sw/source/core/layout/anchoreddrawobject.cxx
index 23334a44a01b..0d7a8658b46e 100644
--- a/sw/source/core/layout/anchoreddrawobject.cxx
+++ b/sw/source/core/layout/anchoreddrawobject.cxx
@@ -523,7 +523,7 @@ void SwAnchoredDrawObject::SetDrawObjAnchor()
 */
 void SwAnchoredDrawObject::InvalidatePage_( SwPageFrame* _pPageFrame )
 {
-    if ( !(_pPageFrame && !_pPageFrame->GetFormat()->GetDoc()->IsInDtor()) )
+    if ( !_pPageFrame || _pPageFrame->GetFormat()->GetDoc()->IsInDtor() )
         return;
 
     if ( !_pPageFrame->GetUpper() )
diff --git a/sw/source/core/layout/flycnt.cxx b/sw/source/core/layout/flycnt.cxx
index ce6abc998735..953b527ee65b 100644
--- a/sw/source/core/layout/flycnt.cxx
+++ b/sw/source/core/layout/flycnt.cxx
@@ -329,7 +329,7 @@ void SwFlyAtContentFrame::MakeAll(vcl::RenderContext* pRenderContext)
         return;
     }
 
-    if ( !(!SwOszControl::IsInProgress( this ) && !IsLocked() && !IsColLocked()) )
+    if ( SwOszControl::IsInProgress( this ) || IsLocked() || IsColLocked() )
         return;
 
     // #i28701# - use new method <GetPageFrame()>
diff --git a/sw/source/core/layout/frmtool.cxx b/sw/source/core/layout/frmtool.cxx
index 2a56f8e5cb04..0ade3a3315ed 100644
--- a/sw/source/core/layout/frmtool.cxx
+++ b/sw/source/core/layout/frmtool.cxx
@@ -388,7 +388,7 @@ SwFrameNotify::~SwFrameNotify() COVERITY_NOEXCEPT_FALSE
     // #i61999#
     // no invalidation of columned Writer fly frames, because automatic
     // width doesn't make sense for such Writer fly frames.
-    if ( !(pFly->Lower() && !pFly->Lower()->IsColumnFrame()) )
+    if ( !pFly->Lower() || pFly->Lower()->IsColumnFrame() )
         return;
 
     const SwFormatFrameSize &rFrameSz = pFly->GetFormat()->GetFrameSize();
diff --git a/sw/source/core/layout/layact.cxx b/sw/source/core/layout/layact.cxx
index d506251278ff..93076422c5dd 100644
--- a/sw/source/core/layout/layact.cxx
+++ b/sw/source/core/layout/layact.cxx
@@ -228,7 +228,7 @@ void SwLayAction::PaintContent( const SwContentFrame *pCnt,
         PaintContent_( pCnt, pPage, aPaintRect );
     }
 
-    if ( !(pCnt->IsRetouche() && !pCnt->GetNext()) )
+    if ( !pCnt->IsRetouche() || pCnt->GetNext() )
         return;
 
     const SwFrame *pTmp = pCnt;
diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx
index a3454140ed82..9dbd735fabe9 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -3543,10 +3543,10 @@ static drawinglayer::primitive2d::Primitive2DContainer lcl_CreateDashedIndicator
 
 void SwPageFrame::PaintBreak( ) const
 {
-    if ( !(gProp.pSGlobalShell->GetOut()->GetOutDevType() != OUTDEV_PRINTER  &&
-         !gProp.pSGlobalShell->GetViewOptions()->IsPDFExport() &&
-         !gProp.pSGlobalShell->GetViewOptions()->IsReadonly() &&
-         !gProp.pSGlobalShell->IsPreview()) )
+    if ( gProp.pSGlobalShell->GetOut()->GetOutDevType() == OUTDEV_PRINTER  ||
+         gProp.pSGlobalShell->GetViewOptions()->IsPDFExport() ||
+         gProp.pSGlobalShell->GetViewOptions()->IsReadonly() ||
+         gProp.pSGlobalShell->IsPreview() )
         return;
 
     const SwFrame* pBodyFrame = Lower();
@@ -3580,10 +3580,10 @@ void SwPageFrame::PaintBreak( ) const
 
 void SwColumnFrame::PaintBreak( ) const
 {
-    if ( !(gProp.pSGlobalShell->GetOut()->GetOutDevType() != OUTDEV_PRINTER  &&
-         !gProp.pSGlobalShell->GetViewOptions()->IsPDFExport() &&
-         !gProp.pSGlobalShell->GetViewOptions()->IsReadonly() &&
-         !gProp.pSGlobalShell->IsPreview()) )
+    if ( gProp.pSGlobalShell->GetOut()->GetOutDevType() == OUTDEV_PRINTER  ||
+         gProp.pSGlobalShell->GetViewOptions()->IsPDFExport() ||
+         gProp.pSGlobalShell->GetViewOptions()->IsReadonly() ||
+         gProp.pSGlobalShell->IsPreview() )
         return;
 
     const SwFrame* pBodyFrame = Lower();
@@ -5657,7 +5657,7 @@ void SwPageFrame::PaintGrid( OutputDevice const * pOut, SwRect const &rRect ) co
 void SwPageFrame::PaintMarginArea( const SwRect& _rOutputRect,
                                  SwViewShell const * _pViewShell ) const
 {
-    if (  !(_pViewShell->GetWin() && !_pViewShell->GetViewOptions()->getBrowseMode()) )
+    if (  !_pViewShell->GetWin() || _pViewShell->GetViewOptions()->getBrowseMode() )
         return;
 
     // Simplified paint with DrawingLayer FillStyle
diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx
index a81b7f1c198c..288ac0e760c8 100644
--- a/sw/source/core/layout/tabfrm.cxx
+++ b/sw/source/core/layout/tabfrm.cxx
@@ -1360,7 +1360,7 @@ void SwTabFrame::Join()
 
     SwTabFrame *pFoll = GetFollow();
 
-    if (!(pFoll && !pFoll->IsJoinLocked()))
+    if (!pFoll || pFoll->IsJoinLocked())
         return;
 
     SwRectFnSet aRectFnSet(this);
@@ -3747,7 +3747,7 @@ void SwTabFrame::Paste( SwFrame* pParent, SwFrame* pSibling )
         // b) The new follower was previously the first in a chain
         GetNext()->InvalidatePrt_();
 
-    if ( !(pPage && !IsFollow()) )
+    if ( !pPage || IsFollow() )
         return;
 
     if ( pPage->GetUpper() )
diff --git a/sw/source/core/layout/wsfrm.cxx b/sw/source/core/layout/wsfrm.cxx
index 04035710861a..9c342a384770 100644
--- a/sw/source/core/layout/wsfrm.cxx
+++ b/sw/source/core/layout/wsfrm.cxx
@@ -4227,10 +4227,10 @@ void AddRemoveFlysAnchoredToFrameStartingAtNode(
         std::set<sal_uLong> *const pSkipped)
 {
     auto const pMerged(rFrame.GetMergedPara());
-    if (!(pMerged
+    if (!pMerged
         // do this only *once*, for the *last* frame
         // otherwise AppendObj would create multiple frames for fly-frames!
-        && !rFrame.GetFollow()))
+        || rFrame.GetFollow())
         return;
 
     assert(pMerged->pFirstNode->GetIndex() <= rTextNode.GetIndex()