diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-08-06 13:32:43 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-08-14 18:03:06 +0200 |
| commit | e67657d5211f6e95ddf8bd621108608573b00d5d (patch) | |
| tree | 66724101dbd95721714bd40fcb4861663432774c /svtools | |
| parent | 186def8f48e273c3a3b4d23b3ab2efd0d8664731 (diff) | |
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>
Diffstat (limited to 'svtools')
| -rw-r--r-- | svtools/source/brwbox/editbrowsebox2.cxx | 2 | ||||
| -rw-r--r-- | svtools/source/control/ruler.cxx | 4 | ||||
| -rw-r--r-- | svtools/source/control/tabbar.cxx | 2 | ||||
| -rw-r--r-- | svtools/source/uno/popupmenucontrollerbase.cxx | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/svtools/source/brwbox/editbrowsebox2.cxx b/svtools/source/brwbox/editbrowsebox2.cxx index a3505877be18..51f58e320703 100644 --- a/svtools/source/brwbox/editbrowsebox2.cxx +++ b/svtools/source/brwbox/editbrowsebox2.cxx @@ -68,7 +68,7 @@ void EditBrowseBox::implCreateActiveAccessible( ) DBG_ASSERT( IsEditing(), "EditBrowseBox::implCreateActiveAccessible: not to be called if we're not editing currently!" ); DBG_ASSERT( !m_aImpl->m_xActiveCell.is(), "EditBrowseBox::implCreateActiveAccessible: not to be called if the old one is still alive!" ); - if ( !(!m_aImpl->m_xActiveCell.is() && IsEditing()) ) + if ( m_aImpl->m_xActiveCell.is() || !IsEditing() ) return; Reference< XAccessible > xCont = aController->GetWindow().GetAccessible(); diff --git a/svtools/source/control/ruler.cxx b/svtools/source/control/ruler.cxx index ce62c133ff3c..46c9afcdb1cf 100644 --- a/svtools/source/control/ruler.cxx +++ b/svtools/source/control/ruler.cxx @@ -363,7 +363,7 @@ void Ruler::ImplVDrawText(vcl::RenderContext& rRenderContext, long nX, long nY, void Ruler::ImplInvertLines(vcl::RenderContext& rRenderContext) { // Position lines - if (!(!mpData->pLines.empty() && mbActive && !mbDrag && !mbFormat && !(mnUpdateFlags & RULER_UPDATE_LINES)) ) + if (mpData->pLines.empty() || !mbActive || mbDrag || mbFormat || (mnUpdateFlags & RULER_UPDATE_LINES) ) return; long nNullWinOff = mpData->nNullVirOff + mnVirOff; @@ -1915,7 +1915,7 @@ void Ruler::ImplEndDrag() void Ruler::MouseButtonDown( const MouseEvent& rMEvt ) { - if ( !(rMEvt.IsLeft() && !IsTracking()) ) + if ( rMEvt.IsLeft() || IsTracking() ) return; Point aMousePos = rMEvt.GetPosPixel(); diff --git a/svtools/source/control/tabbar.cxx b/svtools/source/control/tabbar.cxx index 270a0ee343ff..be068ee8894c 100644 --- a/svtools/source/control/tabbar.cxx +++ b/svtools/source/control/tabbar.cxx @@ -1520,7 +1520,7 @@ void TabBar::ImplPrePaint() mbFirstFormat = false; - if (!(mnCurPageId && (mnFirstPos == 0) && !mbDropPos)) + if (!mnCurPageId || (mnFirstPos != 0) || mbDropPos) return; auto& pItem = mpImpl->mpItemList[GetPagePos(mnCurPageId)]; diff --git a/svtools/source/uno/popupmenucontrollerbase.cxx b/svtools/source/uno/popupmenucontrollerbase.cxx index 9ce0bda33a63..1b2f6df58c0b 100644 --- a/svtools/source/uno/popupmenucontrollerbase.cxx +++ b/svtools/source/uno/popupmenucontrollerbase.cxx @@ -336,7 +336,7 @@ void SAL_CALL PopupMenuControllerBase::setPopupMenu( const Reference< awt::XPopu osl::MutexGuard aLock( m_aMutex ); throwIfDisposed(); - if ( !(m_xFrame.is() && !m_xPopupMenu.is()) ) + if ( !m_xFrame.is() || m_xPopupMenu.is() ) return; // Create popup menu on demand |