loplugin:simplifybool extend to !(a == b) where comparison an overloaded op

Change-Id: I08fcbe2569c07f5f97269ad861fa6d38f23a7cc7
Reviewed-on: https://gerrit.libreoffice.org/67816
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

9 files changed, 18 insertions, 18 deletions

diff --git a/sw/source/core/crsr/callnk.cxx b/sw/source/core/crsr/callnk.cxx
index 0a49e268b453..358d0895ed67 100644
--- a/sw/source/core/crsr/callnk.cxx
+++ b/sw/source/core/crsr/callnk.cxx
@@ -133,7 +133,7 @@ SwCallLink::~SwCallLink() COVERITY_NOEXCEPT_FALSE
         // That can be done in one go by the handler.
         rShell.CallChgLnk();
     }
-    else if( !bHasSelection != !(*pCurrentCursor->GetPoint() != *pCurrentCursor->GetMark()) )
+    else if( !bHasSelection != (*pCurrentCursor->GetPoint() == *pCurrentCursor->GetMark()) )
     {
         // always call change link when selection changes
         rShell.CallChgLnk();
diff --git a/sw/source/core/doc/gctable.cxx b/sw/source/core/doc/gctable.cxx
index e6daaaebf136..35fa00f86bd3 100644
--- a/sw/source/core/doc/gctable.cxx
+++ b/sw/source/core/doc/gctable.cxx
@@ -104,7 +104,7 @@ static sal_uInt16 lcl_FindEndPosOfBorder( const SwCollectTableLineBoxes& rCollTL
 
         if( SfxItemState::SET != rBox.GetFrameFormat()->GetItemState(RES_BOX,true, &pItem )
             || nullptr == ( pBrd = GetLineTB( static_cast<const SvxBoxItem*>(pItem), bTop ))
-            || !( *pBrd == rBrdLn ))
+            || *pBrd != rBrdLn )
             break;
         nLastPos = nPos;
     }
