loplugin:simplifybool a little more aggressive

with expressions like !(a && b)

Change-Id: Id2acec2a8d0eaaa8e5e37dbd2cae7281be36572e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100040
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

7 files changed, 11 insertions, 11 deletions

diff --git a/sw/source/core/access/accpara.cxx b/sw/source/core/access/accpara.cxx
index b39f4c9439ef..9da830b9b2b9 100644
--- a/sw/source/core/access/accpara.cxx
+++ b/sw/source/core/access/accpara.cxx
@@ -2921,8 +2921,8 @@ sal_Int32 SAL_CALL SwAccessibleParagraph::getHyperLinkIndex( sal_Int32 nCharInde
         sal_Int32 nPos = 0;
         SwTextNode const* pNode(nullptr);
         const SwTextAttr *pHt = aHIter.next(&pNode);
-        while (pHt && !(nIdx >= pTextFrame->MapModelToView(pNode, pHt->GetStart())
-                     && nIdx < pTextFrame->MapModelToView(pNode, pHt->GetAnyEnd())))
+        while (pHt && (nIdx < pTextFrame->MapModelToView(pNode, pHt->GetStart())
+                       || nIdx >= pTextFrame->MapModelToView(pNode, pHt->GetAnyEnd())))
         {
             pHt = aHIter.next(&pNode);
             nPos++;
diff --git a/sw/source/core/doc/docbm.cxx b/sw/source/core/doc/docbm.cxx
index 002582c6cb4a..a6ecd452e576 100644
--- a/sw/source/core/doc/docbm.cxx
+++ b/sw/source/core/doc/docbm.cxx
@@ -1016,8 +1016,8 @@ namespace sw::mark
                     bDeleteMark = rbIsOtherPosInRange
                                   || pMark->IsExpanded()
                                   || pSttIdx == nullptr
-                                  || !( pMark->GetMarkPos().nNode == rStt
-                                        && pMark->GetMarkPos().nContent == *pSttIdx );
+                                  || pMark->GetMarkPos().nNode != rStt
+                                  || pMark->GetMarkPos().nContent != *pSttIdx;
                     break;
                 default:
                     bDeleteMark = true;
diff --git a/sw/source/core/doc/docedt.cxx b/sw/source/core/doc/docedt.cxx
index ceb7ada2f865..5eadf937b53e 100644
--- a/sw/source/core/doc/docedt.cxx
+++ b/sw/source/core/doc/docedt.cxx
@@ -161,8 +161,8 @@ void SaveFlyInRange( const SwPaM& rPam, const SwPosition& rInsPos,
              (RndStdIds::FLY_AT_CHAR == pAnchor->GetAnchorId())) &&
             // do not move if the InsPos is in the ContentArea of the Fly
             ( nullptr == ( pContentIdx = pFormat->GetContent().GetContentIdx() ) ||
-              !(*pContentIdx < rInsPos.nNode &&
-                rInsPos.nNode < pContentIdx->GetNode().EndOfSectionIndex())))
+              (*pContentIdx >= rInsPos.nNode ||
+                rInsPos.nNode >= pContentIdx->GetNode().EndOfSectionIndex())))
         {
             bool bInsPos = false;
 
diff --git a/sw/source/core/doc/docnum.cxx b/sw/source/core/doc/docnum.cxx
index 477f83220f32..0f03a9265670 100644
--- a/sw/source/core/doc/docnum.cxx
+++ b/sw/source/core/doc/docnum.cxx
@@ -2119,7 +2119,7 @@ bool SwDoc::MoveParagraphImpl(SwPaM& rPam, long const nOffset,
                 }
 
                 if( pOwnRedl &&
-                    !( pRStt->nNode <= aIdx && aIdx <= pREnd->nNode ))
+                    ( pRStt->nNode > aIdx || aIdx > pREnd->nNode ))
                 {
                     // it's not in itself, so don't move it
                     pOwnRedl = nullptr;
diff --git a/sw/source/core/unocore/unomap.cxx b/sw/source/core/unocore/unomap.cxx
index 8da991f62451..093f8972c749 100644
--- a/sw/source/core/unocore/unomap.cxx
+++ b/sw/source/core/unocore/unomap.cxx
@@ -700,7 +700,7 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
                      !pMap->aName.isEmpty(); ++pMap )
                 {
                     // OUString(UNO_NAME_PAGE_DESC_NAME) should keep its MAYBEVOID flag
-                    if (!(RES_PAGEDESC == pMap->nWID && MID_PAGEDESC_PAGEDESCNAME == pMap->nMemberId))
+                    if (RES_PAGEDESC != pMap->nWID || MID_PAGEDESC_PAGEDESCNAME != pMap->nMemberId)
                         pMap->nFlags &= ~PropertyAttribute::MAYBEVOID;
                 }
             }
diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx
index 2e19f4e5bae6..85b215f790c8 100644
--- a/sw/source/filter/ww8/wrtw8nds.cxx
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
@@ -1509,7 +1509,7 @@ const SwRedlineData* SwWW8AttrIter::GetRunLevelRedline( sal_Int32 nPos )
     if( pCurRedline )
     {
         const SwPosition* pEnd = pCurRedline->End();
-        if (!(pEnd->nNode == rNd && pEnd->nContent.GetIndex() <= nPos))
+        if (pEnd->nNode != rNd || pEnd->nContent.GetIndex() > nPos)
         {
             switch( pCurRedline->GetType() )
             {
diff --git a/sw/source/uibase/uno/unotxdoc.cxx b/sw/source/uibase/uno/unotxdoc.cxx
index 11ef3d90df17..00cefea1e109 100644
--- a/sw/source/uibase/uno/unotxdoc.cxx
+++ b/sw/source/uibase/uno/unotxdoc.cxx
@@ -3363,11 +3363,11 @@ void SwXTextDocument::getPostIts(tools::JsonWriter& rJsonWriter)
 void SwXTextDocument::executeFromFieldEvent(const StringMap& aArguments)
 {
     auto aIter = aArguments.find("type");
-    if (!(aIter != aArguments.end() && aIter->second == "drop-down"))
+    if (aIter == aArguments.end() || aIter->second != "drop-down")
         return;
 
     aIter = aArguments.find("cmd");
-    if (!(aIter != aArguments.end() && aIter->second == "selected"))
+    if (aIter == aArguments.end() || aIter->second != "selected")
         return;
 
     aIter = aArguments.find("data");