loplugin:simplifybool more

look for expressions like
!(a && !b)
which can be expanded out

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

8 files changed, 24 insertions, 28 deletions

diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx
index 3015c65f1b0c..49dd0c204dbb 100644
--- a/vcl/source/control/button.cxx
+++ b/vcl/source/control/button.cxx
@@ -1186,8 +1186,7 @@ void PushButton::Tracking( const TrackingEvent& rTEvt )
             // do not call Click handler if aborted
             if ( !rTEvt.IsTrackingCanceled() )
             {
-                if ( ! ( ( GetStyle() & WB_REPEAT ) &&
-                         ! ( GetStyle() & WB_TOGGLE ) ) )
+                if ( ! ( GetStyle() & WB_REPEAT ) || ( GetStyle() & WB_TOGGLE ) )
                     Click();
             }
         }
@@ -1269,8 +1268,7 @@ void PushButton::KeyUp( const KeyEvent& rKEvt )
 
         Invalidate();
 
-        if ( !( ( GetStyle() & WB_REPEAT )  &&
-                ! ( GetStyle() & WB_TOGGLE ) ) )
+        if ( !( GetStyle() & WB_REPEAT ) || ( GetStyle() & WB_TOGGLE ) )
             Click();
     }
     else
diff --git a/vcl/source/treelist/transfer.cxx b/vcl/source/treelist/transfer.cxx
index dca44726b609..a14da846739b 100644
--- a/vcl/source/treelist/transfer.cxx
+++ b/vcl/source/treelist/transfer.cxx
@@ -930,7 +930,7 @@ void TransferableHelper::CopyToClipboard(const Reference<XClipboard>& rClipboard
     if( rClipboard.is() )
         mxClipboard = rClipboard;
 
-    if( !(mxClipboard.is() && !mxTerminateListener.is()) )
+    if( !mxClipboard.is() || mxTerminateListener.is() )
         return;
 
     try
@@ -960,7 +960,7 @@ void TransferableHelper::CopyToClipboard( vcl::Window *pWindow ) const
 
 void TransferableHelper::CopyToSelection(const Reference<XClipboard>& rSelection) const
 {
-    if( !(rSelection.is() && !mxTerminateListener.is()) )
+    if( !rSelection.is() || mxTerminateListener.is() )
         return;
 
     try
diff --git a/vcl/source/window/cursor.cxx b/vcl/source/window/cursor.cxx
index c8a573b9fbd4..a0d05ff12c2e 100644
--- a/vcl/source/window/cursor.cxx
+++ b/vcl/source/window/cursor.cxx
@@ -220,7 +220,7 @@ void vcl::Cursor::ImplDoShow( bool bDrawDirect, bool bRestore )
     if ( bDrawDirect || bRestore )
         ImplDraw();
 
-    if ( !mpWindow && ! ( ! bDrawDirect && mpData->maTimer.IsActive()) )
+    if ( !mpWindow && (bDrawDirect || !mpData->maTimer.IsActive()) )
     {
         mpData->maTimer.SetTimeout( pWindow->GetSettings().GetStyleSettings().GetCursorBlinkTime() );
         if ( mpData->maTimer.GetTimeout() != STYLE_CURSOR_NOBLINKTIME )
diff --git a/vcl/source/window/event.cxx b/vcl/source/window/event.cxx
index 4d7f3cf35284..251cddaaf048 100644
--- a/vcl/source/window/event.cxx
+++ b/vcl/source/window/event.cxx
@@ -110,7 +110,7 @@ bool Window::EventNotify( NotifyEvent& rNEvt )
     // check for docking window
     // but do nothing if window is docked and locked
     ImplDockingWindowWrapper *pWrapper = ImplGetDockingManager()->GetDockingWindowWrapper( this );
-    if (pWrapper && !( !pWrapper->IsFloatingMode() && pWrapper->IsLocked() ))
+    if (pWrapper && ( pWrapper->IsFloatingMode() || !pWrapper->IsLocked() ))
     {
         const bool bDockingSupportCrippled = !StyleSettings::GetDockingFloatsSupported();
 
diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx
index cab79f4fcef3..23557868dd4c 100644
--- a/vcl/source/window/window2.cxx
+++ b/vcl/source/window/window2.cxx
@@ -576,7 +576,7 @@ long Window::GetDrawPixel( OutputDevice const * pDev, long nPixels ) const
 
 static void lcl_HandleScrollHelper( ScrollBar* pScrl, double nN, bool isMultiplyByLineSize )
 {
-    if ( !(pScrl && nN && pScrl->IsEnabled() && pScrl->IsInputEnabled() && ! pScrl->IsInModalMode()) )
+    if ( !pScrl || !nN || !pScrl->IsEnabled() || !pScrl->IsInputEnabled() || pScrl->IsInModalMode() )
         return;
 
     long nNewPos = pScrl->GetThumbPos();
diff --git a/vcl/unx/generic/app/wmadaptor.cxx b/vcl/unx/generic/app/wmadaptor.cxx
index cc38683fe0e5..fc17cc080957 100644
--- a/vcl/unx/generic/app/wmadaptor.cxx
+++ b/vcl/unx/generic/app/wmadaptor.cxx
@@ -1104,9 +1104,9 @@ void NetWMAdaptor::setNetWMState( X11SalFrame* pFrame ) const
         XDeleteProperty( m_pDisplay,
                          pFrame->GetShellWindow(),
                          m_aWMAtoms[ NET_WM_STATE ] );
-    if( !(pFrame->mbMaximizedHorz
-       && pFrame->mbMaximizedVert
-       && ! ( pFrame->nStyle_ & SalFrameStyleFlags::SIZEABLE )) )
+    if( !pFrame->mbMaximizedHorz
+       || !pFrame->mbMaximizedVert
+       || ( pFrame->nStyle_ & SalFrameStyleFlags::SIZEABLE ) )
         return;
 
     /*
@@ -1194,9 +1194,9 @@ void GnomeWMAdaptor::setGnomeWMState( X11SalFrame* pFrame ) const
                      reinterpret_cast<unsigned char*>(&nWinWMState),
                      1
                      );
-    if( !(pFrame->mbMaximizedHorz
-       && pFrame->mbMaximizedVert
-       && ! ( pFrame->nStyle_ & SalFrameStyleFlags::SIZEABLE )) )
+    if( !pFrame->mbMaximizedHorz
+       || !pFrame->mbMaximizedVert
+       || ( pFrame->nStyle_ & SalFrameStyleFlags::SIZEABLE ) )
         return;
 
     /*
@@ -1738,9 +1738,9 @@ void GnomeWMAdaptor::enableAlwaysOnTop( X11SalFrame* pFrame, bool bEnable ) cons
  */
 void WMAdaptor::changeReferenceFrame( X11SalFrame* pFrame, X11SalFrame const * pReferenceFrame ) const
 {
-    if( !(! ( pFrame->nStyle_ & SalFrameStyleFlags::PLUG )
-        && ! pFrame->IsOverrideRedirect()
-        && ! pFrame->IsFloatGrabWindow())
+    if(  ( pFrame->nStyle_ & SalFrameStyleFlags::PLUG )
+        || pFrame->IsOverrideRedirect()
+        || pFrame->IsFloatGrabWindow()
         )
         return;
 
diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx
index f87796f99ecd..9e0abb81f1dd 100644
--- a/vcl/unx/generic/window/salframe.cxx
+++ b/vcl/unx/generic/window/salframe.cxx
@@ -515,13 +515,11 @@ void X11SalFrame::Init( SalFrameStyleFlags nSalFrameStyle, SalX11Screen nXScreen
                 for (auto pSalFrame : GetDisplay()->getFrames() )
                 {
                     pFrame = static_cast< const X11SalFrame* >( pSalFrame );
-                    if( ! ( pFrame->mpParent
-                            || pFrame->mbFullScreen
-                            || ! ( pFrame->nStyle_ & SalFrameStyleFlags::SIZEABLE )
-                            || ! pFrame->GetUnmirroredGeometry().nWidth
-                            || ! pFrame->GetUnmirroredGeometry().nHeight
-                            )
-                        )
+                    if( !pFrame->mpParent
+                        && !pFrame->mbFullScreen
+                        && ( pFrame->nStyle_ & SalFrameStyleFlags::SIZEABLE )
+                        && pFrame->GetUnmirroredGeometry().nWidth
+                        && pFrame->GetUnmirroredGeometry().nHeight )
                     {
                         bIsDocumentWindow = true;
                         break;
diff --git a/vcl/unx/gtk3/a11y/gtk3atklistener.cxx b/vcl/unx/gtk3/a11y/gtk3atklistener.cxx
index b4c2dfcadf38..2ef96be4616e 100644
--- a/vcl/unx/gtk3/a11y/gtk3atklistener.cxx
+++ b/vcl/unx/gtk3/a11y/gtk3atklistener.cxx
@@ -134,9 +134,9 @@ void AtkListener::updateChildList(
     m_aChildList.clear();
 
     uno::Reference< accessibility::XAccessibleStateSet > xStateSet = pContext->getAccessibleStateSet();
-    if( !(xStateSet.is()
-        && !xStateSet->contains(accessibility::AccessibleStateType::DEFUNC)
-        && !xStateSet->contains(accessibility::AccessibleStateType::MANAGES_DESCENDANTS)) )
+    if( !xStateSet.is()
+        || xStateSet->contains(accessibility::AccessibleStateType::DEFUNC)
+        || xStateSet->contains(accessibility::AccessibleStateType::MANAGES_DESCENDANTS) )
         return;
 
     css::uno::Reference<css::accessibility::XAccessibleContext3> xContext3(pContext, css::uno::UNO_QUERY);