summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
Diffstat (limited to 'vcl')
-rw-r--r--vcl/qt5/Qt5Frame.cxx4
-rw-r--r--vcl/source/control/imp_listbox.cxx2
-rw-r--r--vcl/source/filter/ixpm/xpmread.cxx2
-rw-r--r--vcl/source/gdi/sallayout.cxx4
-rw-r--r--vcl/source/treelist/headbar.cxx4
-rw-r--r--vcl/source/treelist/svimpbox.cxx4
-rw-r--r--vcl/source/treelist/transfer.cxx2
-rw-r--r--vcl/source/window/dockmgr.cxx8
-rw-r--r--vcl/source/window/dockwin.cxx8
-rw-r--r--vcl/source/window/menufloatingwindow.cxx2
-rw-r--r--vcl/source/window/mouse.cxx4
-rw-r--r--vcl/source/window/splitwin.cxx16
-rw-r--r--vcl/unx/generic/app/saldisp.cxx4
13 files changed, 32 insertions, 32 deletions
diff --git a/vcl/qt5/Qt5Frame.cxx b/vcl/qt5/Qt5Frame.cxx
index e8fb1456705b..9a41cf38bf8b 100644
--- a/vcl/qt5/Qt5Frame.cxx
+++ b/vcl/qt5/Qt5Frame.cxx
@@ -389,7 +389,7 @@ void Qt5Frame::Center()
if (m_pParent)
{
QWidget* pWindow = m_pParent->GetQWidget()->window();
- QWidget* const pWidget = (m_pTopLevel) ? m_pTopLevel : m_pQWidget;
+ QWidget* const pWidget = m_pTopLevel ? m_pTopLevel : m_pQWidget;
pWidget->move(pWindow->frameGeometry().topLeft() + pWindow->rect().center()
- pWidget->rect().center());
}
@@ -431,7 +431,7 @@ void Qt5Frame::SetPosSize(long nX, long nY, long nWidth, long nHeight, sal_uInt1
m_bDefaultSize = false;
if (isChild(false) || !m_pQWidget->isMaximized())
{
- QWidget* const pWidget = (m_pTopLevel) ? m_pTopLevel : m_pQWidget;
+ QWidget* const pWidget = m_pTopLevel ? m_pTopLevel : m_pQWidget;
if (m_nStyle & SalFrameStyleFlags::SIZEABLE)
pWidget->resize(nWidth, nHeight);
diff --git a/vcl/source/control/imp_listbox.cxx b/vcl/source/control/imp_listbox.cxx
index 1a059785994a..a5711ab39cbf 100644
--- a/vcl/source/control/imp_listbox.cxx
+++ b/vcl/source/control/imp_listbox.cxx
@@ -1735,7 +1735,7 @@ void ImplListBoxWindow::ImplPaint(vcl::RenderContext& rRenderContext, sal_Int32
{
mbInUserDraw = true;
mnUserDrawEntry = nPos;
- aRect.AdjustLeft( -(mnLeft) );
+ aRect.AdjustLeft( -mnLeft );
if (nPos < GetEntryList()->GetMRUCount())
nPos = GetEntryList()->FindEntry(GetEntryList()->GetEntryText(nPos));
nPos = nPos - GetEntryList()->GetMRUCount();
diff --git a/vcl/source/filter/ixpm/xpmread.cxx b/vcl/source/filter/ixpm/xpmread.cxx
index dd1166a20caa..d1e50944fd61 100644
--- a/vcl/source/filter/ixpm/xpmread.cxx
+++ b/vcl/source/filter/ixpm/xpmread.cxx
@@ -557,7 +557,7 @@ bool XPMReader::ImplGetPara ( sal_uLong nNumb )
nSize++;
pPtr++;
}
- return ( ( nCount == nNumb ) && ( mpPara ) );
+ return ( ( nCount == nNumb ) && mpPara );
}
// The next string is read and stored in mpStringBuf (terminated with 0);
diff --git a/vcl/source/gdi/sallayout.cxx b/vcl/source/gdi/sallayout.cxx
index e6ef73d28882..9b665674d999 100644
--- a/vcl/source/gdi/sallayout.cxx
+++ b/vcl/source/gdi/sallayout.cxx
@@ -922,8 +922,8 @@ bool GenericSalLayout::GetNextGlyph(const GlyphItem** pGlyph,
// calculate absolute position in pixel units
Point aRelativePos = pGlyphIter->m_aLinearPos;
- aRelativePos.setX( aRelativePos.X() / ( mnUnitsPerPixel) );
- aRelativePos.setY( aRelativePos.Y() / ( mnUnitsPerPixel) );
+ aRelativePos.setX( aRelativePos.X() / mnUnitsPerPixel );
+ aRelativePos.setY( aRelativePos.Y() / mnUnitsPerPixel );
rPos = GetDrawPosition( aRelativePos );
return true;
diff --git a/vcl/source/treelist/headbar.cxx b/vcl/source/treelist/headbar.cxx
index 3eaaba9ef76c..9777fc55722e 100644
--- a/vcl/source/treelist/headbar.cxx
+++ b/vcl/source/treelist/headbar.cxx
@@ -309,7 +309,7 @@ void HeaderBar::ImplDrawItem(vcl::RenderContext& rRenderContext, sal_uInt16 nPos
{
// do not draw border
aRect.AdjustTop(mnBorderOff1 );
- aRect.AdjustBottom( -(mnBorderOff2) );
+ aRect.AdjustBottom( -mnBorderOff2 );
// delete background
if ( !pRect )
@@ -593,7 +593,7 @@ void HeaderBar::ImplUpdate(sal_uInt16 nPos, bool bEnd)
if (bEnd)
aRect.SetRight( mnDX - 1 );
aRect.AdjustTop(mnBorderOff1 );
- aRect.AdjustBottom( -(mnBorderOff2) );
+ aRect.AdjustBottom( -mnBorderOff2 );
Invalidate(aRect);
}
diff --git a/vcl/source/treelist/svimpbox.cxx b/vcl/source/treelist/svimpbox.cxx
index e8d927634960..7b3daeb913c2 100644
--- a/vcl/source/treelist/svimpbox.cxx
+++ b/vcl/source/treelist/svimpbox.cxx
@@ -1134,9 +1134,9 @@ void SvImpLBox::PositionScrollBars( Size& rSize, sal_uInt16 nMask )
Size aHorSize( rSize.Width(), nHorSBarHeight );
if( nMask & 0x0001 )
- aHorSize.AdjustWidth( -(nVerSBarWidth) );
+ aHorSize.AdjustWidth( -nVerSBarWidth );
if( nMask & 0x0002 )
- aVerSize.AdjustHeight( -(nHorSBarHeight) );
+ aVerSize.AdjustHeight( -nHorSBarHeight );
aVerSize.AdjustHeight(2 * nOverlap );
Point aVerPos( rSize.Width() - aVerSize.Width() + nOverlap, -nOverlap );
diff --git a/vcl/source/treelist/transfer.cxx b/vcl/source/treelist/transfer.cxx
index cc7b97ba02df..41c41bf71a08 100644
--- a/vcl/source/treelist/transfer.cxx
+++ b/vcl/source/treelist/transfer.cxx
@@ -1330,7 +1330,7 @@ SotClipboardFormatId TransferableDataHelper::GetFormat( sal_uInt32 nFormat ) con
{
::osl::MutexGuard aGuard(mxImpl->maMutex);
DBG_ASSERT(nFormat < maFormats.size(), "TransferableDataHelper::GetFormat: invalid format index");
- return( ( nFormat < maFormats.size() ) ? (maFormats)[ nFormat ].mnSotId : SotClipboardFormatId::NONE );
+ return( ( nFormat < maFormats.size() ) ? maFormats[ nFormat ].mnSotId : SotClipboardFormatId::NONE );
}
DataFlavor TransferableDataHelper::GetFormatDataFlavor( sal_uInt32 nFormat ) const
diff --git a/vcl/source/window/dockmgr.cxx b/vcl/source/window/dockmgr.cxx
index d1238c89c245..c8599d46a318 100644
--- a/vcl/source/window/dockmgr.cxx
+++ b/vcl/source/window/dockmgr.cxx
@@ -584,8 +584,8 @@ void ImplDockingWindowWrapper::Tracking( const TrackingEvent& rTEvt )
{
if ( bFloatMode )
{
- aTrackRect.AdjustLeft( -(mnDockLeft) );
- aTrackRect.AdjustTop( -(mnDockTop) );
+ aTrackRect.AdjustLeft( -mnDockLeft );
+ aTrackRect.AdjustTop( -mnDockTop );
aTrackRect.AdjustRight(mnDockRight );
aTrackRect.AdjustBottom(mnDockBottom );
}
@@ -595,8 +595,8 @@ void ImplDockingWindowWrapper::Tracking( const TrackingEvent& rTEvt )
{
aTrackRect.AdjustLeft(mnDockLeft );
aTrackRect.AdjustTop(mnDockTop );
- aTrackRect.AdjustRight( -(mnDockRight) );
- aTrackRect.AdjustBottom( -(mnDockBottom) );
+ aTrackRect.AdjustRight( -mnDockRight );
+ aTrackRect.AdjustBottom( -mnDockBottom );
}
}
mbLastFloatMode = bFloatMode;
diff --git a/vcl/source/window/dockwin.cxx b/vcl/source/window/dockwin.cxx
index 7b5d2fdcaebe..47f050d1af99 100644
--- a/vcl/source/window/dockwin.cxx
+++ b/vcl/source/window/dockwin.cxx
@@ -462,8 +462,8 @@ void DockingWindow::Tracking( const TrackingEvent& rTEvt )
{
if ( bFloatMode )
{
- aTrackRect.AdjustLeft( -(mnDockLeft) );
- aTrackRect.AdjustTop( -(mnDockTop) );
+ aTrackRect.AdjustLeft( -mnDockLeft );
+ aTrackRect.AdjustTop( -mnDockTop );
aTrackRect.AdjustRight(mnDockRight );
aTrackRect.AdjustBottom(mnDockBottom );
}
@@ -473,8 +473,8 @@ void DockingWindow::Tracking( const TrackingEvent& rTEvt )
{
aTrackRect.AdjustLeft(mnDockLeft );
aTrackRect.AdjustTop(mnDockTop );
- aTrackRect.AdjustRight( -(mnDockRight) );
- aTrackRect.AdjustBottom( -(mnDockBottom) );
+ aTrackRect.AdjustRight( -mnDockRight );
+ aTrackRect.AdjustBottom( -mnDockBottom );
}
}
mbLastFloatMode = bFloatMode;
diff --git a/vcl/source/window/menufloatingwindow.cxx b/vcl/source/window/menufloatingwindow.cxx
index 62b6102f0325..7986679f8af1 100644
--- a/vcl/source/window/menufloatingwindow.cxx
+++ b/vcl/source/window/menufloatingwindow.cxx
@@ -191,7 +191,7 @@ vcl::Region MenuFloatingWindow::ImplCalcClipRegion() const
Size aOutSz = GetOutputSizePixel();
tools::Rectangle aRect( Point(), aOutSz );
aRect.AdjustTop(nScrollerHeight );
- aRect.AdjustBottom( -(nScrollerHeight) );
+ aRect.AdjustBottom( -nScrollerHeight );
vcl::Region aRegion(aRect);
diff --git a/vcl/source/window/mouse.cxx b/vcl/source/window/mouse.cxx
index c0e5a385b626..0fb993367317 100644
--- a/vcl/source/window/mouse.cxx
+++ b/vcl/source/window/mouse.cxx
@@ -68,8 +68,8 @@ WindowHitTest Window::ImplHitTest( const Point& rFramePos )
if ( mpWindowImpl->mbWinRegion )
{
Point aTempPos = aFramePos;
- aTempPos.AdjustX( -(mnOutOffX) );
- aTempPos.AdjustY( -(mnOutOffY) );
+ aTempPos.AdjustX( -mnOutOffX );
+ aTempPos.AdjustY( -mnOutOffY );
if ( !mpWindowImpl->maWinRegion.IsInside( aTempPos ) )
return WindowHitTest::NONE;
}
diff --git a/vcl/source/window/splitwin.cxx b/vcl/source/window/splitwin.cxx
index 080a6ae38a7a..824d020b97c0 100644
--- a/vcl/source/window/splitwin.cxx
+++ b/vcl/source/window/splitwin.cxx
@@ -1108,7 +1108,7 @@ void SplitWindow::ImplDrawSplitTracking(const Point& rPos)
aRect.SetRight( aRect.Left() + mpSplitSet->mnSplitSize - 1 );
if (!(mnWinStyle & WB_NOSPLITDRAW))
aRect.AdjustRight( -1 );
- if ((mnSplitTest & SPLIT_WINDOW) && (mbFadeOut))
+ if ((mnSplitTest & SPLIT_WINDOW) && mbFadeOut)
{
aRect.AdjustLeft(SPLITWIN_SPLITSIZEEXLN );
aRect.AdjustRight(SPLITWIN_SPLITSIZEEXLN );
@@ -1122,7 +1122,7 @@ void SplitWindow::ImplDrawSplitTracking(const Point& rPos)
aRect.SetBottom( aRect.Top() + mpSplitSet->mnSplitSize - 1 );
if (!(mnWinStyle & WB_NOSPLITDRAW))
aRect.AdjustBottom( -1 );
- if ((mnSplitTest & SPLIT_WINDOW) && (mbFadeOut))
+ if ((mnSplitTest & SPLIT_WINDOW) && mbFadeOut)
{
aRect.AdjustTop(SPLITWIN_SPLITSIZEEXLN );
aRect.AdjustBottom(SPLITWIN_SPLITSIZEEXLN );
@@ -1429,7 +1429,7 @@ void SplitWindow::ImplSplitMousePos( Point& rMousePos )
{
if ( mnSplitTest & SPLIT_HORZ )
{
- rMousePos.AdjustX( -(mnMouseOff) );
+ rMousePos.AdjustX( -mnMouseOff );
if ( rMousePos.X() < maDragRect.Left() )
rMousePos.setX( maDragRect.Left() );
else if ( rMousePos.X()+mpSplitSet->mnSplitSize+1 > maDragRect.Right() )
@@ -1439,7 +1439,7 @@ void SplitWindow::ImplSplitMousePos( Point& rMousePos )
}
else
{
- rMousePos.AdjustY( -(mnMouseOff) );
+ rMousePos.AdjustY( -mnMouseOff );
if ( rMousePos.Y() < maDragRect.Top() )
rMousePos.setY( maDragRect.Top() );
else if ( rMousePos.Y()+mpSplitSet->mnSplitSize+1 > maDragRect.Bottom() )
@@ -1477,7 +1477,7 @@ void SplitWindow::ImplGetButtonRect( tools::Rectangle& rRect, bool bTest ) const
rRect.SetBottom( mnDY-mnBottomBorder-1 );
if ( bTest )
{
- rRect.AdjustTop( -(mnTopBorder) );
+ rRect.AdjustTop( -mnTopBorder );
rRect.AdjustBottom(mnBottomBorder );
}
break;
@@ -1488,7 +1488,7 @@ void SplitWindow::ImplGetButtonRect( tools::Rectangle& rRect, bool bTest ) const
rRect.SetBottom( mnTopBorder+nSplitSize-1 );
if ( bTest )
{
- rRect.AdjustTop( -(mnTopBorder) );
+ rRect.AdjustTop( -mnTopBorder );
rRect.AdjustBottom(mnBottomBorder );
}
break;
@@ -1499,7 +1499,7 @@ void SplitWindow::ImplGetButtonRect( tools::Rectangle& rRect, bool bTest ) const
rRect.SetBottom( rRect.Top()+SPLITWIN_SPLITSIZEAUTOHIDE );
if ( bTest )
{
- rRect.AdjustLeft( -(mnLeftBorder) );
+ rRect.AdjustLeft( -mnLeftBorder );
rRect.AdjustRight(mnRightBorder );
}
break;
@@ -1510,7 +1510,7 @@ void SplitWindow::ImplGetButtonRect( tools::Rectangle& rRect, bool bTest ) const
rRect.SetBottom( rRect.Top()+SPLITWIN_SPLITSIZEAUTOHIDE );
if ( bTest )
{
- rRect.AdjustLeft( -(mnLeftBorder) );
+ rRect.AdjustLeft( -mnLeftBorder );
rRect.AdjustRight(mnRightBorder );
}
break;
diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx
index 5de28384b357..5af29803bbeb 100644
--- a/vcl/unx/generic/app/saldisp.cxx
+++ b/vcl/unx/generic/app/saldisp.cxx
@@ -1439,7 +1439,7 @@ KeySym SalDisplay::GetKeySym( XKeyEvent *pEvent,
*pStatusReturn = 0;
SalI18N_InputMethod* const pInputMethod =
- ( pXLib_ ) ? pXLib_->GetInputMethod() : nullptr;
+ pXLib_ ? pXLib_->GetInputMethod() : nullptr;
// first get the printable of the possibly modified KeySym
if ( (aInputContext == nullptr)
@@ -1946,7 +1946,7 @@ void SalX11Display::Yield()
bool SalX11Display::Dispatch( XEvent *pEvent )
{
SalI18N_InputMethod* const pInputMethod =
- ( pXLib_ ) ? pXLib_->GetInputMethod() : nullptr;
+ pXLib_ ? pXLib_->GetInputMethod() : nullptr;
if( pInputMethod )
{