diff options
Diffstat (limited to 'vcl')
26 files changed, 32 insertions, 32 deletions
diff --git a/vcl/inc/unx/salframe.h b/vcl/inc/unx/salframe.h index 175b25a81bef..2be2992ae520 100644 --- a/vcl/inc/unx/salframe.h +++ b/vcl/inc/unx/salframe.h @@ -195,7 +195,7 @@ public: #endif bool IsOverrideRedirect() const; bool IsChildWindow() const { return bool(nStyle_ & (SalFrameStyleFlags::PLUG|SalFrameStyleFlags::SYSTEMCHILD)); } - bool IsSysChildWindow() const { return bool(nStyle_ & (SalFrameStyleFlags::SYSTEMCHILD)); } + bool IsSysChildWindow() const { return bool(nStyle_ & SalFrameStyleFlags::SYSTEMCHILD); } bool IsFloatGrabWindow() const; SalI18N_InputContext* getInputContext() const { return mpInputContext; } bool isMapped() const { return bMapped_; } diff --git a/vcl/opengl/RenderList.cxx b/vcl/opengl/RenderList.cxx index 6c60a1f74df2..4df0f620587c 100644 --- a/vcl/opengl/RenderList.cxx +++ b/vcl/opengl/RenderList.cxx @@ -334,7 +334,7 @@ void RenderList::addDrawPolyPolygon(const basegfx::B2DPolyPolygon& rPolyPolygon, for (sal_uInt32 i = 0; i <= nPoints; ++i) { - index1 = (i) % nPoints; + index1 = i % nPoints; index2 = (i + 1) % nPoints; x1 = aPolygon.getB2DPoint(index1).getX(); diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx index c8e62b9a2592..b93c9f7f1129 100644 --- a/vcl/source/control/button.cxx +++ b/vcl/source/control/button.cxx @@ -1671,7 +1671,7 @@ bool PushButton::set_property(const OString &rKey, const OUString &rValue) if (rKey == "has-default") { WinBits nBits = GetStyle(); - nBits &= ~(WB_DEFBUTTON); + nBits &= ~WB_DEFBUTTON; if (toBool(rValue)) nBits |= WB_DEFBUTTON; SetStyle(nBits); diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx index 7b30affd8732..211820a26d7e 100644 --- a/vcl/source/control/edit.cxx +++ b/vcl/source/control/edit.cxx @@ -204,7 +204,7 @@ bool Edit::set_property(const OString &rKey, const OUString &rValue) else if (rKey == "visibility") { WinBits nBits = GetStyle(); - nBits &= ~(WB_PASSWORD); + nBits &= ~WB_PASSWORD; if (!toBool(rValue)) nBits |= WB_PASSWORD; SetStyle(nBits); diff --git a/vcl/source/control/fixed.cxx b/vcl/source/control/fixed.cxx index 96da4001428a..23f06b7f03ca 100644 --- a/vcl/source/control/fixed.cxx +++ b/vcl/source/control/fixed.cxx @@ -400,7 +400,7 @@ bool FixedText::set_property(const OString &rKey, const OUString &rValue) else if (rKey == "ellipsize") { WinBits nBits = GetStyle(); - nBits &= ~(WB_PATHELLIPSIS); + nBits &= ~WB_PATHELLIPSIS; if (rValue != "none") { SAL_WARN_IF(rValue != "end", "vcl.layout", "Only endellipsis support for now"); diff --git a/vcl/source/filter/sgvtext.cxx b/vcl/source/filter/sgvtext.cxx index e53e6066e5ef..e993471628b5 100644 --- a/vcl/source/filter/sgvtext.cxx +++ b/vcl/source/filter/sgvtext.cxx @@ -756,7 +756,7 @@ void FormatLine(UCHAR* TBuf, sal_uInt16& Index, ObjTextType& Atr0, ObjTextType& if (UmbWdt<R->ChrXP) { BoxRest=R->ChrXP-UmbWdt; // so much should be crushed for (i=2;i<=nChars;i++) { // first character position remains! - Line[i]-=(i-1)*(BoxRest) /(nChars-1); + Line[i]-=(i-1)*BoxRest /(nChars-1); } R->ChrXP=UmbWdt; Line[nChars+1]=UmbWdt; diff --git a/vcl/source/fontsubset/sft.cxx b/vcl/source/fontsubset/sft.cxx index e66716edf652..58cd9f398850 100644 --- a/vcl/source/fontsubset/sft.cxx +++ b/vcl/source/fontsubset/sft.cxx @@ -188,7 +188,7 @@ static sal_uInt32 GetUInt32(const sal_uInt8 *ptr, size_t offset) #define Int32FromMOTA(a) (a) #else static sal_uInt16 Int16FromMOTA(sal_uInt16 a) { - return (sal_uInt16) (((sal_uInt8)((a) >> 8)) | ((sal_uInt8)(a) << 8)); + return (sal_uInt16) (((sal_uInt8)(a >> 8)) | ((sal_uInt8)a << 8)); } static sal_uInt32 Int32FromMOTA(sal_uInt32 a) { return ((a>>24)&0xFF) | (((a>>8)&0xFF00) | ((a&0xFF00)<<8) | ((a&0xFF)<<24)); diff --git a/vcl/source/gdi/CommonSalLayout.cxx b/vcl/source/gdi/CommonSalLayout.cxx index cbd30a0e6ba2..cb4f3d3862cc 100644 --- a/vcl/source/gdi/CommonSalLayout.cxx +++ b/vcl/source/gdi/CommonSalLayout.cxx @@ -45,7 +45,7 @@ static hb_blob_t* getFontTable(hb_face_t* /*face*/, hb_tag_t nTableTag, void* pU pTagName[0] = (char)(nTableTag >> 24); pTagName[1] = (char)(nTableTag >> 16); pTagName[2] = (char)(nTableTag >> 8); - pTagName[3] = (char)(nTableTag); + pTagName[3] = (char)nTableTag; pTagName[4] = 0; sal_uLong nLength = 0; diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx index dd4baa368ac7..ac9dec1c54b7 100644 --- a/vcl/source/gdi/pdfwriter_impl.cxx +++ b/vcl/source/gdi/pdfwriter_impl.cxx @@ -10380,7 +10380,7 @@ void PDFWriterImpl::writeTransparentObject( TransparencyEmit& rObject ) */ aLine.append( "/Length " ); - aLine.append( (sal_Int32)(nSize) ); + aLine.append( (sal_Int32)nSize ); aLine.append( "\n" ); if( bFlateFilter ) aLine.append( "/Filter/FlateDecode\n" ); @@ -13519,7 +13519,7 @@ sal_Int32 PDFWriterImpl::createControl( const PDFWriter::AnyWidget& rControl, sa // if control is a hidden signature, do not convert coordinates since we // need /Rect [ 0 0 0 0 ] - if ( ! ( ( rControl.getType() == PDFWriter::Signature ) && ( sigHidden ) ) ) + if ( ! ( ( rControl.getType() == PDFWriter::Signature ) && sigHidden ) ) { // convert to default user space now, since the mapmode may change // note: create default appearances before m_aRect gets transformed diff --git a/vcl/source/gdi/print2.cxx b/vcl/source/gdi/print2.cxx index b358fa0d4307..d64341ff168a 100644 --- a/vcl/source/gdi/print2.cxx +++ b/vcl/source/gdi/print2.cxx @@ -1213,7 +1213,7 @@ bool OutputDevice::RemoveTransparenciesFromMetaFile( const GDIMetaFile& rInMtf, aMtfMap.SetOrigin( Point( -aNewOrg.X(), -aNewOrg.Y() ) ); aPaintVDev->SetMapMode( aMtfMap ); } - else if( ( MetaActionType::PUSH == nType ) || ( MetaActionType::POP ) == nType ) + else if( ( MetaActionType::PUSH == nType ) || MetaActionType::POP == nType ) { pCurrAct->Execute( aMapVDev.get() ); pCurrAct->Execute( aPaintVDev.get() ); diff --git a/vcl/source/outdev/gradient.cxx b/vcl/source/outdev/gradient.cxx index 864a3d91da7a..56e6da7b4787 100644 --- a/vcl/source/outdev/gradient.cxx +++ b/vcl/source/outdev/gradient.cxx @@ -555,7 +555,7 @@ void OutputDevice::DrawComplexGradient( const tools::Rectangle& rRect, aPoly.Rotate( aCenter, nAngle ); // adapt colour accordingly - const long nStepIndex = ( ( xPolyPoly ) ? i : ( i + 1 ) ); + const long nStepIndex = ( xPolyPoly ? i : ( i + 1 ) ); nRed = GetGradientColorValue( nStartRed + ( ( nRedSteps * nStepIndex ) / nSteps ) ); nGreen = GetGradientColorValue( nStartGreen + ( ( nGreenSteps * nStepIndex ) / nSteps ) ); nBlue = GetGradientColorValue( nStartBlue + ( ( nBlueSteps * nStepIndex ) / nSteps ) ); @@ -883,7 +883,7 @@ void OutputDevice::DrawComplexGradientToMetafile( const tools::Rectangle& rRect, aPoly.Rotate( aCenter, nAngle ); // adapt colour accordingly - const long nStepIndex = ( ( xPolyPoly ) ? i : ( i + 1 ) ); + const long nStepIndex = ( xPolyPoly ? i : ( i + 1 ) ); nRed = GetGradientColorValue( nStartRed + ( ( nRedSteps * nStepIndex ) / nSteps ) ); nGreen = GetGradientColorValue( nStartGreen + ( ( nGreenSteps * nStepIndex ) / nSteps ) ); nBlue = GetGradientColorValue( nStartBlue + ( ( nBlueSteps * nStepIndex ) / nSteps ) ); diff --git a/vcl/source/outdev/text.cxx b/vcl/source/outdev/text.cxx index ba9208d5ba1c..580a6c372664 100644 --- a/vcl/source/outdev/text.cxx +++ b/vcl/source/outdev/text.cxx @@ -1731,8 +1731,8 @@ void OutputDevice::ImplDrawText( OutputDevice& rTargetDevice, const tools::Recta { std::unique_ptr<long[]> const pCaretXArray(new long[2 * aStr.getLength()]); /*sal_Bool bRet =*/ _rLayout.GetCaretPositions( aStr, pCaretXArray.get(), 0, aStr.getLength() ); - long lc_x1 = pCaretXArray[2*(nMnemonicPos)]; - long lc_x2 = pCaretXArray[2*(nMnemonicPos)+1]; + long lc_x1 = pCaretXArray[2*nMnemonicPos]; + long lc_x2 = pCaretXArray[2*nMnemonicPos+1]; nMnemonicWidth = rTargetDevice.LogicWidthToDeviceCoordinate( std::abs(lc_x1 - lc_x2) ); Point aTempPos = rTargetDevice.LogicToPixel( aPos ); diff --git a/vcl/source/outdev/transparent.cxx b/vcl/source/outdev/transparent.cxx index 91dfec3b24cc..e4e21d49b0a1 100644 --- a/vcl/source/outdev/transparent.cxx +++ b/vcl/source/outdev/transparent.cxx @@ -677,7 +677,7 @@ void OutputDevice::DrawTransparent( const GDIMetaFile& rMtf, const Point& rPos, return; if( ( rTransparenceGradient.GetStartColor() == aBlack && rTransparenceGradient.GetEndColor() == aBlack ) || - ( mnDrawMode & ( DrawModeFlags::NoTransparency ) ) ) + ( mnDrawMode & DrawModeFlags::NoTransparency ) ) { const_cast<GDIMetaFile&>(rMtf).WindStart(); const_cast<GDIMetaFile&>(rMtf).Play( this, rPos, rSize ); diff --git a/vcl/source/window/accessibility.cxx b/vcl/source/window/accessibility.cxx index 8829ab19c20a..cee8929a905a 100644 --- a/vcl/source/window/accessibility.cxx +++ b/vcl/source/window/accessibility.cxx @@ -321,7 +321,7 @@ sal_uInt16 Window::getDefaultAccessibleRole() const case WindowType::PATTERNFIELD: case WindowType::CALCINPUTLINE: - case WindowType::EDIT: nRole = ( GetStyle() & WB_PASSWORD ) ? (accessibility::AccessibleRole::PASSWORD_TEXT) : (accessibility::AccessibleRole::TEXT); break; + case WindowType::EDIT: nRole = ( GetStyle() & WB_PASSWORD ) ? accessibility::AccessibleRole::PASSWORD_TEXT : accessibility::AccessibleRole::TEXT; break; case WindowType::PATTERNBOX: case WindowType::NUMERICBOX: diff --git a/vcl/source/window/paint.cxx b/vcl/source/window/paint.cxx index 515078b3faa6..2fc2ae29971f 100644 --- a/vcl/source/window/paint.cxx +++ b/vcl/source/window/paint.cxx @@ -598,7 +598,7 @@ void Window::ImplCallPaint(const vcl::Region* pRegion, ImplPaintFlags nPaintFlag return; } - nPaintFlags = mpWindowImpl->mnPaintFlags & ~(ImplPaintFlags::Paint); + nPaintFlags = mpWindowImpl->mnPaintFlags & ~ImplPaintFlags::Paint; PaintHelper aHelper(this, nPaintFlags); diff --git a/vcl/source/window/seleng.cxx b/vcl/source/window/seleng.cxx index 0366202df3fb..c911a9059551 100644 --- a/vcl/source/window/seleng.cxx +++ b/vcl/source/window/seleng.cxx @@ -146,7 +146,7 @@ bool SelectionEngine::SelMouseButtonDown( const MouseEvent& rMEvt ) if ( (nFlags & SelectionEngineFlags::DRG_ENAB) && bSelAtPoint ) { nFlags |= SelectionEngineFlags::WAIT_UPEVT; - nFlags &= ~(SelectionEngineFlags::IN_SEL); + nFlags &= ~SelectionEngineFlags::IN_SEL; pWin->ReleaseMouse(); return true; // wait for STARTDRAG-Command-Event } diff --git a/vcl/source/window/syswin.cxx b/vcl/source/window/syswin.cxx index f1f59c8de02d..5c9567f47d61 100644 --- a/vcl/source/window/syswin.cxx +++ b/vcl/source/window/syswin.cxx @@ -848,7 +848,7 @@ void SystemWindow::GetWindowStateData( WindowStateData& rData ) const // #94144# allow Minimize again, should be masked out when read from configuration // 91625 - ignore Minimize if ( !(nValidMask&WindowStateMask::Minimized) ) - aState.mnState &= ~(WindowStateState::Minimized); + aState.mnState &= ~WindowStateState::Minimized; rData.SetState( aState.mnState ); } rData.SetMask( nValidMask ); diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx index c76de72b03e1..c7fe44fd6406 100644 --- a/vcl/source/window/toolbox.cxx +++ b/vcl/source/window/toolbox.cxx @@ -1171,7 +1171,7 @@ void ToolBox::ImplInit( vcl::Window* pParent, WinBits nStyle ) mbScroll = (nStyle & WB_SCROLL) != 0; mnWinStyle = nStyle; - DockingWindow::ImplInit( pParent, nStyle & ~(WB_BORDER) ); + DockingWindow::ImplInit( pParent, nStyle & ~WB_BORDER ); // dockingwindow's ImplInit removes some bits, so restore them here to allow keyboard handling for toolbars ImplGetWindowImpl()->mnStyle |= WB_TABSTOP|WB_NODIALOGCONTROL; // always set WB_TABSTOP for ToolBars diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx index 56359bad3ce4..05834661936a 100644 --- a/vcl/source/window/window2.cxx +++ b/vcl/source/window/window2.cxx @@ -1482,7 +1482,7 @@ bool Window::set_property(const OString &rKey, const OUString &rValue) else if (rKey == "resizable") { WinBits nBits = GetStyle(); - nBits &= ~(WB_SIZEABLE); + nBits &= ~WB_SIZEABLE; if (toBool(rValue)) nBits |= WB_SIZEABLE; SetStyle(nBits); @@ -1534,7 +1534,7 @@ bool Window::set_property(const OString &rKey, const OUString &rValue) else if (rKey == "wrap") { WinBits nBits = GetStyle(); - nBits &= ~(WB_WORDBREAK); + nBits &= ~WB_WORDBREAK; if (toBool(rValue)) nBits |= WB_WORDBREAK; SetStyle(nBits); diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx index facbcef4ea28..b73c5046a3d2 100644 --- a/vcl/unx/generic/app/saldisp.cxx +++ b/vcl/unx/generic/app/saldisp.cxx @@ -2506,7 +2506,7 @@ Pixel SalVisual::GetTCPixel( SalColor nSalColor ) const Pixel b = (Pixel)SALCOLOR_BLUE( nSalColor ); if( SALCOLORREVERSE == eRGBMode_ ) - return (b << 16) | (g << 8) | (r); + return (b << 16) | (g << 8) | r; if( otherSalRGB != eRGBMode_ ) // 8+8+8=24 return (r << nRedShift_) | (g << nGreenShift_) | (b << nBlueShift_); diff --git a/vcl/unx/generic/gdi/cairotextrender.cxx b/vcl/unx/generic/gdi/cairotextrender.cxx index 5d8174d61cdc..3124725785d6 100644 --- a/vcl/unx/generic/gdi/cairotextrender.cxx +++ b/vcl/unx/generic/gdi/cairotextrender.cxx @@ -160,7 +160,7 @@ namespace double toRadian(int nDegree10th) { - return (3600 - (nDegree10th)) * M_PI / 1800.0; + return (3600 - nDegree10th) * M_PI / 1800.0; } } diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx index e269c763829a..cbe1ecbd7367 100644 --- a/vcl/unx/generic/window/salframe.cxx +++ b/vcl/unx/generic/window/salframe.cxx @@ -3364,7 +3364,7 @@ long X11SalFrame::HandleFocusEvent( XFocusChangeEvent *pEvent ) { FloatWinPopupFlags nMode = pSVData->maWinData.mpFirstFloat->GetPopupModeFlags(); pSVData->maWinData.mpFirstFloat->SetPopupModeFlags( - nMode & ~(FloatWinPopupFlags::NoAppFocusClose)); + nMode & ~FloatWinPopupFlags::NoAppFocusClose); } return nRet; } diff --git a/vcl/unx/gtk/gtksalframe.cxx b/vcl/unx/gtk/gtksalframe.cxx index 802d3c3d0267..0e2e572de0f3 100644 --- a/vcl/unx/gtk/gtksalframe.cxx +++ b/vcl/unx/gtk/gtksalframe.cxx @@ -1245,7 +1245,7 @@ void GtkSalFrame::Init( SalFrame* pParent, SalFrameStyleFlags nStyle ) if( bDecoHandling ) { gtk_window_set_resizable( GTK_WINDOW(m_pWindow), bool(nStyle & SalFrameStyleFlags::SIZEABLE) ); - if( nStyle & (SalFrameStyleFlags::OWNERDRAWDECORATION) ) + if( nStyle & SalFrameStyleFlags::OWNERDRAWDECORATION ) lcl_set_accept_focus( GTK_WINDOW(m_pWindow), false, false ); } } diff --git a/vcl/unx/gtk/salnativewidgets-gtk.cxx b/vcl/unx/gtk/salnativewidgets-gtk.cxx index d2dbd5b9298a..36f7f2e1d0a6 100644 --- a/vcl/unx/gtk/salnativewidgets-gtk.cxx +++ b/vcl/unx/gtk/salnativewidgets-gtk.cxx @@ -2307,9 +2307,9 @@ static tools::Rectangle NWGetEditBoxPixmapRect(SalX11Screen nScreen, if ( !interiorFocus ) { - pixmapRect.Move( -(focusWidth), -(focusWidth) ); - pixmapRect.SetSize( Size( pixmapRect.GetWidth() + (2*(focusWidth)), - pixmapRect.GetHeight() + (2*(focusWidth)) ) ); + pixmapRect.Move( -focusWidth, -focusWidth ); + pixmapRect.SetSize( Size( pixmapRect.GetWidth() + (2*focusWidth), + pixmapRect.GetHeight() + (2*focusWidth) ) ); } return pixmapRect; diff --git a/vcl/unx/gtk/salprn-gtk.cxx b/vcl/unx/gtk/salprn-gtk.cxx index 626b7ea10e01..7ffbffb9c939 100644 --- a/vcl/unx/gtk/salprn-gtk.cxx +++ b/vcl/unx/gtk/salprn-gtk.cxx @@ -541,7 +541,7 @@ GtkPrintDialog::impl_initCustomTab() pCurParent = pCurTabPage; aCustomTabs.push_back(std::make_pair(pCurTabPage, aText)); } - else if (aCtrlType == "Subgroup" && (pCurParent /*|| bOnJobPageValue*/)) + else if (aCtrlType == "Subgroup") { bIgnoreSubgroup = bIgnore; if (bIgnore) diff --git a/vcl/workben/outdevgrind.cxx b/vcl/workben/outdevgrind.cxx index c86039c09590..1470a06b58b5 100644 --- a/vcl/workben/outdevgrind.cxx +++ b/vcl/workben/outdevgrind.cxx @@ -597,7 +597,7 @@ void grindFunc( OutputDevice& rTarget, fprintf( stdout, "Duration: %d ms (%d repetitions)\tOperation: %s\tSetup: %s\n", (int)(osl_getGlobalTimer() - nStartTime), - (int)(nTurns), + (int)nTurns, iter->first, pMsg ); } |