diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-07-05 08:32:57 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-07-05 11:08:48 +0200 |
commit | 4b2262ab5b10f334f1984fec84d2978db81c58f1 (patch) | |
tree | de56663eba6ed2edf7a26127339dd8563fdf47be /svtools/source | |
parent | ec1de6895d84fbe4f2d5fb7135a59a918138d970 (diff) |
new loplugin unnecessaryparen
Change-Id: Ic883a07b30069ca6342d7521c8ad890f4326f0ec
Reviewed-on: https://gerrit.libreoffice.org/39549
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'svtools/source')
-rw-r--r-- | svtools/source/brwbox/brwbox1.cxx | 2 | ||||
-rw-r--r-- | svtools/source/brwbox/datwin.cxx | 2 | ||||
-rw-r--r-- | svtools/source/contnr/imivctl1.cxx | 10 | ||||
-rw-r--r-- | svtools/source/contnr/ivctrl.cxx | 6 | ||||
-rw-r--r-- | svtools/source/control/ruler.cxx | 4 | ||||
-rw-r--r-- | svtools/source/graphic/descriptor.cxx | 4 |
6 files changed, 14 insertions, 14 deletions
diff --git a/svtools/source/brwbox/brwbox1.cxx b/svtools/source/brwbox/brwbox1.cxx index 7bce837463b6..f8b5875d407c 100644 --- a/svtools/source/brwbox/brwbox1.cxx +++ b/svtools/source/brwbox/brwbox1.cxx @@ -1417,7 +1417,7 @@ bool BrowseBox::GoToRow( long nRow, bool bRowColMove, bool bKeepSelection ) return false; // not allowed? - if ( ( !bRowColMove && !IsCursorMoveAllowed( nRow, nCurColId ) ) ) + if ( !bRowColMove && !IsCursorMoveAllowed( nRow, nCurColId ) ) return false; if ( pDataWin->bNoScrollBack && nRow < nTopRow ) diff --git a/svtools/source/brwbox/datwin.cxx b/svtools/source/brwbox/datwin.cxx index 14070f1613cf..c9d1c2e86cf0 100644 --- a/svtools/source/brwbox/datwin.cxx +++ b/svtools/source/brwbox/datwin.cxx @@ -453,7 +453,7 @@ void BrowserDataWin::MouseMove( const MouseEvent& rEvt ) { // avoid pseudo MouseMoves Point aNewPos = OutputToScreenPixel( rEvt.GetPosPixel() ); - if ( ( aNewPos == aLastMousePos ) ) + if ( aNewPos == aLastMousePos ) return; aLastMousePos = aNewPos; diff --git a/svtools/source/contnr/imivctl1.cxx b/svtools/source/contnr/imivctl1.cxx index 21b0b1fc8a57..133e378502a8 100644 --- a/svtools/source/contnr/imivctl1.cxx +++ b/svtools/source/contnr/imivctl1.cxx @@ -1635,7 +1635,7 @@ void SvxIconChoiceCtrl_Impl::PaintEntry(SvxIconChoiceCtrlEntry* pEntry, const Po } } - bool bLargeIconMode = WB_ICON == ( nWinBits & (VIEWMODE_MASK) ); + bool bLargeIconMode = WB_ICON == ( nWinBits & VIEWMODE_MASK ); sal_uInt16 nBmpPaintFlags = PAINTFLAG_VER_CENTERED; if (bLargeIconMode) nBmpPaintFlags |= PAINTFLAG_HOR_CENTERED; @@ -1772,7 +1772,7 @@ tools::Rectangle SvxIconChoiceCtrl_Impl::CalcBmpRect( SvxIconChoiceCtrlEntry* pE aBound.SetPos( *pPos ); Point aPos( aBound.TopLeft() ); - switch( nWinBits & (VIEWMODE_MASK) ) + switch( nWinBits & VIEWMODE_MASK ) { case WB_ICON: { @@ -1816,7 +1816,7 @@ tools::Rectangle SvxIconChoiceCtrl_Impl::CalcTextRect( SvxIconChoiceCtrlEntry* p long nBoundWidth = aBound.GetWidth(); long nBoundHeight = aBound.GetHeight(); - switch( nWinBits & (VIEWMODE_MASK) ) + switch( nWinBits & VIEWMODE_MASK ) { case WB_ICON: aPos.Y() += aImageSize.Height(); @@ -1857,7 +1857,7 @@ long SvxIconChoiceCtrl_Impl::CalcBoundingWidth() const long nStringWidth = GetItemSize( IcnViewFieldType::Text ).Width(); long nWidth = 0; - switch( nWinBits & (VIEWMODE_MASK) ) + switch( nWinBits & VIEWMODE_MASK ) { case WB_ICON: nWidth = std::max( nStringWidth, aImageSize.Width() ); @@ -1878,7 +1878,7 @@ long SvxIconChoiceCtrl_Impl::CalcBoundingHeight() const long nStringHeight = GetItemSize(IcnViewFieldType::Text).Height(); long nHeight = 0; - switch( nWinBits & (VIEWMODE_MASK) ) + switch( nWinBits & VIEWMODE_MASK ) { case WB_ICON: nHeight = aImageSize.Height(); diff --git a/svtools/source/contnr/ivctrl.cxx b/svtools/source/contnr/ivctrl.cxx index 4bc2175cc6c2..5eef13d45aa5 100644 --- a/svtools/source/contnr/ivctrl.cxx +++ b/svtools/source/contnr/ivctrl.cxx @@ -349,10 +349,10 @@ void SvtIconChoiceCtrl::SetBackground( const Wallpaper& rPaper ) WallpaperStyle eStyle = aBackground.GetStyle(); Color aBack( aBackground.GetColor()); Color aTrans( COL_TRANSPARENT ); - if( aBack == aTrans && ( + if( aBack == aTrans && (!aBackground.IsBitmap() || - aBackground.GetBitmap().IsTransparent() || - (eStyle != WallpaperStyle::Tile && eStyle != WallpaperStyle::Scale)))) + aBackground.GetBitmap().IsTransparent() || + (eStyle != WallpaperStyle::Tile && eStyle != WallpaperStyle::Scale)) ) { aBackground.SetColor( rStyleSettings.GetFieldColor() ); } diff --git a/svtools/source/control/ruler.cxx b/svtools/source/control/ruler.cxx index b50b96db4388..758df8a09a89 100644 --- a/svtools/source/control/ruler.cxx +++ b/svtools/source/control/ruler.cxx @@ -2431,7 +2431,7 @@ void Ruler::SetNullOffset( long nPos ) void Ruler::SetLeftFrameMargin( long nPos ) { - if ( (mpData->nLeftFrameMargin != nPos) ) + if ( mpData->nLeftFrameMargin != nPos ) { mpData->nLeftFrameMargin = nPos; ImplUpdate(); @@ -2440,7 +2440,7 @@ void Ruler::SetLeftFrameMargin( long nPos ) void Ruler::SetRightFrameMargin( long nPos ) { - if ( (mpData->nRightFrameMargin != nPos) ) + if ( mpData->nRightFrameMargin != nPos ) { mpData->nRightFrameMargin = nPos; ImplUpdate(); diff --git a/svtools/source/graphic/descriptor.cxx b/svtools/source/graphic/descriptor.cxx index 39f5dad4b92a..719d650da7c0 100644 --- a/svtools/source/graphic/descriptor.cxx +++ b/svtools/source/graphic/descriptor.cxx @@ -269,9 +269,9 @@ void GraphicDescriptor::_getPropertyValues( const comphelper::PropertyMapEntry** { const GraphicType eType( mpGraphic ? mpGraphic->GetType() : meType ); - *pValues <<= ( ( eType == GraphicType::Bitmap ? graphic::GraphicType::PIXEL : + *pValues <<= ( eType == GraphicType::Bitmap ? graphic::GraphicType::PIXEL : ( eType == GraphicType::GdiMetafile ? graphic::GraphicType::VECTOR : - graphic::GraphicType::EMPTY ) ) ); + graphic::GraphicType::EMPTY ) ); } break; |