diff --git a/sw/source/core/doc/number.cxx b/sw/source/core/doc/number.cxx
index 158d13864ea3..1cc1d4ba1237 100644
--- a/sw/source/core/doc/number.cxx
+++ b/sw/source/core/doc/number.cxx
@@ -563,7 +563,7 @@ bool SwNumRule::operator==( const SwNumRule& rRule ) const
     if( bRet )
     {
         for( sal_uInt8 n = 0; n < MAXLEVEL; ++n )
-            if( !( rRule.Get( n ) == Get( n ) ))
+            if( rRule.Get( n ) != Get( n ) )
             {
                 bRet = false;
                 break;
@@ -577,7 +577,7 @@ void SwNumRule::Set( sal_uInt16 i, const SwNumFormat& rNumFormat )
     OSL_ENSURE( i < MAXLEVEL, "Serious defect" );
     if( i < MAXLEVEL )
     {
-        if( !maFormats[ i ] || !(rNumFormat == Get( i )) )
+        if( !maFormats[ i ] || (rNumFormat != Get( i )) )
         {
             maFormats[ i ].reset(new SwNumFormat( rNumFormat ));
             mbInvalidRuleFlag = true;
diff --git a/sw/source/core/docnode/ndtbl1.cxx b/sw/source/core/docnode/ndtbl1.cxx
index e61840d84f22..daf52e4047a9 100644
--- a/sw/source/core/docnode/ndtbl1.cxx
+++ b/sw/source/core/docnode/ndtbl1.cxx
@@ -993,7 +993,7 @@ void SwDoc::GetTabBorders( const SwCursor& rCursor, SfxItemSet& rSet )
                             aSetBox.SetLine( rBox.GetTop(), SvxBoxItemLine::TOP );
                         }
                         else if ((aSetBox.GetTop() && rBox.GetTop() &&
-                                 !(*aSetBox.GetTop() == *rBox.GetTop())) ||
+                                 (*aSetBox.GetTop() != *rBox.GetTop())) ||
                                  ((!aSetBox.GetTop()) != (!rBox.GetTop()))) // != expression is true, if one and only one of the two pointers is !0
                         {
                             aSetBoxInfo.SetValid(SvxBoxInfoItemValidFlags::TOP, false );
@@ -1012,7 +1012,7 @@ void SwDoc::GetTabBorders( const SwCursor& rCursor, SfxItemSet& rSet )
                             aSetBox.SetLine( rBox.GetLeft(), SvxBoxItemLine::LEFT );
                         }
                         else if ((aSetBox.GetLeft() && rBox.GetLeft() &&
-                                 !(*aSetBox.GetLeft() == *rBox.GetLeft())) ||
+                                 (*aSetBox.GetLeft() != *rBox.GetLeft())) ||
                                  ((!aSetBox.GetLeft()) != (!rBox.GetLeft())))
                         {
                             aSetBoxInfo.SetValid(SvxBoxInfoItemValidFlags::LEFT, false );
@@ -1029,7 +1029,7 @@ void SwDoc::GetTabBorders( const SwCursor& rCursor, SfxItemSet& rSet )
                             aSetBoxInfo.SetLine( rBox.GetLeft(), SvxBoxInfoItemLine::VERT );
                         }
                         else if ((aSetBoxInfo.GetVert() && rBox.GetLeft() &&
-                                 !(*aSetBoxInfo.GetVert() == *rBox.GetLeft())) ||
+                                 (*aSetBoxInfo.GetVert() != *rBox.GetLeft())) ||
                                  ((!aSetBoxInfo.GetVert()) != (!rBox.GetLeft())))
                         {   aSetBoxInfo.SetValid( SvxBoxInfoItemValidFlags::VERT, false );
                             aSetBoxInfo.SetLine( nullptr, SvxBoxInfoItemLine::VERT );
@@ -1045,7 +1045,7 @@ void SwDoc::GetTabBorders( const SwCursor& rCursor, SfxItemSet& rSet )
                         aSetBox.SetLine( rBox.GetRight(), SvxBoxItemLine::RIGHT );
                     }
                     else if ((aSetBox.GetRight() && rBox.GetRight() &&
-                             !(*aSetBox.GetRight() == *rBox.GetRight())) ||
+                             (*aSetBox.GetRight() != *rBox.GetRight())) ||
                              (!aSetBox.GetRight() != !rBox.GetRight()))
                     {   aSetBoxInfo.SetValid( SvxBoxInfoItemValidFlags::RIGHT, false );
                         aSetBox.SetLine( nullptr, SvxBoxItemLine::RIGHT );
@@ -1062,7 +1062,7 @@ void SwDoc::GetTabBorders( const SwCursor& rCursor, SfxItemSet& rSet )
                             aSetBox.SetLine( rBox.GetBottom(), SvxBoxItemLine::BOTTOM );
                         }
                         else if ((aSetBox.GetBottom() && rBox.GetBottom() &&
-                                 !(*aSetBox.GetBottom() == *rBox.GetBottom())) ||
+                                 (*aSetBox.GetBottom() != *rBox.GetBottom())) ||
                                  (!aSetBox.GetBottom() != !rBox.GetBottom()))
                         {   aSetBoxInfo.SetValid( SvxBoxInfoItemValidFlags::BOTTOM, false );
                             aSetBox.SetLine( nullptr, SvxBoxItemLine::BOTTOM );
@@ -1080,7 +1080,7 @@ void SwDoc::GetTabBorders( const SwCursor& rCursor, SfxItemSet& rSet )
                             aSetBoxInfo.SetLine( rBox.GetBottom(), SvxBoxInfoItemLine::HORI );
                         }
                         else if ((aSetBoxInfo.GetHori() && rBox.GetBottom() &&
-                                 !(*aSetBoxInfo.GetHori() == *rBox.GetBottom())) ||
+                                 (*aSetBoxInfo.GetHori() != *rBox.GetBottom())) ||
                                  ((!aSetBoxInfo.GetHori()) != (!rBox.GetBottom())))
                         {
                             aSetBoxInfo.SetValid( SvxBoxInfoItemValidFlags::HORI, false );
diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx
index 28244dab159f..6c5233a85c95 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -1989,7 +1989,7 @@ void DrawGraphic(
         // to get color of brush, check background color against COL_TRANSPARENT ("no fill"/"auto fill")
         // instead of checking, if transparency is not set.
         const Color aColor( pBrush &&
-                            ( !(pBrush->GetColor() == COL_TRANSPARENT) ||
+                            ( (pBrush->GetColor() != COL_TRANSPARENT) ||
                               gProp.bSFlyMetafile )
                     ? pBrush->GetColor()
                     : aGlobalRetoucheColor );
@@ -3920,7 +3920,7 @@ void SwFlyFrame::PaintSwFrame(vcl::RenderContext& rRenderContext, SwRect const&
                 //     to determine, if background has to be painted, by checking, if
                 //     background color is not COL_TRANSPARENT ("no fill"/"auto fill")
                 //     or a background graphic exists.
-                bPaintCompleteBack = !(aBack.GetColor() == COL_TRANSPARENT) ||
+                bPaintCompleteBack = (aBack.GetColor() != COL_TRANSPARENT) ||
                                      aBack.GetGraphicPos() != GPOS_NONE;
             }
         }
diff --git a/sw/source/filter/html/css1atr.cxx b/sw/source/filter/html/css1atr.cxx
index a2ba5a80c425..a6599a50705d 100644
--- a/sw/source/filter/html/css1atr.cxx
+++ b/sw/source/filter/html/css1atr.cxx
@@ -1220,9 +1220,9 @@ bool SwHTMLWriter::HasScriptDependentItems( const SfxItemSet& rItemSet,
             }
             else
             {
-                if( !( *pItem == *pItemCJK ) ||
-                    !( *pItem == *pItemCTL ) ||
-                    !( *pItemCJK == *pItemCTL ) )
+                if( *pItem != *pItemCJK ||
+                    *pItem != *pItemCTL ||
+                    *pItemCJK != *pItemCTL )
                     return true;
             }
         }
diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx
index 863c8cf6b25b..0d4bed31eac3 100644
--- a/sw/source/filter/ww8/ww8par3.cxx
+++ b/sw/source/filter/ww8/ww8par3.cxx
@@ -1521,7 +1521,7 @@ static bool IsEqualFormatting(const SwNumRule &rOne, const SwNumRule &rTwo)
             //The SvxNumberFormat compare, not the SwNumFormat compare
             const SvxNumberFormat &rO = rOne.Get(n);
             const SvxNumberFormat &rT = rTwo.Get(n);
-            if (!(rO == rT))
+            if (rO != rT)
             {
                 bRet = false;
                 break;
diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx
index 695c741f2fcf..abc22321a47d 100644
--- a/sw/source/filter/xml/xmlimp.cxx
+++ b/sw/source/filter/xml/xmlimp.cxx
@@ -1089,7 +1089,7 @@ void SwXMLImport::MergeListsAtDocumentInsertPosition(SwDoc *pDoc)
                 // check style of the each list level
                 for( sal_uInt8 n = 0; n < MAXLEVEL; ++n )
                 {
-                    if( !( pNumRule1->Get( n ) == pNumRule2->Get( n ) ))
+                    if( pNumRule1->Get( n ) != pNumRule2->Get( n ) )
                     {
                         return;
                     }
diff --git a/sw/source/uibase/uiview/view0.cxx b/sw/source/uibase/uiview/view0.cxx
index a51e3c5cbd1c..f902713c9d45 100644
--- a/sw/source/uibase/uiview/view0.cxx
+++ b/sw/source/uibase/uiview/view0.cxx
@@ -568,7 +568,7 @@ void SwView::ExecViewOptions(SfxRequest &rReq)
     SwWrtShell &rSh = GetWrtShell();
     rSh.StartAction();
     SwModule* pModule = SW_MOD();
-    if( !(*rSh.GetViewOptions() == *pOpt ))
+    if( *rSh.GetViewOptions() != *pOpt )
     {
         rSh.ApplyViewOptions( *pOpt );
         if( bBrowseModeChanged )