diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-12-04 11:20:03 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-12-05 07:49:30 +0100 |
| commit | e4472d3c139294499f4c0caeebd9d4e995958eb0 (patch) | |
| tree | 3e62a6530f8b758dddab18981ee38cc76ecaef9e | |
| parent | Include vcl/outdev.hxx (diff) | |
| download | core-e4472d3c139294499f4c0caeebd9d4e995958eb0.tar.gz core-e4472d3c139294499f4c0caeebd9d4e995958eb0.zip | |
loplugin:unnecessaryparen include more assignments
Change-Id: I9fb8366634b31230b732dd38a98f800075529714
Reviewed-on: https://gerrit.libreoffice.org/64510
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
180 files changed, 481 insertions, 452 deletions
diff --git a/accessibility/source/extended/AccessibleGridControlTable.cxx b/accessibility/source/extended/AccessibleGridControlTable.cxx index 6e5e9d6def79..413a1c15d163 100644 --- a/accessibility/source/extended/AccessibleGridControlTable.cxx +++ b/accessibility/source/extended/AccessibleGridControlTable.cxx @@ -222,7 +222,7 @@ void SAL_CALL AccessibleGridControlTable::selectAccessibleChild( sal_Int32 nChil ensureIsAlive(); ensureIsValidIndex( nChildIndex ); sal_Int32 nColumns = m_aTable.GetColumnCount(); - sal_Int32 nRow = (nChildIndex / nColumns); + sal_Int32 nRow = nChildIndex / nColumns; m_aTable.SelectRow( nRow, true ); } sal_Bool SAL_CALL AccessibleGridControlTable::isAccessibleChildSelected( sal_Int32 nChildIndex ) @@ -232,7 +232,7 @@ sal_Bool SAL_CALL AccessibleGridControlTable::isAccessibleChildSelected( sal_Int ensureIsAlive(); ensureIsValidIndex( nChildIndex ); sal_Int32 nColumns = m_aTable.GetColumnCount(); - sal_Int32 nRow = (nChildIndex / nColumns); + sal_Int32 nRow = nChildIndex / nColumns; return isAccessibleRowSelected(nRow); } void SAL_CALL AccessibleGridControlTable::clearAccessibleSelection() diff --git a/accessibility/source/extended/accessiblelistboxentry.cxx b/accessibility/source/extended/accessiblelistboxentry.cxx index 3056b729e1c8..1a92d967e246 100644 --- a/accessibility/source/extended/accessiblelistboxentry.cxx +++ b/accessibility/source/extended/accessiblelistboxentry.cxx @@ -1095,7 +1095,7 @@ namespace accessibility { ::osl::MutexGuard aGuard( m_aMutex ); Any aValue; - sal_Int32 level = (static_cast<sal_Int32>(m_aEntryPath.size()) - 1); + sal_Int32 level = static_cast<sal_Int32>(m_aEntryPath.size()) - 1; level = level < 0 ? 0: level; aValue <<= level; return aValue; diff --git a/basctl/source/dlged/dlged.cxx b/basctl/source/dlged/dlged.cxx index 23f41d06e6e9..f57e62318f75 100644 --- a/basctl/source/dlged/dlged.cxx +++ b/basctl/source/dlged/dlged.cxx @@ -1172,8 +1172,8 @@ void DlgEditor::Print( Printer* pPrinter, const OUString& rTitle ) // not wor double nPaperSzHeight = aPaperSz.Height(); double nBmpSzWidth = aBmpSz.Width(); double nBmpSzHeight = aBmpSz.Height(); - double nScaleX = (nPaperSzWidth / nBmpSzWidth ); - double nScaleY = (nPaperSzHeight / nBmpSzHeight ); + double nScaleX = nPaperSzWidth / nBmpSzWidth; + double nScaleY = nPaperSzHeight / nBmpSzHeight; Size aOutputSz; if( nBmpSzHeight * nScaleX <= nPaperSzHeight ) diff --git a/basegfx/source/polygon/b2dpolygonclipper.cxx b/basegfx/source/polygon/b2dpolygonclipper.cxx index b263c88e7c44..f512916052a0 100644 --- a/basegfx/source/polygon/b2dpolygonclipper.cxx +++ b/basegfx/source/polygon/b2dpolygonclipper.cxx @@ -583,11 +583,11 @@ namespace basegfx // to bring 't' into the [0<=x<=1] interval. ::basegfx::B2DPoint dir((*next)-(*curr)); - double denominator = ( pPlane->nx*dir.getX() + - pPlane->ny*dir.getY() ); - double numerator = ( pPlane->nx*curr->getX() + + double denominator = pPlane->nx*dir.getX() + + pPlane->ny*dir.getY(); + double numerator = pPlane->nx*curr->getX() + pPlane->ny*curr->getY() + - pPlane->d ); + pPlane->d; double t = -numerator/denominator; // calculate the actual point of intersection @@ -602,11 +602,11 @@ namespace basegfx // to bring 't' into the [0<=x<=1] interval. ::basegfx::B2DPoint dir((*next)-(*curr)); - double denominator = ( pPlane->nx*dir.getX() + - pPlane->ny*dir.getY() ); - double numerator = ( pPlane->nx*curr->getX() + + double denominator = pPlane->nx*dir.getX() + + pPlane->ny*dir.getY(); + double numerator = pPlane->nx*curr->getX() + pPlane->ny*curr->getY() + - pPlane->d ); + pPlane->d; double t = -numerator/denominator; // calculate the actual point of intersection diff --git a/basic/source/comp/io.cxx b/basic/source/comp/io.cxx index 988e56031a3e..d1abbee9c330 100644 --- a/basic/source/comp/io.cxx +++ b/basic/source/comp/io.cxx @@ -200,7 +200,7 @@ void SbiParser::Open() if( Peek() == WRITE ) { Next(); - nMode |= (StreamMode::READ | StreamMode::WRITE); + nMode |= StreamMode::READ | StreamMode::WRITE; } else nMode |= StreamMode::READ; diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx index 9490ca242f90..c137909935b0 100644 --- a/basic/source/runtime/methods.cxx +++ b/basic/source/runtime/methods.cxx @@ -3626,7 +3626,7 @@ void SbRtl_Shell(StarBASIC *, SbxArray & rPar, bool) pParamList.reset( new rtl_uString*[nParamCount]); for(int iVector = 0; iter != aTokenVector.end(); ++iVector, ++iter) { - const OUString& rParamStr = (*iter); + const OUString& rParamStr = *iter; pParamList[iVector] = nullptr; rtl_uString_assign(&(pParamList[iVector]), rParamStr.pData); } @@ -4636,7 +4636,7 @@ void SbRtl_Partition(StarBASIC *, SbxArray & rPar, bool) if( nLen > nLen1 ) { // appending the leading spaces for the lowervalue - for ( sal_Int32 i= (nLen - nLen1) ; i > 0; --i ) + for ( sal_Int32 i= nLen - nLen1; i > 0; --i ) { aRetStr.append(" "); } @@ -4645,7 +4645,7 @@ void SbRtl_Partition(StarBASIC *, SbxArray & rPar, bool) if( nLen > nLen2 ) { // appending the leading spaces for the uppervalue - for ( sal_Int32 i= (nLen - nLen2) ; i > 0; --i ) + for ( sal_Int32 i= nLen - nLen2; i > 0; --i ) { aRetStr.append(" "); } diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx b/bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx index ad2b9f702c5d..e9e861f1c210 100644 --- a/bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx @@ -56,7 +56,7 @@ static OUString toUNOname( char const * p ) while (*p != 'E') { // read chars count - int n = (*p++ - '0'); + int n = *p++ - '0'; while ('0' <= *p && '9' >= *p) { n *= 10; @@ -81,7 +81,7 @@ static OUString toUNOname( char const * p ) extern "C" { static void _GLIBCXX_CDTOR_CALLABI deleteException( void * pExc ) { - __cxxabiv1::__cxa_exception const * header = (static_cast<__cxxabiv1::__cxa_exception const *>(pExc) - 1); + __cxxabiv1::__cxa_exception const * header = static_cast<__cxxabiv1::__cxa_exception const *>(pExc) - 1; typelib_TypeDescription * pTD = nullptr; OUString unoName( toUNOname( header->exceptionType->name() ) ); ::typelib_typedescription_getByName( &pTD, unoName.pData ); diff --git a/canvas/source/cairo/cairo_canvasfont.cxx b/canvas/source/cairo/cairo_canvasfont.cxx index 896f06f3dbaf..dac423fd6901 100644 --- a/canvas/source/cairo/cairo_canvasfont.cxx +++ b/canvas/source/cairo/cairo_canvasfont.cxx @@ -71,7 +71,7 @@ namespace cairocanvas const Size aSize = pOutDev->GetFontMetric( *maFont ).GetFontSize(); const double fDividend( rFontMatrix.m10 + rFontMatrix.m11 ); - double fStretch = (rFontMatrix.m00 + rFontMatrix.m01); + double fStretch = rFontMatrix.m00 + rFontMatrix.m01; if( !::basegfx::fTools::equalZero( fDividend) ) fStretch /= fDividend; diff --git a/canvas/source/opengl/ogl_canvashelper.cxx b/canvas/source/opengl/ogl_canvashelper.cxx index 2902c2e9b8db..41ecfebc31e4 100644 --- a/canvas/source/opengl/ogl_canvashelper.cxx +++ b/canvas/source/opengl/ogl_canvashelper.cxx @@ -709,7 +709,7 @@ namespace oglcanvas { const Size aSize = pVDev->GetFontMetric( aFont ).GetFontSize(); const double fDividend( rFontMatrix.m10 + rFontMatrix.m11 ); - double fStretch = (rFontMatrix.m00 + rFontMatrix.m01); + double fStretch = rFontMatrix.m00 + rFontMatrix.m01; if( !::basegfx::fTools::equalZero( fDividend) ) fStretch /= fDividend; diff --git a/canvas/source/vcl/canvasfont.cxx b/canvas/source/vcl/canvasfont.cxx index d3ca032d6563..b21ffd4cdaaa 100644 --- a/canvas/source/vcl/canvasfont.cxx +++ b/canvas/source/vcl/canvasfont.cxx @@ -71,7 +71,7 @@ namespace vclcanvas const Size aSize = rOutDev.GetFontMetric( *maFont ).GetFontSize(); const double fDividend( rFontMatrix.m10 + rFontMatrix.m11 ); - double fStretch = (rFontMatrix.m00 + rFontMatrix.m01); + double fStretch = rFontMatrix.m00 + rFontMatrix.m01; if( !::basegfx::fTools::equalZero( fDividend) ) fStretch /= fDividend; diff --git a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx index 8b5d0800b25f..0562ef61f3e3 100644 --- a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx @@ -335,7 +335,7 @@ Any WrappedSegmentOffsetProperty::convertOuterToInnerValue( const Any& rOuterVal Any aResult( rOuterValue ); if( rOuterValue >>= nOffset ) - aResult <<= (static_cast< double >( nOffset ) / 100.0); + aResult <<= static_cast< double >( nOffset ) / 100.0; return aResult; } diff --git a/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.cxx index 7604af7234d6..c55c03d7b976 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.cxx @@ -420,7 +420,7 @@ Any WrappedScaleProperty::getPropertyValue( tScaleProperty eScaleProperty, const (rSubIncrements[ 0 ].IntervalCount >>= nIntervalCount) && nIntervalCount > 0 ) { - aRet <<= ( fStepMain / static_cast< double >( nIntervalCount ) ); + aRet <<= fStepMain / static_cast< double >( nIntervalCount ); bNeedToCalculateExplicitValues = false; } } @@ -448,9 +448,9 @@ Any WrappedScaleProperty::getPropertyValue( tScaleProperty eScaleProperty, const } } else - aRet <<= ( aExplicitIncrement.Distance / + aRet <<= aExplicitIncrement.Distance / static_cast< double >( - aExplicitIncrement.SubIncrements[ 0 ].IntervalCount )); + aExplicitIncrement.SubIncrements[ 0 ].IntervalCount ); } else { diff --git a/chart2/source/controller/chartapiwrapper/WrappedTextRotationProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedTextRotationProperty.cxx index b6da99147888..365c6af63b28 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedTextRotationProperty.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedTextRotationProperty.cxx @@ -59,7 +59,7 @@ Any WrappedTextRotationProperty::convertOuterToInnerValue( const Any& rOuterValu sal_Int32 nVal = 0; if( rOuterValue >>= nVal ) { - double fDoubleDegrees = ( static_cast< double >( nVal ) / 100.0 ); + double fDoubleDegrees = static_cast< double >( nVal ) / 100.0; aRet <<= fDoubleDegrees; } return aRet; diff --git a/chart2/source/controller/main/ChartDropTargetHelper.cxx b/chart2/source/controller/main/ChartDropTargetHelper.cxx index 5205d9620753..d0eeddf9ce01 100644 --- a/chart2/source/controller/main/ChartDropTargetHelper.cxx +++ b/chart2/source/controller/main/ChartDropTargetHelper.cxx @@ -148,7 +148,7 @@ sal_Int8 ChartDropTargetHelper::ExecuteDrop( const ExecuteDropEvent& rEvt ) { // @todo: using implicit knowledge that ranges can be // merged with ";". This should be done more general - pCellRange->Value <<= (aOldRange + ";" + aRangeString ); + pCellRange->Value <<= aOldRange + ";" + aRangeString; } // move means replace range else diff --git a/chart2/source/controller/main/DragMethod_PieSegment.cxx b/chart2/source/controller/main/DragMethod_PieSegment.cxx index c150e7b297c9..c352f99f4df7 100644 --- a/chart2/source/controller/main/DragMethod_PieSegment.cxx +++ b/chart2/source/controller/main/DragMethod_PieSegment.cxx @@ -87,7 +87,7 @@ void DragMethod_PieSegment::MoveSdrDrag(const Point& rPnt) if( DragStat().CheckMinMoved(rPnt) ) { //calculate new offset - B2DVector aShiftVector(( B2DVector( rPnt.X(), rPnt.Y() ) - m_aStartVector )); + B2DVector aShiftVector( B2DVector( rPnt.X(), rPnt.Y() ) - m_aStartVector ); m_fAdditionalOffset = m_aDragDirection.scalar( aShiftVector )/m_fDragRange; // projection if( m_fAdditionalOffset < -m_fInitialOffset ) diff --git a/chart2/source/controller/main/UndoCommandDispatch.cxx b/chart2/source/controller/main/UndoCommandDispatch.cxx index b7481665a1a6..401cd70895f0 100644 --- a/chart2/source/controller/main/UndoCommandDispatch.cxx +++ b/chart2/source/controller/main/UndoCommandDispatch.cxx @@ -66,9 +66,9 @@ void UndoCommandDispatch::fireStatusEvent( const bool bFireAll = rURL.isEmpty(); uno::Any aUndoState, aRedoState; if( m_xUndoManager->isUndoPossible()) - aUndoState <<= ( SvtResId( STR_UNDO ) + m_xUndoManager->getCurrentUndoActionTitle()); + aUndoState <<= SvtResId( STR_UNDO ) + m_xUndoManager->getCurrentUndoActionTitle(); if( m_xUndoManager->isRedoPossible()) - aRedoState <<= ( SvtResId( STR_REDO ) + m_xUndoManager->getCurrentRedoActionTitle()); + aRedoState <<= SvtResId( STR_REDO ) + m_xUndoManager->getCurrentRedoActionTitle(); if( bFireAll || rURL == ".uno:Undo" ) fireStatusEventForURL( ".uno:Undo", aUndoState, m_xUndoManager->isUndoPossible(), xSingleListener ); diff --git a/chart2/source/view/axes/ScaleAutomatism.cxx b/chart2/source/view/axes/ScaleAutomatism.cxx index 6c014dd0848a..a53e625c2a7c 100644 --- a/chart2/source/view/axes/ScaleAutomatism.cxx +++ b/chart2/source/view/axes/ScaleAutomatism.cxx @@ -612,7 +612,7 @@ void ScaleAutomatism::calculateExplicitIncrementAndScaleForDateTimeAxis( nMaxMainIncrementCount--; //choose major time interval: - long nDayCount = (aMaxDate-aMinDate); + long nDayCount = aMaxDate - aMinDate; long nMainIncrementCount = 1; if( !bAutoMajor ) { diff --git a/chart2/source/view/charttypes/Splines.cxx b/chart2/source/view/charttypes/Splines.cxx index c03df7c7d719..3527d1bec01f 100644 --- a/chart2/source/view/charttypes/Splines.cxx +++ b/chart2/source/view/charttypes/Splines.cxx @@ -158,7 +158,7 @@ void lcl_SplineCalculation::Calculate() else { m_aSecDerivY[ 0 ] = -0.5; - double xDiff = ( m_aPoints[ 1 ].first - m_aPoints[ 0 ].first ); + double xDiff = m_aPoints[ 1 ].first - m_aPoints[ 0 ].first; u[ 0 ] = ( 3.0 / xDiff ) * ((( m_aPoints[ 1 ].second - m_aPoints[ 0 ].second ) / xDiff ) - m_fYp1 ); } @@ -193,7 +193,7 @@ void lcl_SplineCalculation::Calculate() if( ! ::rtl::math::isInf( m_fYpN ) ) { qn = 0.5; - double xDiff = ( m_aPoints[ n ].first - m_aPoints[ n - 1 ].first ); + double xDiff = m_aPoints[ n ].first - m_aPoints[ n - 1 ].first; un = ( 3.0 / xDiff ) * ( m_fYpN - ( m_aPoints[ n ].second - m_aPoints[ n - 1 ].second ) / xDiff ); } diff --git a/chart2/source/view/main/VLegend.cxx b/chart2/source/view/main/VLegend.cxx index a7a313b0ad49..52a4f78fd8c9 100644 --- a/chart2/source/view/main/VLegend.cxx +++ b/chart2/source/view/main/VLegend.cxx @@ -202,7 +202,7 @@ void lcl_collectColumnWidths( std::vector< sal_Int32 >& rColumnWidths, const sal { for (sal_Int32 nColumn = 0; nColumn < nNumberOfColumns; ++nColumn ) { - sal_Int32 nEntry = (nColumn + nRow * nNumberOfColumns); + sal_Int32 nEntry = nColumn + nRow * nNumberOfColumns; if( nEntry < nNumberOfEntries ) { awt::Size aTextSize( rTextShapes[ nEntry ]->getSize() ); @@ -228,7 +228,7 @@ void lcl_collectRowHeighs( std::vector< sal_Int32 >& rRowHeights, const sal_Int3 sal_Int32 nCurrentRowHeight = 0; for (sal_Int32 nColumn = 0; nColumn < nNumberOfColumns; ++nColumn) { - sal_Int32 nEntry = (nColumn + nRow * nNumberOfColumns); + sal_Int32 nEntry = nColumn + nRow * nNumberOfColumns; if( nEntry < nNumberOfEntries ) { awt::Size aTextSize( rTextShapes[ nEntry ]->getSize() ); @@ -397,7 +397,7 @@ awt::Size lcl_placeLegendEntries( { for (sal_Int32 nColumn = nNumberOfColumns; nColumn--; ) { - sal_Int32 nEntry = (nColumn + nRow * nNumberOfColumns); + sal_Int32 nEntry = nColumn + nRow * nNumberOfColumns; if( nEntry < static_cast<sal_Int32>(aTextShapes.size()) ) { DrawModelWrapper::removeShape( aTextShapes[nEntry] ); @@ -526,7 +526,7 @@ awt::Size lcl_placeLegendEntries( sal_Int32 nCurrentYPos = nYPadding + nYStartPosition; for (sal_Int32 nRow = 0; nRow < nNumberOfRows; ++nRow) { - sal_Int32 nEntry = (nColumn + nRow * nNumberOfColumns); + sal_Int32 nEntry = nColumn + nRow * nNumberOfColumns; if( nEntry >= nNumberOfEntries ) break; @@ -625,8 +625,8 @@ chart2::RelativePosition lcl_getDefaultPosition( LegendPosition ePos, const awt: case LegendPosition_LINE_START: { // #i109336# Improve auto positioning in chart - const double fDefaultDistance = ( static_cast< double >( lcl_getLegendLeftRightMargin() ) / - static_cast< double >( rPageSize.Width ) ); + const double fDefaultDistance = static_cast< double >( lcl_getLegendLeftRightMargin() ) / + static_cast< double >( rPageSize.Width ); aResult = chart2::RelativePosition( fDefaultDistance, 0.5, drawing::Alignment_LEFT ); } @@ -634,8 +634,8 @@ chart2::RelativePosition lcl_getDefaultPosition( LegendPosition ePos, const awt: case LegendPosition_LINE_END: { // #i109336# Improve auto positioning in chart - const double fDefaultDistance = ( static_cast< double >( lcl_getLegendLeftRightMargin() ) / - static_cast< double >( rPageSize.Width ) ); + const double fDefaultDistance = static_cast< double >( lcl_getLegendLeftRightMargin() ) / + static_cast< double >( rPageSize.Width ); aResult = chart2::RelativePosition( 1.0 - fDefaultDistance, 0.5, drawing::Alignment_RIGHT ); } @@ -643,8 +643,8 @@ chart2::RelativePosition lcl_getDefaultPosition( LegendPosition ePos, const awt: case LegendPosition_PAGE_START: { // #i109336# Improve auto positioning in chart - const double fDefaultDistance = ( static_cast< double >( lcl_getLegendTopBottomMargin() ) / - static_cast< double >( rPageSize.Height ) ); + const double fDefaultDistance = static_cast< double >( lcl_getLegendTopBottomMargin() ) / + static_cast< double >( rPageSize.Height ); double fDistance = (static_cast<double>(rOutAvailableSpace.Y)/static_cast<double>(rPageSize.Height)) + fDefaultDistance; aResult = chart2::RelativePosition( 0.5, fDistance, drawing::Alignment_TOP ); @@ -653,8 +653,8 @@ chart2::RelativePosition lcl_getDefaultPosition( LegendPosition ePos, const awt: case LegendPosition_PAGE_END: { // #i109336# Improve auto positioning in chart - const double fDefaultDistance = ( static_cast< double >( lcl_getLegendTopBottomMargin() ) / - static_cast< double >( rPageSize.Height ) ); + const double fDefaultDistance = static_cast< double >( lcl_getLegendTopBottomMargin() ) / + static_cast< double >( rPageSize.Height ); double fDistance = double(rPageSize.Height - (rOutAvailableSpace.Y + rOutAvailableSpace.Height)); fDistance += fDefaultDistance; diff --git a/comphelper/source/misc/mimeconfighelper.cxx b/comphelper/source/misc/mimeconfighelper.cxx index fc55f2c73ed2..5d7249c5f04b 100644 --- a/comphelper/source/misc/mimeconfighelper.cxx +++ b/comphelper/source/misc/mimeconfighelper.cxx @@ -728,12 +728,12 @@ OUString MimeConfigurationHelper::GetDefaultFilterFromServiceName( const OUStrin SfxFilterFlags nFlags = static_cast<SfxFilterFlags>(aPropsHM.getUnpackedValueOrDefault( "Flags", sal_Int32(0) )); // that should be import, export, own filter and not a template filter ( TemplatePath flag ) - SfxFilterFlags const nRequired = (SfxFilterFlags::OWN + SfxFilterFlags const nRequired = SfxFilterFlags::OWN // fdo#78159 for OOoXML, there is code to convert // to ODF in OCommonEmbeddedObject::store* // so accept it even though there's no export | (SOFFICE_FILEFORMAT_60 == nVersion ? SfxFilterFlags::NONE : SfxFilterFlags::EXPORT) - | SfxFilterFlags::IMPORT ); + | SfxFilterFlags::IMPORT; if ( ( ( nFlags & nRequired ) == nRequired ) && !( nFlags & SfxFilterFlags::TEMPLATEPATH ) ) { // if there are more than one filter the preferred one should be used diff --git a/compilerplugins/clang/test/unnecessaryparen.cxx b/compilerplugins/clang/test/unnecessaryparen.cxx index 8621fe9e8746..e89da95df384 100644 --- a/compilerplugins/clang/test/unnecessaryparen.cxx +++ b/compilerplugins/clang/test/unnecessaryparen.cxx @@ -9,6 +9,7 @@ #include <string> #include <rtl/ustring.hxx> +#include <o3tl/typed_flags_set.hxx> #define MACRO (1) @@ -18,6 +19,20 @@ enum class EFoo { Bar }; struct S { operator bool(); }; +enum class BrowseMode +{ + Modules = 0x01, + Top = 0x02, + Bottom = 0x04, + Left = 0x04, +}; +namespace o3tl +{ +template <> struct typed_flags<BrowseMode> : is_typed_flags<BrowseMode, 0xf> +{ +}; +} + int main() { int x = 1; @@ -94,15 +109,9 @@ int main() char *p = nullptr; delete (p); // expected-error {{parentheses immediately inside delete expr [loplugin:unnecessaryparen]}} -}; -struct S2 { - S2& GetText(); - void toChar(); -}; -void func2(S2 *p) -{ - (p->GetText()).toChar(); // expected-error {{unnecessary parentheses around member expr [loplugin:unnecessaryparen]}} + BrowseMode nBits = ( BrowseMode::Modules | BrowseMode::Top ); // expected-error {{parentheses immediately inside vardecl statement [loplugin:unnecessaryparen]}} + (void)nBits; }; /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ diff --git a/compilerplugins/clang/unnecessaryparen.cxx b/compilerplugins/clang/unnecessaryparen.cxx index b2ad2951ec90..a39bcc813a63 100644 --- a/compilerplugins/clang/unnecessaryparen.cxx +++ b/compilerplugins/clang/unnecessaryparen.cxx @@ -386,7 +386,6 @@ bool UnnecessaryParen::VisitCXXOperatorCallExpr(const CXXOperatorCallExpr* callE Opc != OO_AmpEqual && Opc != OO_CaretEqual && Opc != OO_PipeEqual) return true; - auto parenExpr = dyn_cast<ParenExpr>(ignoreAllImplicit(callExpr->getArg(1))); if (!parenExpr) return true; @@ -395,9 +394,18 @@ bool UnnecessaryParen::VisitCXXOperatorCallExpr(const CXXOperatorCallExpr* callE // Sometimes parentheses make the RHS of an assignment easier to read by // visually disambiguating the = from a call to == auto sub = parenExpr->getSubExpr(); - if (isa<BinaryOperator>(sub) - || isa<CXXOperatorCallExpr>(sub) - || isa<ConditionalOperator>(sub)) + if (auto subBinOp = dyn_cast<BinaryOperator>(sub)) + { + if (!(subBinOp->isMultiplicativeOp() || subBinOp->isAdditiveOp() || subBinOp->isPtrMemOp())) + return true; + } + if (auto subOperatorCall = dyn_cast<CXXOperatorCallExpr>(sub)) + { + auto op = subOperatorCall->getOperator(); + if (!((op >= OO_Plus && op <= OO_Exclaim) || (op >= OO_ArrowStar && op <= OO_Subscript))) + return true; + } + if (isa<ConditionalOperator>(sub)) return true; report( @@ -420,12 +428,26 @@ bool UnnecessaryParen::VisitVarDecl(const VarDecl* varDecl) return true; if (compat::getBeginLoc(parenExpr).isMacroID()) return true; + + // Sometimes parentheses make the RHS of an assignment easier to read by + // visually disambiguating the = from a call to == auto sub = parenExpr->getSubExpr(); - if (isa<BinaryOperator>(sub) - || isa<CXXOperatorCallExpr>(sub) - || isa<ConditionalOperator>(sub) - // these two are for "parentheses were disambiguated as a function declaration [-Werror,-Wvexing-parse]" - || isa<CXXBindTemporaryExpr>(sub) + if (auto subBinOp = dyn_cast<BinaryOperator>(sub)) + { + if (!(subBinOp->isMultiplicativeOp() || subBinOp->isAdditiveOp() || subBinOp->isPtrMemOp())) + return true; + } + if (auto subOperatorCall = dyn_cast<CXXOperatorCallExpr>(sub)) + { + auto op = subOperatorCall->getOperator(); + if (!((op >= OO_Plus && op <= OO_Exclaim) || (op >= OO_ArrowStar && op <= OO_Subscript))) + return true; + } + if (isa<ConditionalOperator>(sub)) + return true; + + // these two are for "parentheses were disambiguated as a function declaration [-Werror,-Wvexing-parse]" + if (isa<CXXBindTemporaryExpr>(sub) || isa<CXXFunctionalCastExpr>(sub)) return true; diff --git a/connectivity/source/drivers/dbase/dindexnode.cxx b/connectivity/source/drivers/dbase/dindexnode.cxx index 73e262c98bb2..3278f195a369 100644 --- a/connectivity/source/drivers/dbase/dindexnode.cxx +++ b/connectivity/source/drivers/dbase/dindexnode.cxx @@ -439,7 +439,7 @@ ONDXNode ONDXPage::Split(ONDXPage& rPage) ONDXNode aResultNode; if (IsLeaf()) { - for (sal_uInt16 i = (nCount - (nCount / 2)), j = 0 ; i < nCount; i++) + for (sal_uInt16 i = nCount - (nCount / 2), j = 0 ; i < nCount; i++) rPage.Insert(j++,(*this)[i]); // this node contains a key that already exists in the tree and must be replaced diff --git a/connectivity/source/drivers/file/FResultSet.cxx b/connectivity/source/drivers/file/FResultSet.cxx index ecf1d34b2ee1..13f6c5226018 100644 --- a/connectivity/source/drivers/file/FResultSet.cxx +++ b/connectivity/source/drivers/file/FResultSet.cxx @@ -1556,7 +1556,7 @@ void OResultSet::clearInsertRow() const OValueRefVector::Vector::const_iterator aEnd = m_aInsertRow->get().end(); for(sal_Int32 nPos = 0;aIter != aEnd;++aIter,++nPos) { - ORowSetValueDecoratorRef& rValue = (*aIter); + ORowSetValueDecoratorRef& rValue = *aIter; if ( rValue->isBound() ) { (m_aRow->get())[nPos]->setValue( (*aIter)->getValue() ); diff --git a/connectivity/source/drivers/hsqldb/HStorageAccess.cxx b/connectivity/source/drivers/hsqldb/HStorageAccess.cxx index a559f3d4cad6..3854c7fff035 100644 --- a/connectivity/source/drivers/hsqldb/HStorageAccess.cxx +++ b/connectivity/source/drivers/hsqldb/HStorageAccess.cxx @@ -318,7 +318,7 @@ extern "C" SAL_JNI_EXPORT jint JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_Nativ "One byte is < 0"); return -1; } - jint nRet = ((ch[0] << 24) + (ch[1] << 16) + (ch[2] << 8) + (ch[3] << 0)); + jint nRet = (ch[0] << 24) + (ch[1] << 16) + (ch[2] << 8) + (ch[3] << 0); #ifdef HSQLDB_DBG DataLogFile aDataLog( env, name, "data" ); aDataLog.write( nRet ); diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx index d2ad30ab52b8..19625707f5e7 100644 --- a/cui/source/options/optcolor.cxx +++ b/cui/source/options/optcolor.cxx @@ -946,7 +946,7 @@ IMPL_LINK(ColorConfigCtrl_Impl, ControlFocusHdl, Control&, rCtrl, void) // calc visible area long const nScrollOffset = m_pScrollWindow->GetScrollOffset(); long nThumbPos = m_pVScroll->GetThumbPos(); - long const nWinTop = (nThumbPos * nScrollOffset); + long const nWinTop = nThumbPos * nScrollOffset; long const nWinBottom = nWinTop + nWinHeight; long const nCtrlPosY = rCtrl.GetPosPixel().Y(); diff --git a/dbaccess/source/core/api/RowSetBase.cxx b/dbaccess/source/core/api/RowSetBase.cxx index fa8cd6ab311e..84d18d8aae34 100644 --- a/dbaccess/source/core/api/RowSetBase.cxx +++ b/dbaccess/source/core/api/RowSetBase.cxx @@ -233,7 +233,7 @@ const ORowSetValue& ORowSetBase::impl_getValue(sal_Int32 columnIndex) OSL_ENSURE( pTemp != reinterpret_cast<void*>(0xfeeefeee),"HALT!" ); } OSL_ENSURE(!m_aCurrentRow.isNull() && m_aCurrentRow < m_pCache->getEnd() && aCacheIter != m_pCache->m_aCacheIterators.end(),"Invalid iterator set for currentrow!"); - ORowSetRow rRow = (*m_aCurrentRow); + ORowSetRow rRow = *m_aCurrentRow; OSL_ENSURE(rRow.is() && static_cast<sal_uInt16>(columnIndex) < (rRow->get()).size(),"Invalid size of vector!"); #endif return ((*m_aCurrentRow)->get())[m_nLastColumnIndex = columnIndex]; @@ -1038,7 +1038,7 @@ void ORowSetBase::setCurrentRow( bool _bMoved, bool _bDoNotify, const ORowSetRow m_bIsInsertRow = false; OSL_ENSURE(!m_aCurrentRow.isNull(),"CurrentRow is nul after positionCache!"); #if OSL_DEBUG_LEVEL > 0 - ORowSetRow rRow = (*m_aCurrentRow); + ORowSetRow rRow = *m_aCurrentRow; OSL_ENSURE(rRow.is() ,"Invalid size of vector!"); #endif diff --git a/dbaccess/source/core/api/RowSetCache.cxx b/dbaccess/source/core/api/RowSetCache.cxx index d4443a17ee6a..e7f5b66a6171 100644 --- a/dbaccess/source/core/api/RowSetCache.cxx +++ b/dbaccess/source/core/api/RowSetCache.cxx @@ -393,12 +393,12 @@ void ORowSetCache::setFetchSize(sal_Int32 _nSize) if ( !aCacheIter->second.pRowSet->isInsertRow() /*&& aCacheIter->second.aIterator != m_pMatrix->end()*/ && !m_bModified ) { - ptrdiff_t nDist = (aCacheIter->second.aIterator - m_pMatrix->begin()); + ptrdiff_t nDist = aCacheIter->second.aIterator - m_pMatrix->begin(); aPositions.push_back(nDist); aCacheIterToChange[aCacheIter->first] = true; } } - sal_Int32 nKeyPos = (m_aMatrixIter - m_pMatrix->begin()); + sal_Int32 nKeyPos = m_aMatrixIter - m_pMatrix->begin(); m_pMatrix->resize(_nSize); if ( nKeyPos < _nSize ) @@ -919,7 +919,7 @@ void ORowSetCache::moveWindow() if ( !aCacheIter->second.pRowSet->isInsertRow() && aCacheIter->second.aIterator != m_pMatrix->end() ) { - const ptrdiff_t nDist = (aCacheIter->second.aIterator - m_pMatrix->begin()); + const ptrdiff_t nDist = aCacheIter->second.aIterator - m_pMatrix->begin(); if ( nDist >= nOverlapSize ) { // That's from outside the overlap area; invalidate iterator. @@ -1458,7 +1458,7 @@ void ORowSetCache::rotateCacheIterator(ORowSetMatrix::difference_type _nDist) if ( !aCacheIter->second.pRowSet->isInsertRow() && aCacheIter->second.aIterator != m_pMatrix->end()) { - ptrdiff_t nDist = (aCacheIter->second.aIterator - m_pMatrix->begin()); + ptrdiff_t nDist = aCacheIter->second.aIterator - m_pMatrix->begin(); if(nDist < _nDist) { aCacheIter->second.aIterator = m_pMatrix->end(); @@ -1497,7 +1497,7 @@ void ORowSetCache::setUpdateIterator(const ORowSetMatrix::iterator& _rOriginalRo if(!m_aInsertRow->is()) *m_aInsertRow = new ORowSetValueVector(m_xMetaData->getColumnCount()); - (*(*m_aInsertRow)) = (*(*_rOriginalRow)); + (*(*m_aInsertRow)) = *(*_rOriginalRow); // we don't unbound the bookmark column ORowSetValueVector::Vector::iterator aIter = (*m_aInsertRow)->get().begin(); ORowSetValueVector::Vector::const_iterator aEnd = (*m_aInsertRow)->get().end(); diff --git a/dbaccess/source/ui/querydesign/JoinTableView.cxx b/dbaccess/source/ui/querydesign/JoinTableView.cxx index 51369f8d4ce9..aa1ca17714c3 100644 --- a/dbaccess/source/ui/querydesign/JoinTableView.cxx +++ b/dbaccess/source/ui/querydesign/JoinTableView.cxx @@ -354,7 +354,7 @@ void OJoinTableView::RemoveTabWin( OTableWindow* pTabWin ) auto aIter = m_vTableConnection.rbegin(); while(aIter != m_vTableConnection.rend() && bRemove) { - VclPtr<OTableConnection>& rTabConn = (*aIter); + VclPtr<OTableConnection>& rTabConn = *aIter; if ( (pData == rTabConn->GetData()->getReferencingTable()) || (pData == rTabConn->GetData()->getReferencedTable()) diff --git a/dbaccess/source/ui/tabledesign/TableUndo.cxx b/dbaccess/source/ui/tabledesign/TableUndo.cxx index bba5dae8f376..107722a7c07c 100644 --- a/dbaccess/source/ui/tabledesign/TableUndo.cxx +++ b/dbaccess/source/ui/tabledesign/TableUndo.cxx @@ -235,7 +235,7 @@ void OTableEditorInsUndoAct::Undo() { // delete lines again std::vector< std::shared_ptr<OTableRow> >* pOriginalRows = pTabEdCtrl->GetRowList(); - for( long i=(m_nInsPos+m_vInsertedRows.size()-1); i>(m_nInsPos-1); i-- ) + for( long i=m_nInsPos+m_vInsertedRows.size()-1; i>(m_nInsPos-1); i-- ) { pOriginalRows->erase(pOriginalRows->begin()+i); } @@ -282,7 +282,7 @@ void OTableEditorInsNewUndoAct::Undo() // delete inserted lines std::vector< std::shared_ptr<OTableRow> >* pOriginalRows = pTabEdCtrl->GetRowList(); - for( long i=(m_nInsPos+m_nInsRows-1); i>(m_nInsPos-1); i-- ) + for( long i=m_nInsPos+m_nInsRows-1; i>(m_nInsPos-1); i-- ) { pOriginalRows->erase(pOriginalRows->begin()+i); } diff --git a/desktop/source/app/officeipcthread.cxx b/desktop/source/app/officeipcthread.cxx index 92e5a65bb3b8..80432dd12d3f 100644 --- a/desktop/source/app/officeipcthread.cxx +++ b/desktop/source/app/officeipcthread.cxx @@ -245,7 +245,7 @@ static OUString CreateMD5FromString( const OUString& aMsg ) if ( handle ) { const sal_uInt8* pData = reinterpret_cast<const sal_uInt8*>(aMsg.getStr()); - sal_uInt32 nSize = ( aMsg.getLength() * sizeof( sal_Unicode )); + sal_uInt32 nSize = aMsg.getLength() * sizeof( sal_Unicode ); sal_uInt32 nMD5KeyLen = rtl_digest_queryLength( handle ); std::unique_ptr<sal_uInt8[]> pMD5KeyBuffer(new sal_uInt8[ nMD5KeyLen ]); diff --git a/desktop/source/deployment/misc/dp_misc.cxx b/desktop/source/deployment/misc/dp_misc.cxx index 50855feb7c4a..031d599050f2 100644 --- a/desktop/source/deployment/misc/dp_misc.cxx +++ b/desktop/source/deployment/misc/dp_misc.cxx @@ -106,7 +106,7 @@ const OUString OfficePipeId::operator () () sal_uInt8 const * data = reinterpret_cast<sal_uInt8 const *>(userPath.getStr()); - std::size_t size = (userPath.getLength() * sizeof (sal_Unicode)); + std::size_t size = userPath.getLength() * sizeof (sal_Unicode); sal_uInt32 md5_key_len = rtl_digest_queryLength( digest ); std::unique_ptr<sal_uInt8[]> md5_buf( new sal_uInt8 [ md5_key_len ] ); diff --git a/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx b/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx index 3cba65cbf1af..0701a3492e86 100644 --- a/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx +++ b/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx @@ -143,7 +143,7 @@ BackendImpl::PackageImpl::PackageImpl( sal_Int32 segmEnd = url.getLength(); if ( url.endsWith("/") ) --segmEnd; - sal_Int32 segmStart = (url.lastIndexOf( '/', segmEnd ) + 1); + sal_Int32 segmStart = url.lastIndexOf( '/', segmEnd ) + 1; if (segmStart < 0) segmStart = 0; // name and display name default the same: diff --git a/drawinglayer/source/attribute/sdrlightingattribute3d.cxx b/drawinglayer/source/attribute/sdrlightingattribute3d.cxx index 07b53405bf46..0de72b179b88 100644 --- a/drawinglayer/source/attribute/sdrlightingattribute3d.cxx +++ b/drawinglayer/source/attribute/sdrlightingattribute3d.cxx @@ -139,7 +139,7 @@ namespace drawinglayer if(basegfx::fTools::more(fCosFac, 0.0)) { - aRetval += ((rLight.getColor() * rColor) * fCosFac); + aRetval += (rLight.getColor() * rColor) * fCosFac; if(rLight.getSpecular()) { @@ -151,7 +151,7 @@ namespace drawinglayer if(basegfx::fTools::more(fCosFac2, 0.0)) { fCosFac2 = pow(fCosFac2, static_cast<double>(nSpecularIntensity)); - aRetval += (rSpecular * fCosFac2); + aRetval += rSpecular * fCosFac2; } } } diff --git a/editeng/source/editeng/editundo.cxx b/editeng/source/editeng/editundo.cxx index 7147c3f4f6c9..de6f4f4940b8 100644 --- a/editeng/source/editeng/editundo.cxx +++ b/editeng/source/editeng/editundo.cxx @@ -417,7 +417,7 @@ void EditUndoMoveParagraphs::Undo() Range aTmpRange( nParagraphs ); long nTmpDest = aTmpRange.Min(); - long nDiff = ( nDest - aTmpRange.Min() ); + long nDiff = nDest - aTmpRange.Min(); aTmpRange.Min() += nDiff; aTmpRange.Max() += nDiff; diff --git a/editeng/source/outliner/outliner.cxx b/editeng/source/outliner/outliner.cxx index 342e5878889f..5d448f579d69 100644 --- a/editeng/source/outliner/outliner.cxx +++ b/editeng/source/outliner/outliner.cxx @@ -460,7 +460,7 @@ void Outliner::SetText( const OUString& rText, Paragraph* pPara ) nCurDepth = nTabs-1; //TODO: sal_Int32 -> sal_Int16! ImplCheckDepth( nCurDepth ); pPara->SetDepth( nCurDepth ); - pPara->nFlags &= (~ParaFlag::HOLDDEPTH); + pPara->nFlags &= ~ParaFlag::HOLDDEPTH; } } if( nPos ) // not with the first paragraph @@ -1850,7 +1850,7 @@ void Outliner::ImplCalcBulletText( sal_Int32 nPara, bool bRecalcLevel, bool bRec if (pPara->GetText() != aBulletText) pPara->SetText( aBulletText ); - pPara->nFlags &= (~ParaFlag::SETBULLETTEXT); + pPara->nFlags &= ~ParaFlag::SETBULLETTEXT; if ( bRecalcLevel ) { diff --git a/embeddedobj/source/general/intercept.cxx b/embeddedobj/source/general/intercept.cxx index 3342c5a056d7..59df88e7873f 100644 --- a/embeddedobj/source/general/intercept.cxx +++ b/embeddedobj/source/general/intercept.cxx @@ -131,7 +131,7 @@ Interceptor::addStatusListener( aStateEvent.FeatureDescriptor = "Update"; aStateEvent.IsEnabled = true; aStateEvent.Requery = false; - aStateEvent.State <<= ( "($1) " + m_pDocHolder->GetTitle() ); + aStateEvent.State <<= "($1) " + m_pDocHolder->GetTitle(); Control->statusChanged(aStateEvent); { @@ -154,7 +154,7 @@ Interceptor::addStatusListener( aStateEvent.FeatureDescriptor = "Close and Return"; aStateEvent.IsEnabled = true; aStateEvent.Requery = false; - aStateEvent.State <<= ( "($2)" + m_pDocHolder->GetContainerName() ); + aStateEvent.State <<= "($2)" + m_pDocHolder->GetContainerName(); Control->statusChanged(aStateEvent); diff --git a/filter/source/graphicfilter/icgm/bundles.cxx b/filter/source/graphicfilter/icgm/bundles.cxx index c1b6277c88c1..6754b9bccaf2 100644 --- a/filter/source/graphicfilter/icgm/bundles.cxx +++ b/filter/source/graphicfilter/icgm/bundles.cxx @@ -128,7 +128,7 @@ void CGMFList::InsertName( sal_uInt8 const * pSource, sal_uInt32 nSize ) if ( pFound ) { pFontEntry->nFontType |= 1; - sal_uInt32 nPrev = ( pFound - pBuf.get() ); + sal_uInt32 nPrev = pFound - pBuf.get(); sal_uInt32 nToCopyOfs = 6; if ( nPrev && ( pFound[ -1 ] == '-' || pFound[ -1 ] == ' ' ) ) { @@ -148,7 +148,7 @@ void CGMFList::InsertName( sal_uInt8 const * pSource, sal_uInt32 nSize ) { pFontEntry->nFontType |= 2; - sal_uInt32 nPrev = ( pFound - pBuf.get() ); + sal_uInt32 nPrev = pFound - pBuf.get(); sal_uInt32 nToCopyOfs = 4; if ( nPrev && ( pFound[ -1 ] == '-' || pFound[ -1 ] == ' ' ) ) { diff --git a/filter/source/graphicfilter/ipict/shape.cxx b/filter/source/graphicfilter/ipict/shape.cxx index 3bdd022bb3e7..f058dcf5d87f 100644 --- a/filter/source/graphicfilter/ipict/shape.cxx +++ b/filter/source/graphicfilter/ipict/shape.cxx @@ -84,11 +84,11 @@ namespace PictReaderShape { { dest.X()+pSize.Width(), dest.Y()+pSize.Height() }, { dest.X(), dest.Y()+pSize.Height() }}; for (int w = origAvoid+1; w < origAvoid+4; w++) { - int wh = (w%4); + int wh = w%4; poly.append(B2DPoint(origPt[wh][0], origPt[wh][1])); } for (int w = origAvoid+3; w < origAvoid+6; w++) { - int wh = (w%4); + int wh = w%4; poly.append(B2DPoint(destPt[wh][0], destPt[wh][1])); } int wh = (origAvoid+1)%4; diff --git a/filter/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx index b5d6f7f7142f..f3dc9d2b697b 100644 --- a/filter/source/msfilter/escherex.cxx +++ b/filter/source/msfilter/escherex.cxx @@ -1319,7 +1319,7 @@ bool EscherPropertyContainer::CreateGraphicProperties(const uno::Reference<drawi if ( EscherPropertyValueHelper::GetPropertyValue( aAny, aXPropSet, "VisibleArea" ) ) { pVisArea.reset(new awt::Rectangle); - aAny >>= (*pVisArea); + aAny >>= *pVisArea; } sal_uInt32 nBlibId = pGraphicProvider->GetBlibID( *pPicOutStrm, rGraphicObj, pVisArea.get() ); if ( nBlibId ) diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx index ac8728cd424f..259035bd2285 100644 --- a/filter/source/msfilter/svdfppt.cxx +++ b/filter/source/msfilter/svdfppt.cxx @@ -5708,7 +5708,7 @@ void PPTPortionObj::ApplyTo( SfxItemSet& rSet, SdrPowerPointImport& rManager, T } } pAcc.reset(); - sal_uInt32 nC = ( aSize.Width() * aSize.Height() ); + sal_uInt32 nC = aSize.Width() * aSize.Height(); nRt /= nC; nGn /= nC; nBl /= nC; diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.cxx b/framework/source/layoutmanager/toolbarlayoutmanager.cxx index 3cfcbe3b88fc..40e88154d7e3 100644 --- a/framework/source/layoutmanager/toolbarlayoutmanager.cxx +++ b/framework/source/layoutmanager/toolbarlayoutmanager.cxx @@ -2456,7 +2456,7 @@ void ToolbarLayoutManager::implts_calcWindowPosSizeOnSingleRowColumn( { if ( isHorizontalDockingArea( nDockingArea )) { - sal_Int32 nMaxReducation = ( rWinRect.Width - aMinSize.Width() ); + sal_Int32 nMaxReducation = rWinRect.Width - aMinSize.Width(); if ( nMaxReducation >= -nDiff ) { rWinRect.Width = rWinRect.Width + nDiff; @@ -2474,7 +2474,7 @@ void ToolbarLayoutManager::implts_calcWindowPosSizeOnSingleRowColumn( } else { - sal_Int32 nMaxReducation = ( rWinRect.Height - aMinSize.Height() ); + sal_Int32 nMaxReducation = rWinRect.Height - aMinSize.Height(); if ( nMaxReducation >= -nDiff ) { rWinRect.Height = rWinRect.Height + nDiff; diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx index da6c33022c23..568c6ba0e6f6 100644 --- a/framework/source/services/autorecovery.cxx +++ b/framework/source/services/autorecovery.cxx @@ -4039,7 +4039,7 @@ bool AutoRecovery::impl_enoughDiscSpace(sal_Int32 nRequiredSpace) nFreeSpace = aInfo.getFreeSpace(); } - sal_uInt64 nFreeMB = (nFreeSpace/1048576); + sal_uInt64 nFreeMB = nFreeSpace/1048576; return (nFreeMB >= static_cast<sal_uInt64>(nRequiredSpace)); #endif // SIMULATE_FULL_DISC } diff --git a/include/formula/tokenarray.hxx b/include/formula/tokenarray.hxx index 2891601b2626..9f93aa63a9b1 100644 --- a/include/formula/tokenarray.hxx +++ b/include/formula/tokenarray.hxx @@ -389,7 +389,7 @@ public: ScRecalcMode GetRecalcMode() const { return nMode; } void SetCombinedBitsRecalcMode( ScRecalcMode nBits ) - { nMode |= (nBits & ~ScRecalcMode::EMask); } + { nMode |= nBits & ~ScRecalcMode::EMask; } ScRecalcMode GetCombinedBitsRecalcMode() const { return nMode & ~ScRecalcMode::EMask; } diff --git a/include/svtools/ivctrl.hxx b/include/svtools/ivctrl.hxx index 2f4f2f63ae29..eb834bdd6687 100644 --- a/include/svtools/ivctrl.hxx +++ b/include/svtools/ivctrl.hxx @@ -89,7 +89,7 @@ class SvxIconChoiceCtrlEntry sal_uInt16 nX,nY; // for keyboard control SvxIconViewFlags nFlags; - void ClearFlags( SvxIconViewFlags nMask ) { nFlags &= (~nMask); } + void ClearFlags( SvxIconViewFlags nMask ) { nFlags &= ~nMask; } void SetFlags( SvxIconViewFlags nMask ) { nFlags |= nMask; } void AssignFlags( SvxIconViewFlags _nFlags ) { nFlags = _nFlags; } diff --git a/include/vcl/seleng.hxx b/include/vcl/seleng.hxx index a95bbedc15fc..0ba81da8052a 100644 --- a/include/vcl/seleng.hxx +++ b/include/vcl/seleng.hxx @@ -173,7 +173,7 @@ inline void SelectionEngine::SetAddMode( bool bNewMode ) if ( bNewMode ) nFlags |= SelectionEngineFlags::IN_ADD; else - nFlags &= (~SelectionEngineFlags::IN_ADD); + nFlags &= ~SelectionEngineFlags::IN_ADD; } inline void SelectionEngine::EnableDrag( bool bOn ) @@ -181,7 +181,7 @@ inline void SelectionEngine::EnableDrag( bool bOn ) if ( bOn ) nFlags |= SelectionEngineFlags::DRG_ENAB; else - nFlags &= (~SelectionEngineFlags::DRG_ENAB); + nFlags &= ~SelectionEngineFlags::DRG_ENAB; } inline void SelectionEngine::AddAlways( bool bOn ) @@ -189,7 +189,7 @@ inline void SelectionEngine::AddAlways( bool bOn ) if( bOn ) nFlags |= SelectionEngineFlags::ADD_ALW; else - nFlags &= (~SelectionEngineFlags::ADD_ALW); + nFlags &= ~SelectionEngineFlags::ADD_ALW; } inline bool SelectionEngine::IsAlwaysAdding() const @@ -221,7 +221,7 @@ inline void SelectionEngine::SetAnchor( bool bAnchor ) if ( bAnchor ) nFlags |= SelectionEngineFlags::HAS_ANCH; else - nFlags &= (~SelectionEngineFlags::HAS_ANCH); + nFlags &= ~SelectionEngineFlags::HAS_ANCH; } #endif // INCLUDED_VCL_SELENG_HXX diff --git a/include/xmloff/nmspmap.hxx b/include/xmloff/nmspmap.hxx index 1064a8550f1d..127d5b59f06b 100644 --- a/include/xmloff/nmspmap.hxx +++ b/include/xmloff/nmspmap.hxx @@ -34,8 +34,8 @@ #include <limits.h> -const sal_uInt16 XML_NAMESPACE_XMLNS = (USHRT_MAX-2); -const sal_uInt16 XML_NAMESPACE_NONE = (USHRT_MAX-1); +const sal_uInt16 XML_NAMESPACE_XMLNS = USHRT_MAX-2; +const sal_uInt16 XML_NAMESPACE_NONE = USHRT_MAX-1; const sal_uInt16 XML_NAMESPACE_UNKNOWN = USHRT_MAX; const sal_uInt16 XML_NAMESPACE_UNKNOWN_FLAG = 0x8000; diff --git a/lotuswordpro/inc/lwptools.hxx b/lotuswordpro/inc/lwptools.hxx index edbfd4d00949..a0ec4bae29cc 100644 --- a/lotuswordpro/inc/lwptools.hxx +++ b/lotuswordpro/inc/lwptools.hxx @@ -72,13 +72,13 @@ // 01/19/2005 const sal_uInt32 UNITS_PER_INCH = 65536L * 72L; const double CM_PER_INCH = 2.54; -const double INCHT_PER_CM = (1.0 / CM_PER_INCH); +const double INCHT_PER_CM = 1.0 / CM_PER_INCH; //end const double POINTS_PER_INCH = 72.27; const double TWIPS_PER_POINT = 20.0; -const double TWIPS_PER_INCH = (TWIPS_PER_POINT * POINTS_PER_INCH); -const double TWIPS_PER_CM = (TWIPS_PER_INCH/CM_PER_INCH); +const double TWIPS_PER_INCH = TWIPS_PER_POINT * POINTS_PER_INCH; +const double TWIPS_PER_CM = TWIPS_PER_INCH/CM_PER_INCH; /** * @brief tool class (unicode, conversion) for lwp filter. */ diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx index a797adbc1f1e..96c533d404f1 100644 --- a/oox/source/export/drawingml.cxx +++ b/oox/source/export/drawingml.cxx @@ -460,7 +460,7 @@ void DrawingML::WriteGrabBagGradientFill( const Sequence< PropertyValue >& aGrad if( sSchemeClr.isEmpty() ) { // Calculate alpha value (see oox/source/drawingml/color.cxx : getTransparency()) - sal_Int32 nAlpha = (MAX_PERCENT - ( PER_PERCENT * nTransparency ) ); + sal_Int32 nAlpha = MAX_PERCENT - ( PER_PERCENT * nTransparency ); WriteColor( nRgbClr, nAlpha ); } else diff --git a/package/source/xstor/xstorage.cxx b/package/source/xstor/xstorage.cxx index 492d96692f65..2d2098df298a 100644 --- a/package/source/xstor/xstorage.cxx +++ b/package/source/xstor/xstorage.cxx @@ -1856,7 +1856,7 @@ void OStorage::InternalDispose( bool bNotifyImpl ) for ( WeakComponentVector::iterator pCompIter = m_pData->m_aOpenSubComponentsVector.begin(); pCompIter != m_pData->m_aOpenSubComponentsVector.end(); ++pCompIter ) { - uno::Reference< lang::XComponent > xTmp = (*pCompIter); + uno::Reference< lang::XComponent > xTmp = *pCompIter; if ( xTmp.is() ) { xTmp->removeEventListener( uno::Reference< lang::XEventListener >( @@ -1907,7 +1907,7 @@ void OStorage::ChildIsDisposed( const uno::Reference< uno::XInterface >& xChild for ( WeakComponentVector::iterator pCompIter = m_pData->m_aOpenSubComponentsVector.begin(); pCompIter != m_pData->m_aOpenSubComponentsVector.end(); ) { - uno::Reference< lang::XComponent > xTmp = (*pCompIter); + uno::Reference< lang::XComponent > xTmp = *pCompIter; if ( !xTmp.is() || xTmp == xChild ) { pCompIter = m_pData->m_aOpenSubComponentsVector.erase(pCompIter); @@ -2408,7 +2408,7 @@ uno::Reference< embed::XStorage > SAL_CALL OStorage::openStorageElement( for ( SotElementVector_Impl::iterator pElementIter = pElement->m_xStorage->m_aChildrenVector.begin(); pElementIter != pElement->m_xStorage->m_aChildrenVector.end(); ) { - SotElement_Impl* pElementToDel = (*pElementIter); + SotElement_Impl* pElementToDel = *pElementIter; ++pElementIter; m_pImpl->RemoveElement( pElementToDel ); diff --git a/reportdesign/source/ui/report/ViewsWindow.cxx b/reportdesign/source/ui/report/ViewsWindow.cxx index 8c6decf83582..f37bce178528 100644 --- a/reportdesign/source/ui/report/ViewsWindow.cxx +++ b/reportdesign/source/ui/report/ViewsWindow.cxx @@ -1319,7 +1319,7 @@ void OViewsWindow::EndDragObj(bool _bControlKeyPressed, const OSectionView* _pSe // bring aNewPos to the position of the next object uno::Reference< report::XReportComponent> xRCNext(*(pColIter + 1),uno::UNO_QUERY); Point aNextPosition = VCLPoint(xRCNext->getPosition()); - aNewPos += (aNextPosition - aPrevious); + aNewPos += aNextPosition - aPrevious; } } } diff --git a/sal/osl/unx/file.cxx b/sal/osl/unx/file.cxx index 9f888579e3a9..305a57a27034 100644 --- a/sal/osl/unx/file.cxx +++ b/sal/osl/unx/file.cxx @@ -399,7 +399,7 @@ oslFileError FileHandle_Impl::readFileAt( for (*pBytesRead = 0; nBytesRequested > 0; ) { off_t const bufptr = (nOffset / m_bufsiz) * m_bufsiz; - size_t const bufpos = (nOffset % m_bufsiz); + size_t const bufpos = nOffset % m_bufsiz; if (bufptr != m_bufptr) { @@ -479,7 +479,7 @@ oslFileError FileHandle_Impl::writeFileAt( for (*pBytesWritten = 0; nBytesToWrite > 0;) { off_t const bufptr = (nOffset / m_bufsiz) * m_bufsiz; - size_t const bufpos = (nOffset % m_bufsiz); + size_t const bufpos = nOffset % m_bufsiz; if (bufptr != m_bufptr) { // flush current buffer diff --git a/sc/inc/rangeutl.hxx b/sc/inc/rangeutl.hxx index e65213f848db..feab1fa5f853 100644 --- a/sc/inc/rangeutl.hxx +++ b/sc/inc/rangeutl.hxx @@ -166,7 +166,7 @@ public: formula::FormulaGrammar::AddressConvention eConv, sal_Unicode cSeparator = ' ', bool bAppendStr = false, - ScRefFlags nFormatFlags = (ScRefFlags::VALID | ScRefFlags::TAB_3D) ); + ScRefFlags nFormatFlags = ScRefFlags::VALID | ScRefFlags::TAB_3D ); static void GetStringFromRange( OUString& rString, const ScRange& rRange, @@ -174,7 +174,7 @@ public: formula::FormulaGrammar::AddressConvention eConv, sal_Unicode cSeparator = ' ', bool bAppendStr = false, - ScRefFlags nFormatFlags = (ScRefFlags::VALID | ScRefFlags::TAB_3D) ); + ScRefFlags nFormatFlags = ScRefFlags::VALID | ScRefFlags::TAB_3D ); static void GetStringFromRangeList( OUString& rString, const ScRangeList* pRangeList, @@ -189,7 +189,7 @@ public: formula::FormulaGrammar::AddressConvention eConv, sal_Unicode cSeparator, bool bAppendStr = false, - ScRefFlags nFormatFlags = (ScRefFlags::VALID | ScRefFlags::TAB_3D) ); + ScRefFlags nFormatFlags = ScRefFlags::VALID | ScRefFlags::TAB_3D ); /// Range to String API static void GetStringFromAddress( @@ -206,7 +206,7 @@ public: formula::FormulaGrammar::AddressConvention eConv, sal_Unicode cSeparator = ' ', bool bAppendStr = false, - ScRefFlags nFormatFlags = (ScRefFlags::VALID | ScRefFlags::TAB_3D) ); + ScRefFlags nFormatFlags = ScRefFlags::VALID | ScRefFlags::TAB_3D ); static void GetStringFromRangeList( OUString& rString, const css::uno::Sequence< css::table::CellRangeAddress >& rRangeSeq, diff --git a/sc/qa/unit/mark_test.cxx b/sc/qa/unit/mark_test.cxx index 16122da55f8c..722d07ea75a5 100644 --- a/sc/qa/unit/mark_test.cxx +++ b/sc/qa/unit/mark_test.cxx @@ -145,12 +145,12 @@ void Test::testSimpleMark( const ScRange& rRange, const ScRange& rSelectionCover aMark.GetMarkArea( aRangeResult ); CPPUNIT_ASSERT_EQUAL( rRange, aRangeResult ); - SCROW nMidRow = ( ( rRange.aStart.Row() + rRange.aEnd.Row() ) / 2 ); - SCCOL nMidCol = ( ( rRange.aStart.Col() + rRange.aEnd.Col() ) / 2 ); - SCROW nOutRow1 = ( rRange.aEnd.Row() + 1 ); - SCCOL nOutCol1 = ( rRange.aEnd.Col() + 1 ); - SCROW nOutRow2 = ( rRange.aStart.Row() - 1 ); - SCCOL nOutCol2 = ( rRange.aStart.Col() - 1 ); + SCROW nMidRow = ( rRange.aStart.Row() + rRange.aEnd.Row() ) / 2; + SCCOL nMidCol = ( rRange.aStart.Col() + rRange.aEnd.Col() ) / 2; + SCROW nOutRow1 = rRange.aEnd.Row() + 1; + SCCOL nOutCol1 = rRange.aEnd.Col() + 1; + SCROW nOutRow2 = rRange.aStart.Row() - 1; + SCCOL nOutCol2 = rRange.aStart.Col() - 1; CPPUNIT_ASSERT( aMark.IsCellMarked( nMidCol, nMidRow ) ); if ( ValidCol( nOutCol1 ) && ValidRow( nOutRow1 ) ) diff --git a/sc/source/core/data/table1.cxx b/sc/source/core/data/table1.cxx index ede4096b7f3d..6a3527f36709 100644 --- a/sc/source/core/data/table1.cxx +++ b/sc/source/core/data/table1.cxx @@ -108,7 +108,7 @@ void GetOptimalHeightsInColumn( const SCROW nMinStart = nPos; sal_uLong nWeightedCount = nProgressStart + rCol.back().GetWeightedCount(nStartRow, nEndRow); - const SCCOL maxCol = (rCol.size() - 1); // last col done already above + const SCCOL maxCol = rCol.size() - 1; // last col done already above const SCCOL progressUpdateStep = rCol.size() / 10; for (SCCOL nCol=0; nCol<maxCol; nCol++) { diff --git a/sc/source/core/data/table6.cxx b/sc/source/core/data/table6.cxx index 53e74aba6d20..021a185aaf99 100644 --- a/sc/source/core/data/table6.cxx +++ b/sc/source/core/data/table6.cxx @@ -812,8 +812,8 @@ bool ScTable::SearchAndReplace( // This is also done in SvxSearchDialog CommandHdl, but not in API object. if ( !rSearchItem.IsUseAsianOptions() ) aSearchOptions.transliterateFlags &= - ( TransliterationFlags::IGNORE_CASE | - TransliterationFlags::IGNORE_WIDTH ); + TransliterationFlags::IGNORE_CASE | + TransliterationFlags::IGNORE_WIDTH; pSearchText.reset( new utl::TextSearch( aSearchOptions ) ); diff --git a/sc/source/core/tool/address.cxx b/sc/source/core/tool/address.cxx index abb057647be3..20dc149c2abc 100644 --- a/sc/source/core/tool/address.cxx +++ b/sc/source/core/tool/address.cxx @@ -2002,7 +2002,7 @@ template<typename T > static void lcl_Format( T& r, SCTAB nTab, SCROW nRow, SCCO const ScAddress::Details& rDetails) { if( nFlags & ScRefFlags::VALID ) - nFlags |= ( ScRefFlags::ROW_VALID | ScRefFlags::COL_VALID | ScRefFlags::TAB_VALID ); + nFlags |= ScRefFlags::ROW_VALID | ScRefFlags::COL_VALID | ScRefFlags::TAB_VALID; if( pDoc && (nFlags & ScRefFlags::TAB_VALID ) ) { if ( nTab < 0 || nTab >= pDoc->GetTableCount() ) diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx index eef51bbeecff..b47fe824f004 100644 --- a/sc/source/core/tool/compiler.cxx +++ b/sc/source/core/tool/compiler.cxx @@ -409,7 +409,7 @@ ScCompiler::Convention::Convention( FormulaGrammar::AddressConvention eConv ) /* */ t[32] |= ScCharFlags::Word; /* ! */ t[33] |= ScCharFlags::Ident | ScCharFlags::Word; /* " */ t[34] |= ScCharFlags::Word; -/* # */ t[35] &= (~ScCharFlags::WordSep); +/* # */ t[35] &= ~ScCharFlags::WordSep; /* # */ t[35] |= ScCharFlags::Word; /* % */ t[37] |= ScCharFlags::Word; /* ' */ t[39] |= ScCharFlags::Word; diff --git a/sc/source/core/tool/interpr3.cxx b/sc/source/core/tool/interpr3.cxx index f91d0037ddb5..2d7a8bafec5b 100644 --- a/sc/source/core/tool/interpr3.cxx +++ b/sc/source/core/tool/interpr3.cxx @@ -2696,7 +2696,7 @@ void ScInterpreter::ScTTest() return; } double fSumD = fSum1 - fSum2; - double fDivider = (fCount*fSumSqrD - fSumD*fSumD); + double fDivider = fCount*fSumSqrD - fSumD*fSumD; if ( fDivider == 0.0 ) { PushError(FormulaError::DivisionByZero); diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx index cc3672cbdbeb..43009c30d180 100644 --- a/sc/source/core/tool/interpr4.cxx +++ b/sc/source/core/tool/interpr4.cxx @@ -439,7 +439,7 @@ bool ScInterpreter::CreateStringArr(SCCOL nCol1, SCROW nRow1, SCTAB nTab1, *p++ = nLen; memcpy( p, aTmp.getStr(), nStrLen + 1); nPos += 10 + nStrLen + 1; - sal_uInt8* q = ( pCellArr + nPos ); + sal_uInt8* q = pCellArr + nPos; if( (nStrLen & 1) == 0 ) { *q++ = 0; @@ -556,7 +556,7 @@ bool ScInterpreter::CreateCellArr(SCCOL nCol1, SCROW nRow1, SCTAB nTab1, *p++ = nLen; memcpy( p, aTmp.getStr(), nStrLen + 1); nPos += 2 + nStrLen + 1; - sal_uInt8* q = ( pCellArr + nPos ); + sal_uInt8* q = pCellArr + nPos; if( (nStrLen & 1) == 0 ) { *q++ = 0; diff --git a/sc/source/core/tool/interpr8.cxx b/sc/source/core/tool/interpr8.cxx index 8fad91109fbc..a3b77cb14004 100644 --- a/sc/source/core/tool/interpr8.cxx +++ b/sc/source/core/tool/interpr8.cxx @@ -977,7 +977,7 @@ void ScETSForecastCalculation::GetETSPredictionIntervals( const ScMatrixRef& rTM fMaxTarget = convertXtoMonths( fMaxTarget ) - maRange[ mnCount - 1 ].X; else fMaxTarget -= maRange[ mnCount - 1 ].X; - SCSIZE nSize = ( fMaxTarget / mfStepSize ); + SCSIZE nSize = fMaxTarget / mfStepSize; if ( fmod( fMaxTarget, mfStepSize ) != 0.0 ) nSize++; @@ -1106,7 +1106,7 @@ void ScETSForecastCalculation::GetEDSPredictionIntervals( const ScMatrixRef& rTM fMaxTarget = convertXtoMonths( fMaxTarget ) - maRange[ mnCount - 1 ].X; else fMaxTarget -= maRange[ mnCount - 1 ].X; - SCSIZE nSize = ( fMaxTarget / mfStepSize ); + SCSIZE nSize = fMaxTarget / mfStepSize; if ( fmod( fMaxTarget, mfStepSize ) != 0.0 ) nSize++; diff --git a/sc/source/core/tool/rangelst.cxx b/sc/source/core/tool/rangelst.cxx index 93fb0b6f7208..575c0eee363d 100644 --- a/sc/source/core/tool/rangelst.cxx +++ b/sc/source/core/tool/rangelst.cxx @@ -154,8 +154,8 @@ ScRefFlags ScRangeList::Parse( const OUString& rStr, const ScDocument* pDoc, aRange.aStart.SetTab( nTab ); // default tab if not specified ScRefFlags nRes = aRange.ParseAny( aOne, pDoc, eConv ); ScRefFlags nEndRangeBits = ScRefFlags::COL2_VALID | ScRefFlags::ROW2_VALID | ScRefFlags::TAB2_VALID; - ScRefFlags nTmp1 = ( nRes & ScRefFlags::BITS ); - ScRefFlags nTmp2 = ( nRes & nEndRangeBits ); + ScRefFlags nTmp1 = nRes & ScRefFlags::BITS; + ScRefFlags nTmp2 = nRes & nEndRangeBits; // If we have a valid single range with // any of the address bits we are interested in // set - set the equiv end range bits diff --git a/sc/source/core/tool/reffind.cxx b/sc/source/core/tool/reffind.cxx index 230218c5334a..970fa880b993 100644 --- a/sc/source/core/tool/reffind.cxx +++ b/sc/source/core/tool/reffind.cxx @@ -217,7 +217,7 @@ ScRefFinder::~ScRefFinder() static ScRefFlags lcl_NextFlags( ScRefFlags nOld ) { - const ScRefFlags Mask_ABS = (ScRefFlags::COL_ABS | ScRefFlags::ROW_ABS | ScRefFlags::TAB_ABS); + const ScRefFlags Mask_ABS = ScRefFlags::COL_ABS | ScRefFlags::ROW_ABS | ScRefFlags::TAB_ABS; ScRefFlags nNew = nOld & Mask_ABS; nNew = ScRefFlags( static_cast<std::underlying_type<ScRefFlags>::type>(nNew) - 1 ) & Mask_ABS; // weiterzaehlen diff --git a/sc/source/filter/inc/ftools.hxx b/sc/source/filter/inc/ftools.hxx index 81b0b44e688c..4925af2aa6ee 100644 --- a/sc/source/filter/inc/ftools.hxx +++ b/sc/source/filter/inc/ftools.hxx @@ -99,7 +99,7 @@ inline void set_flag( Type& rnBitField, Type nMask, bool bSet = true ) template< typename Type, typename InsertType > void insert_value( Type& rnBitField, InsertType nValue, sal_uInt8 nStartBit, sal_uInt8 nBitCount ) { - unsigned int nMask = ((1U << nBitCount) - 1); + unsigned int nMask = (1U << nBitCount) - 1; Type nNewValue = static_cast< Type >( nValue & nMask ); rnBitField = (rnBitField & ~(nMask << nStartBit)) | (nNewValue << nStartBit); } diff --git a/sc/source/filter/xml/XMLStylesExportHelper.cxx b/sc/source/filter/xml/XMLStylesExportHelper.cxx index b6aebd7ece7c..7ed2653f5a15 100644 --- a/sc/source/filter/xml/XMLStylesExportHelper.cxx +++ b/sc/source/filter/xml/XMLStylesExportHelper.cxx @@ -637,7 +637,7 @@ bool ScRowFormatRanges::GetNext(ScMyRowFormatRange& aFormatRange) ScMyRowFormatRangesList::iterator aItr(aRowFormatRanges.begin()); if (aItr != aRowFormatRanges.end()) { - aFormatRange = (*aItr); + aFormatRange = *aItr; aRowFormatRanges.erase(aItr); --nSize; return true; diff --git a/sc/source/ui/Accessibility/AccessibleTableBase.cxx b/sc/source/ui/Accessibility/AccessibleTableBase.cxx index 6b9705ec7bba..6257e1941f31 100644 --- a/sc/source/ui/Accessibility/AccessibleTableBase.cxx +++ b/sc/source/ui/Accessibility/AccessibleTableBase.cxx @@ -311,8 +311,8 @@ sal_Int32 SAL_CALL ScAccessibleTableBase::getAccessibleChildCount() // FIXME: representing rows & columns this way is a plain and simple madness. // this needs a radical re-think. - sal_Int64 nMax = (static_cast<sal_Int64>(maRange.aEnd.Row() - maRange.aStart.Row() + 1) * - static_cast<sal_Int64>(maRange.aEnd.Col() - maRange.aStart.Col() + 1)); + sal_Int64 nMax = static_cast<sal_Int64>(maRange.aEnd.Row() - maRange.aStart.Row() + 1) * + static_cast<sal_Int64>(maRange.aEnd.Col() - maRange.aStart.Col() + 1); if (nMax > SAL_MAX_INT32) nMax = SAL_MAX_INT32; if (nMax < 0) diff --git a/sc/source/ui/miscdlgs/delcodlg.cxx b/sc/source/ui/miscdlgs/delcodlg.cxx index 28b1169f22e9..e6e6d3389356 100644 --- a/sc/source/ui/miscdlgs/delcodlg.cxx +++ b/sc/source/ui/miscdlgs/delcodlg.cxx @@ -22,9 +22,9 @@ #include <delcodlg.hxx> bool ScDeleteContentsDlg::bPreviousAllCheck = false; -InsertDeleteFlags ScDeleteContentsDlg::nPreviousChecks = (InsertDeleteFlags::DATETIME | InsertDeleteFlags::STRING | +InsertDeleteFlags ScDeleteContentsDlg::nPreviousChecks = InsertDeleteFlags::DATETIME | InsertDeleteFlags::STRING | InsertDeleteFlags::NOTE | InsertDeleteFlags::FORMULA | - InsertDeleteFlags::VALUE); + InsertDeleteFlags::VALUE; ScDeleteContentsDlg::ScDeleteContentsDlg(weld::Window* pParent) : GenericDialogController(pParent, "modules/scalc/ui/deletecontents.ui", "DeleteContentsDialog") diff --git a/sc/source/ui/miscdlgs/inscodlg.cxx b/sc/source/ui/miscdlgs/inscodlg.cxx index 5f3343c7e716..33107ed575f8 100644 --- a/sc/source/ui/miscdlgs/inscodlg.cxx +++ b/sc/source/ui/miscdlgs/inscodlg.cxx @@ -22,7 +22,7 @@ #include <inscodlg.hxx> bool ScInsertContentsDlg::bPreviousAllCheck = false; -InsertDeleteFlags ScInsertContentsDlg::nPreviousChecks = (InsertDeleteFlags::VALUE | InsertDeleteFlags::DATETIME | InsertDeleteFlags::STRING); +InsertDeleteFlags ScInsertContentsDlg::nPreviousChecks = InsertDeleteFlags::VALUE | InsertDeleteFlags::DATETIME | InsertDeleteFlags::STRING; ScPasteFunc ScInsertContentsDlg::nPreviousFormulaChecks = ScPasteFunc::NONE; InsertContentsFlags ScInsertContentsDlg::nPreviousChecks2 = InsertContentsFlags::NONE; sal_uInt16 ScInsertContentsDlg::nPreviousMoveMode = INS_NONE; // enum InsCellCmd diff --git a/sc/source/ui/vba/vbaapplication.cxx b/sc/source/ui/vba/vbaapplication.cxx index 6f502c8880dd..57d61297d842 100644 --- a/sc/source/ui/vba/vbaapplication.cxx +++ b/sc/source/ui/vba/vbaapplication.cxx @@ -1285,7 +1285,7 @@ uno::Reference< excel::XRange > SAL_CALL ScVbaApplication::Union( double ScVbaApplication::InchesToPoints( double Inches ) { - double result = ( Inches * 72.0 ); + double result = Inches * 72.0; return result; } diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx index b9a648c79b76..cf4e19e68487 100644 --- a/sc/source/ui/vba/vbarange.cxx +++ b/sc/source/ui/vba/vbarange.cxx @@ -2078,8 +2078,8 @@ ScVbaRange::Address( const uno::Any& RowAbsolute, const uno::Any& ColumnAbsolut RangeHelper thisRange( mxRange ); table::CellRangeAddress thisAddress = thisRange.getCellRangeAddressable()->getRangeAddress(); ScRange aRange( static_cast< SCCOL >( thisAddress.StartColumn ), static_cast< SCROW >( thisAddress.StartRow ), static_cast< SCTAB >( thisAddress.Sheet ), static_cast< SCCOL >( thisAddress.EndColumn ), static_cast< SCROW >( thisAddress.EndRow ), static_cast< SCTAB >( thisAddress.Sheet ) ); - ScRefFlags const ROW_ABS = ( ScRefFlags::ROW_ABS | ScRefFlags::ROW2_ABS ); - ScRefFlags const COL_ABS = ( ScRefFlags::COL_ABS | ScRefFlags::COL2_ABS ); + ScRefFlags const ROW_ABS = ScRefFlags::ROW_ABS | ScRefFlags::ROW2_ABS; + ScRefFlags const COL_ABS = ScRefFlags::COL_ABS | ScRefFlags::COL2_ABS; if ( RowAbsolute.hasValue() ) { @@ -5387,7 +5387,7 @@ ScVbaRange::SpecialCells( const uno::Any& _oType, const uno::Any& _oValue) // need to process each area, gather the results and // create a new range from those std::vector< table::CellRangeAddress > rangeResults; - sal_Int32 nItems = ( m_Areas->getCount() + 1 ); + sal_Int32 nItems = m_Areas->getCount() + 1; for ( sal_Int32 index=1; index <= nItems; ++index ) { uno::Reference< excel::XRange > xRange( m_Areas->Item( uno::makeAny(index), uno::Any() ), uno::UNO_QUERY_THROW ); @@ -5395,7 +5395,7 @@ ScVbaRange::SpecialCells( const uno::Any& _oType, const uno::Any& _oValue) ScVbaRange* pRange = getImplementation( xRange ); if ( xRange.is() && pRange ) { - sal_Int32 nElems = ( pRange->m_Areas->getCount() + 1 ); + sal_Int32 nElems = pRange->m_Areas->getCount() + 1; for ( sal_Int32 nArea = 1; nArea < nElems; ++nArea ) { uno::Reference< excel::XRange > xTmpRange( m_Areas->Item( uno::makeAny( nArea ), uno::Any() ), uno::UNO_QUERY_THROW ); diff --git a/sc/source/ui/vba/vbawindow.cxx b/sc/source/ui/vba/vbawindow.cxx index e0498cb7a73a..91bcc5d2be87 100644 --- a/sc/source/ui/vba/vbawindow.cxx +++ b/sc/source/ui/vba/vbawindow.cxx @@ -818,7 +818,7 @@ sal_Int32 SAL_CALL ScVbaWindow::PointsToScreenPixelsX(sal_Int32 _points) { sal_Int32 nHundredthsofOneMillimeters = Millimeter::getInHundredthsOfOneMillimeter( _points ); - double fConvertFactor = (getDevice()->getInfo().PixelPerMeterX/100000); + double fConvertFactor = getDevice()->getInfo().PixelPerMeterX/100000; return static_cast<sal_Int32>(fConvertFactor * nHundredthsofOneMillimeters ); } @@ -826,7 +826,7 @@ sal_Int32 SAL_CALL ScVbaWindow::PointsToScreenPixelsY(sal_Int32 _points) { sal_Int32 nHundredthsofOneMillimeters = Millimeter::getInHundredthsOfOneMillimeter( _points ); - double fConvertFactor = (getDevice()->getInfo().PixelPerMeterY/100000); + double fConvertFactor = getDevice()->getInfo().PixelPerMeterY/100000; return static_cast<sal_Int32>(fConvertFactor * nHundredthsofOneMillimeters ); } diff --git a/sc/source/ui/view/drawview.cxx b/sc/source/ui/view/drawview.cxx index a19d7ce48c84..9cd2db49bd17 100644 --- a/sc/source/ui/view/drawview.cxx +++ b/sc/source/ui/view/drawview.cxx @@ -964,7 +964,7 @@ void ScDrawView::SyncForGrid( SdrObject* pObj ) // find position of same point on the screen ( e.g. grid ) Point aCurPos = pViewData->GetScrPos( aOldStt.Col(), aOldStt.Row(), eWhich, true ); Point aCurPosHmm = pGridWin->PixelToLogic(aCurPos, aDrawMode ); - Point aGridOff = ( aCurPosHmm - aOldPos ); + Point aGridOff = aCurPosHmm - aOldPos; // fdo#63878 Fix the X position for RTL Sheet if( pDoc->IsNegativePage( GetTab() ) ) aGridOff.setX( aCurPosHmm.getX() + aOldPos.getX() ); diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx index bdb25193d89f..ddf6e6020caf 100644 --- a/sc/source/ui/view/output2.cxx +++ b/sc/source/ui/view/output2.cxx @@ -585,7 +585,7 @@ void ScDrawStringsVars::RepeatToFill( long nColWidth ) nTextWidth = pOutput->mpRefDevice->PixelToLogic(Size(nTextWidth,0)).Width(); } - long nSpaceToFill = ( nColWidth - nTextWidth ); + long nSpaceToFill = nColWidth - nTextWidth; if ( nSpaceToFill <= nCharWidth ) return; diff --git a/sc/source/ui/view/tabvwsha.cxx b/sc/source/ui/view/tabvwsha.cxx index 2785c8097dcf..2778d5d79c90 100644 --- a/sc/source/ui/view/tabvwsha.cxx +++ b/sc/source/ui/view/tabvwsha.cxx @@ -147,7 +147,7 @@ bool ScTabViewShell::GetFunction( OUString& rFuncStr, FormulaError nErrCode ) bFirst = false; } else - rFuncStr += ("; " + aStr); + rFuncStr += "; " + aStr; } } diff --git a/sc/source/ui/view/viewfun2.cxx b/sc/source/ui/view/viewfun2.cxx index 565fa987e0e3..a20e0ae05641 100644 --- a/sc/source/ui/view/viewfun2.cxx +++ b/sc/source/ui/view/viewfun2.cxx @@ -1454,8 +1454,8 @@ void ScViewFunc::CopyAutoSpellData( FillDir eDir, SCCOL nStartCol, SCROW nStartR } typedef const std::vector<editeng::MisspellRanges>* MisspellRangesType; - SCROW nRowRepeatSize = (nEndRow - nStartRow + 1); - SCCOL nColRepeatSize = (nEndCol - nStartCol + 1); + SCROW nRowRepeatSize = nEndRow - nStartRow + 1; + SCCOL nColRepeatSize = nEndCol - nStartCol + 1; SCROW nTillRow = 0; SCCOL nTillCol = 0; std::vector<std::vector<MisspellRangesType>> aSourceSpellRanges(nRowRepeatSize, std::vector<MisspellRangesType>(nColRepeatSize)); @@ -1472,7 +1472,7 @@ void ScViewFunc::CopyAutoSpellData( FillDir eDir, SCCOL nStartCol, SCROW nStartR { for ( SCROW nRowItr = nEndRow + 1; nRowItr <= nTillRow; ++nRowItr ) { - size_t nSourceRowIdx = ( ( nRowItr - nEndRow - 1 ) % nRowRepeatSize ); + size_t nSourceRowIdx = ( nRowItr - nEndRow - 1 ) % nRowRepeatSize; MisspellRangesType pRanges = aSourceSpellRanges[nSourceRowIdx][nColItr - nStartCol]; if ( !pRanges ) continue; @@ -1500,7 +1500,7 @@ void ScViewFunc::CopyAutoSpellData( FillDir eDir, SCCOL nStartCol, SCROW nStartR nTillCol = nEndCol + nCount; for ( SCCOL nColItr = nEndCol + 1; nColItr <= nTillCol; ++nColItr ) { - size_t nSourceColIdx = ( ( nColItr - nEndCol - 1 ) % nColRepeatSize ); + size_t nSourceColIdx = ( nColItr - nEndCol - 1 ) % nColRepeatSize; for ( SCROW nRowItr = nStartRow; nRowItr <= nEndRow; ++nRowItr ) { MisspellRangesType pRanges = aSourceSpellRanges[nRowItr - nStartRow][nSourceColIdx]; diff --git a/sd/source/core/CustomAnimationEffect.cxx b/sd/source/core/CustomAnimationEffect.cxx index 230f2811db8c..7585480b155c 100644 --- a/sd/source/core/CustomAnimationEffect.cxx +++ b/sd/source/core/CustomAnimationEffect.cxx @@ -1619,7 +1619,7 @@ void EffectSequenceHelper::reset() EffectSequence::iterator aEnd( maEffects.end() ); if( aIter != aEnd ) { - CustomAnimationEffectPtr pEffect = (*aIter++); + CustomAnimationEffectPtr pEffect = *aIter++; pEffect->setEffectSequence(nullptr); } maEffects.clear(); @@ -1839,7 +1839,7 @@ void EffectSequenceHelper::implRebuild() { std::vector< sd::AfterEffectNode > aAfterEffects; - CustomAnimationEffectPtr pEffect = (*aIter++); + CustomAnimationEffectPtr pEffect = *aIter++; bool bFirst = true; do @@ -1900,7 +1900,7 @@ void EffectSequenceHelper::implRebuild() fDuration = fTemp; if( aIter != aEnd ) - pEffect = (*aIter++); + pEffect = *aIter++; else pEffect.reset(); } @@ -2084,7 +2084,7 @@ CustomAnimationEffectPtr EffectSequenceHelper::findEffect( const css::uno::Refer { if( (*aIter)->getNode() == xNode ) { - pEffect = (*aIter); + pEffect = *aIter; break; } } @@ -2114,7 +2114,7 @@ CustomAnimationEffectPtr EffectSequenceHelper::getEffectFromOffset( sal_Int32 nO CustomAnimationEffectPtr pEffect; if( aIter != maEffects.end() ) - pEffect = (*aIter); + pEffect = *aIter; return pEffect; } @@ -2317,7 +2317,7 @@ void EffectSequenceHelper::updateTextGroups() const EffectSequence::iterator aEnd( maEffects.end() ); while( aIter != aEnd ) { - CustomAnimationEffectPtr pEffect( (*aIter++) ); + CustomAnimationEffectPtr pEffect( *aIter++ ); const sal_Int32 nGroupId = pEffect->getGroupId(); @@ -2523,7 +2523,7 @@ void EffectSequenceHelper::setTextGrouping( const CustomAnimationTextGroupPtr& p const EffectSequence::iterator aEnd( aEffects.end() ); while( aIter != aEnd ) { - CustomAnimationEffectPtr pEffect( (*aIter++) ); + CustomAnimationEffectPtr pEffect( *aIter++ ); if( pEffect->getTarget().getValueType() == ::cppu::UnoType<ParagraphTarget>::get() ) remove( pEffect ); @@ -2544,7 +2544,7 @@ void EffectSequenceHelper::setTextGrouping( const CustomAnimationTextGroupPtr& p const EffectSequence::iterator aEnd( aEffects.end() ); while( aIter != aEnd ) { - CustomAnimationEffectPtr pEffect( (*aIter++) ); + CustomAnimationEffectPtr pEffect( *aIter++ ); if( pEffect->getTarget().getValueType() == ::cppu::UnoType<ParagraphTarget>::get() ) { @@ -2605,7 +2605,7 @@ void EffectSequenceHelper::setAnimateForm( const CustomAnimationTextGroupPtr& pT { // special case, only one effect and that targets whole text, // convert this to target whole shape - pEffect = (*aIter++); + pEffect = *aIter++; pEffect->setTargetSubItem( ShapeAnimationSubType::AS_WHOLE ); } else @@ -2621,7 +2621,7 @@ void EffectSequenceHelper::setAnimateForm( const CustomAnimationTextGroupPtr& pT if( !bAnimateForm && (aEffects.size() == 1) ) { - CustomAnimationEffectPtr pEffect( (*aIter) ); + CustomAnimationEffectPtr pEffect( *aIter ); pEffect->setTarget( makeAny( (*aIter)->getTargetShape() ) ); pEffect->setTargetSubItem( ShapeAnimationSubType::ONLY_TEXT ); pTextGroup->addEffect( pEffect ); @@ -2631,7 +2631,7 @@ void EffectSequenceHelper::setAnimateForm( const CustomAnimationTextGroupPtr& pT // read the rest to the group again while( aIter != aEnd ) { - CustomAnimationEffectPtr pEffect( (*aIter++) ); + CustomAnimationEffectPtr pEffect( *aIter++ ); if( pEffect->getTarget().getValueType() == ::cppu::UnoType<ParagraphTarget>::get() ) { @@ -2659,7 +2659,7 @@ void EffectSequenceHelper::setTextGroupingAuto( const CustomAnimationTextGroupPt const EffectSequence::iterator aEnd( aEffects.end() ); while( aIter != aEnd ) { - CustomAnimationEffectPtr pEffect( (*aIter++) ); + CustomAnimationEffectPtr pEffect( *aIter++ ); if( pEffect->getTarget().getValueType() == ::cppu::UnoType<ParagraphTarget>::get() ) { @@ -2749,7 +2749,7 @@ void EffectSequenceHelper::setTextReverse( const CustomAnimationTextGroupPtr& pT EffectSequence::iterator aInsertIter( find( *aIter++ ) ); while( aIter != aEnd ) { - CustomAnimationEffectPtr pEffect( (*aIter++) ); + CustomAnimationEffectPtr pEffect( *aIter++ ); maEffects.erase( find( pEffect ) ); aInsertIter = maEffects.insert( ++aInsertIter, pEffect ); pTextGroup->addEffect( pEffect ); @@ -2896,7 +2896,7 @@ void EffectSequenceHelper::processAfterEffect( const Reference< XAnimationNode > stl_CustomAnimationEffect_search_node_predict aSearchPredict( xMaster ); EffectSequence::iterator aIter( std::find_if( maEffects.begin(), maEffects.end(), aSearchPredict ) ); if( aIter != maEffects.end() ) - pMasterEffect = (*aIter ); + pMasterEffect = *aIter; if( pMasterEffect.get() ) { @@ -3289,7 +3289,7 @@ void MainSequence::implRebuild() auto aIter( maInteractiveSequenceVector.begin() ); while( aIter != maInteractiveSequenceVector.end() ) { - InteractiveSequencePtr pIS( (*aIter) ); + InteractiveSequencePtr pIS( *aIter ); if( pIS->maEffects.empty() ) { // remove empty interactive sequences diff --git a/sd/source/core/CustomAnimationPreset.cxx b/sd/source/core/CustomAnimationPreset.cxx index 804ef7b9ddf2..5735c5df9f13 100644 --- a/sd/source/core/CustomAnimationPreset.cxx +++ b/sd/source/core/CustomAnimationPreset.cxx @@ -333,7 +333,7 @@ void CustomAnimationPresets::importEffects() while( aIter != aEnd ) { - CustomAnimationEffectPtr pEffect = (*aIter); + CustomAnimationEffectPtr pEffect = *aIter; const OUString aPresetId( pEffect->getPresetId() ); CustomAnimationPresetPtr pDescriptor = getEffectDescriptor( aPresetId ); diff --git a/sd/source/core/EffectMigration.cxx b/sd/source/core/EffectMigration.cxx index 626495ed3b7c..b0fc5ea41570 100644 --- a/sd/source/core/EffectMigration.cxx +++ b/sd/source/core/EffectMigration.cxx @@ -396,7 +396,7 @@ static EffectSequence::iterator ImplFindEffect( MainSequencePtr const & pMainSeq for( aIter = pMainSequence->getBegin(); aIter != pMainSequence->getEnd(); ++aIter ) { - CustomAnimationEffectPtr pEffect( (*aIter) ); + CustomAnimationEffectPtr pEffect( *aIter ); if( (pEffect->getTargetShape() == rShape) && (pEffect->getTargetSubItem() == nSubItem) ) break; } @@ -530,11 +530,11 @@ void EffectMigration::SetAnimationEffect( SvxShape* pShape, AnimationEffect eEff CustomAnimationEffectPtr pEffect; if( aIterAsWhole != aEnd ) { - pEffect = (*aIterAsWhole); + pEffect = *aIterAsWhole; } else { - pEffect = (*aIterOnlyBackground); + pEffect = *aIterOnlyBackground; } if( pEffect.get() ) @@ -565,7 +565,7 @@ AnimationEffect EffectMigration::GetAnimationEffect( SvxShape* pShape ) for( aIter = pMainSequence->getBegin(); aIter != pMainSequence->getEnd(); ++aIter ) { - CustomAnimationEffectPtr pEffect( (*aIter) ); + CustomAnimationEffectPtr pEffect( *aIter ); if( pEffect->getTargetShape() == xShape ) { if( (pEffect->getTargetSubItem() == ShapeAnimationSubType::ONLY_BACKGROUND) || @@ -650,14 +650,14 @@ void EffectMigration::SetTextAnimationEffect( SvxShape* pShape, AnimationEffect EffectSequence::iterator aIterOnlyBackground( ImplFindEffect( pMainSequence, xShape, ShapeAnimationSubType::ONLY_BACKGROUND ) ); if( aIterOnlyBackground != aEnd ) { - pShapeEffect = (*aIterOnlyBackground); + pShapeEffect = *aIterOnlyBackground; } else { EffectSequence::iterator aIterAsWhole( ImplFindEffect( pMainSequence, xShape, ShapeAnimationSubType::AS_WHOLE ) ); if( aIterAsWhole != aEnd ) { - pShapeEffect = (*aIterAsWhole); + pShapeEffect = *aIterAsWhole; } else { @@ -840,7 +840,7 @@ void EffectMigration::SetAnimationSpeed( SvxShape* pShape, AnimationSpeed eSpeed for( aIter = pMainSequence->getBegin(); aIter != pMainSequence->getEnd(); ++aIter ) { - CustomAnimationEffectPtr pEffect( (*aIter) ); + CustomAnimationEffectPtr pEffect( *aIter ); if( pEffect->getTargetShape() == xShape ) { if( pEffect->getDuration() != 0.1 ) @@ -866,7 +866,7 @@ AnimationSpeed EffectMigration::GetAnimationSpeed( SvxShape* pShape ) for( aIter = pMainSequence->getBegin(); aIter != pMainSequence->getEnd(); ++aIter ) { - CustomAnimationEffectPtr pEffect( (*aIter) ); + CustomAnimationEffectPtr pEffect( *aIter ); if( pEffect->getTargetShape() == xShape ) { if( pEffect->getDuration() != 0.1 ) @@ -914,7 +914,7 @@ void EffectMigration::SetDimColor( SvxShape* pShape, sal_Int32 nColor ) for( aIter = pMainSequence->getBegin(); aIter != pMainSequence->getEnd(); ++aIter ) { - CustomAnimationEffectPtr pEffect( (*aIter) ); + CustomAnimationEffectPtr pEffect( *aIter ); if( pEffect->getTargetShape() == xShape ) { pEffect->setHasAfterEffect( true ); @@ -943,7 +943,7 @@ sal_Int32 EffectMigration::GetDimColor( SvxShape* pShape ) for( aIter = pMainSequence->getBegin(); aIter != pMainSequence->getEnd(); ++aIter ) { - CustomAnimationEffectPtr pEffect( (*aIter) ); + CustomAnimationEffectPtr pEffect( *aIter ); if( (pEffect->getTargetShape() == xShape) && pEffect->getDimColor().hasValue() && pEffect->hasAfterEffect()) @@ -978,7 +978,7 @@ void EffectMigration::SetDimHide( SvxShape* pShape, bool bDimHide ) for( aIter = pMainSequence->getBegin(); aIter != pMainSequence->getEnd(); ++aIter ) { - CustomAnimationEffectPtr pEffect( (*aIter) ); + CustomAnimationEffectPtr pEffect( *aIter ); if( pEffect->getTargetShape() == xShape ) { pEffect->setHasAfterEffect( bDimHide ); @@ -1010,7 +1010,7 @@ bool EffectMigration::GetDimHide( SvxShape* pShape ) EffectSequence::iterator aIter; for( aIter = pMainSequence->getBegin(); aIter != pMainSequence->getEnd(); ++aIter ) { - CustomAnimationEffectPtr pEffect( (*aIter) ); + CustomAnimationEffectPtr pEffect( *aIter ); if( pEffect->getTargetShape() == xShape ) { bRet = pEffect->hasAfterEffect() && @@ -1050,7 +1050,7 @@ void EffectMigration::SetDimPrevious( SvxShape* pShape, bool bDimPrevious ) for( aIter = pMainSequence->getBegin(); aIter != pMainSequence->getEnd(); ++aIter ) { - CustomAnimationEffectPtr pEffect( (*aIter) ); + CustomAnimationEffectPtr pEffect( *aIter ); if( pEffect->getTargetShape() == xShape ) { pEffect->setHasAfterEffect( bDimPrevious ); @@ -1080,7 +1080,7 @@ bool EffectMigration::GetDimPrevious( SvxShape* pShape ) EffectSequence::iterator aIter; for( aIter = pMainSequence->getBegin(); aIter != pMainSequence->getEnd(); ++aIter ) { - CustomAnimationEffectPtr pEffect( (*aIter) ); + CustomAnimationEffectPtr pEffect( *aIter ); if( pEffect->getTargetShape() == xShape ) { bRet = pEffect->hasAfterEffect() && @@ -1117,7 +1117,7 @@ void EffectMigration::SetPresentationOrder( SvxShape* pShape, sal_Int32 nNewPos EffectSequence::iterator aEnd( rSequence.end() ); for( nPos = 0; aIter != aEnd; ++aIter ) { - CustomAnimationEffectPtr pEffect = (*aIter); + CustomAnimationEffectPtr pEffect = *aIter; if( !xCurrent.is() ) { @@ -1204,7 +1204,7 @@ sal_Int32 EffectMigration::GetPresentationOrder( SvxShape* pShape ) EffectSequence::iterator aEnd( rSequence.end() ); for( ; aIter != aEnd; ++aIter ) { - CustomAnimationEffectPtr pEffect = (*aIter); + CustomAnimationEffectPtr pEffect = *aIter; if( !xCurrent.is() || pEffect->getTargetShape() != xCurrent ) { @@ -1241,7 +1241,7 @@ void EffectMigration::UpdateSoundEffect( SvxShape* pShape, SdAnimationInfo const for( aIter = pMainSequence->getBegin(); aIter != pMainSequence->getEnd(); ++aIter ) { - CustomAnimationEffectPtr pEffect( (*aIter) ); + CustomAnimationEffectPtr pEffect( *aIter ); if( pEffect->getTargetShape() == xShape ) { if( !aSoundFile.isEmpty() ) @@ -1280,7 +1280,7 @@ OUString EffectMigration::GetSoundFile( SvxShape* pShape ) (aSoundFile.isEmpty()) && (aIter != pMainSequence->getEnd()); ++aIter ) { - CustomAnimationEffectPtr pEffect( (*aIter) ); + CustomAnimationEffectPtr pEffect( *aIter ); if( pEffect->getTargetShape() == xShape ) { if( pEffect->getAudio().is() ) diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx index 895c4b16c6b0..2917b19d787b 100644 --- a/sd/source/filter/eppt/epptso.cxx +++ b/sd/source/filter/eppt/epptso.cxx @@ -132,8 +132,8 @@ sal_uInt16 PPTExBulletProvider::GetId(Graphic const & rGraphic, Size& rGraphicSi } else { - double fQ1 = ( static_cast<double>(aPrefSize.Width()) / static_cast<double>(aPrefSize.Height()) ); - double fQ2 = ( static_cast<double>(rGraphicSize.Width()) / static_cast<double>(rGraphicSize.Height()) ); + double fQ1 = static_cast<double>(aPrefSize.Width()) / static_cast<double>(aPrefSize.Height()); + double fQ2 = static_cast<double>(rGraphicSize.Width()) / static_cast<double>(rGraphicSize.Height()); double fXScale = 1; double fYScale = 1; diff --git a/sd/source/filter/html/buttonset.cxx b/sd/source/filter/html/buttonset.cxx index 31693f3885a0..da0bdd77023f 100644 --- a/sd/source/filter/html/buttonset.cxx +++ b/sd/source/filter/html/buttonset.cxx @@ -226,7 +226,7 @@ bool ButtonSetImpl::getPreview( int nSet, const std::vector< OUString >& rButton std::vector< Graphic >::iterator aGraphIter( aGraphics.begin() ); while( aGraphIter != aGraphics.end() ) { - Graphic aGraphic( (*aGraphIter++) ); + Graphic aGraphic( *aGraphIter++ ); aGraphic.Draw( pDev, aPos ); diff --git a/sd/source/filter/html/pubdlg.cxx b/sd/source/filter/html/pubdlg.cxx index c99b660735db..b41707a6d370 100644 --- a/sd/source/filter/html/pubdlg.cxx +++ b/sd/source/filter/html/pubdlg.cxx @@ -929,7 +929,7 @@ void SdPublishingDlg::GetParameterSequence( Sequence< PropertyValue >& rParams ) for( std::vector< PropertyValue >::iterator i = aProps.begin(); i != aProps.end(); ++i ) { - *pParams++ = (*i); + *pParams++ = *i; } } diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx index 6c1c5a2ee9a8..d69f77188eac 100644 --- a/sd/source/ui/animations/CustomAnimationPane.cxx +++ b/sd/source/ui/animations/CustomAnimationPane.cxx @@ -734,7 +734,7 @@ void CustomAnimationPane::updateControls() const EffectSequence::iterator aRebuildEnd( maListSelection.end() ); while( aRebuildIter != aRebuildEnd ) { - CustomAnimationEffectPtr pEffect = (*aRebuildIter++); + CustomAnimationEffectPtr pEffect = *aRebuildIter++; if( pEffect.get() ) { @@ -770,7 +770,7 @@ static bool updateMotionPathImpl( CustomAnimationPane& rPane, ::sd::View& rView, bool bChanges = false; while( aIter != aEnd ) { - CustomAnimationEffectPtr pEffect( (*aIter++) ); + CustomAnimationEffectPtr pEffect( *aIter++ ); if( pEffect.get() && pEffect->getPresetClass() == css::presentation::EffectPresetClass::MOTIONPATH ) { rtl::Reference< MotionPathTag > xMotionPathTag; @@ -778,7 +778,7 @@ static bool updateMotionPathImpl( CustomAnimationPane& rPane, ::sd::View& rView, MotionPathTagVector::iterator aMIter( rOldTags.begin() ); for( ; aMIter != rOldTags.end(); ++aMIter ) { - rtl::Reference< MotionPathTag > xTag( (*aMIter) ); + rtl::Reference< MotionPathTag > xTag( *aMIter ); if( xTag->getEffect() == pEffect ) { if( !xTag->isDisposed() ) @@ -838,7 +838,7 @@ void CustomAnimationPane::updateMotionPathTags() MotionPathTagVector::iterator aIter( aTags.begin() ); while( aIter != aTags.end() ) { - rtl::Reference< MotionPathTag > xTag( (*aIter++) ); + rtl::Reference< MotionPathTag > xTag( *aIter++ ); xTag->Dispose(); } } @@ -1132,7 +1132,7 @@ std::unique_ptr<STLPropertySet> CustomAnimationPane::createSelectionSet() const CustomAnimationPresets& rPresets (getPresets()); while( aIter != aEnd ) { - CustomAnimationEffectPtr pEffect = (*aIter++); + CustomAnimationEffectPtr pEffect = *aIter++; EffectSequenceHelper* pEffectSequence = pEffect->getEffectSequence(); if( !pEffectSequence ) @@ -1249,7 +1249,7 @@ void CustomAnimationPane::changeSelection( STLPropertySet const * pResultSet, ST const EffectSequence::iterator aEnd( maListSelection.end() ); while( aIter != aEnd ) { - CustomAnimationEffectPtr pEffect = (*aIter++); + CustomAnimationEffectPtr pEffect = *aIter++; DBG_ASSERT( pEffect->getEffectSequence(), "sd::CustomAnimationPane::changeSelection(), dead effect in selection!" ); if( !pEffect->getEffectSequence() ) @@ -1520,7 +1520,7 @@ void CustomAnimationPane::changeSelection( STLPropertySet const * pResultSet, ST const EffectSequence::const_iterator iEnd( aSelectedEffects.end() ); while( iter != iEnd ) { - CustomAnimationEffectPtr const& pEffect = (*iter++); + CustomAnimationEffectPtr const& pEffect = *iter++; EffectSequenceHelper* pEffectSequence = pEffect->getEffectSequence(); if( !pEffectSequence ) @@ -1897,7 +1897,7 @@ void CustomAnimationPane::onRemove() const EffectSequence::iterator aEnd( aList.end() ); while( aIter != aEnd ) { - CustomAnimationEffectPtr pEffect = (*aIter++); + CustomAnimationEffectPtr pEffect = *aIter++; if( pEffect->getEffectSequence() ) pEffect->getEffectSequence()->remove( pEffect ); } @@ -1947,7 +1947,7 @@ void CustomAnimationPane::onChangeStart( sal_Int16 nNodeType ) const EffectSequence::iterator aEnd( maListSelection.end() ); while( aIter != aEnd ) { - CustomAnimationEffectPtr pEffect = (*aIter++); + CustomAnimationEffectPtr pEffect = *aIter++; if( pEffect->getNodeType() != nNodeType ) { pEffect->setNodeType( nNodeType ); @@ -1980,7 +1980,7 @@ void CustomAnimationPane::onChangeSpeed() const EffectSequence::iterator aEnd( maListSelection.end() ); while( aIter != aEnd ) { - CustomAnimationEffectPtr pEffect = (*aIter++); + CustomAnimationEffectPtr pEffect = *aIter++; pEffect->setDuration( fDuration ); } @@ -2077,7 +2077,7 @@ IMPL_LINK_NOARG(CustomAnimationPane, implPropertyHdl, LinkParamNone*, void) const EffectSequence::iterator aEnd( maListSelection.end() ); while( aIter != aEnd ) { - CustomAnimationEffectPtr pEffect = (*aIter++); + CustomAnimationEffectPtr pEffect = *aIter++; if( setProperty1Value( mnPropertyType, pEffect, aValue ) ) bNeedUpdate = true; @@ -2111,7 +2111,7 @@ IMPL_LINK_NOARG(CustomAnimationPane, DelayLoseFocusHdl, Control&, void) const EffectSequence::iterator aEnd( maListSelection.end() ); while( aIter != aEnd ) { - CustomAnimationEffectPtr pEffect = (*aIter++); + CustomAnimationEffectPtr pEffect = *aIter++; pEffect->setBegin( fBegin/10.0 ); } @@ -2145,7 +2145,7 @@ IMPL_LINK_NOARG(CustomAnimationPane, AnimationSelectHdl, ListBox&, void) while( aIter != aEnd ) { aTargets.push_back( (*aIter)->getTarget() ); - CustomAnimationEffectPtr pEffect = (*aIter++); + CustomAnimationEffectPtr pEffect = *aIter++; EffectSequenceHelper* pEffectSequence = pEffect->getEffectSequence(); if( !pEffectSequence ) @@ -2169,7 +2169,7 @@ IMPL_LINK_NOARG(CustomAnimationPane, AnimationSelectHdl, ListBox&, void) // get selected effect while( aIter != aEnd ) { - CustomAnimationEffectPtr pEffect = (*aIter++); + CustomAnimationEffectPtr pEffect = *aIter++; // Dispose the deprecated motion path tag. It will be rebuilt later. if (pEffect->getPresetClass() == css::presentation::EffectPresetClass::MOTIONPATH) @@ -2256,7 +2256,7 @@ sal_uInt32 CustomAnimationPane::fillAnimationLB( bool bHasText ) const std::vector< CustomAnimationPresetPtr >::const_iterator aEnd( aSortedVector.end() ); while( aIter != aEnd ) { - CustomAnimationPresetPtr pDescriptor = (*aIter++); + CustomAnimationPresetPtr pDescriptor = *aIter++; // ( !isTextOnly || ( isTextOnly && bHasText ) ) <=> !isTextOnly || bHasText if( pDescriptor.get() && ( !pDescriptor->isTextOnly() || bHasText ) ) { @@ -2339,7 +2339,7 @@ void CustomAnimationPane::moveSelection( bool bUp ) while( aIter != aEnd ) { - CustomAnimationEffectPtr pEffect = (*aIter++); + CustomAnimationEffectPtr pEffect = *aIter++; EffectSequence::iterator aUpEffectPos( pSequence->find( pEffect ) ); // coverity[copy_paste_error : FALSE] - this is correct, checking if it exists @@ -2370,7 +2370,7 @@ void CustomAnimationPane::moveSelection( bool bUp ) while( aIter != aEnd ) { - CustomAnimationEffectPtr pEffect = (*aIter++); + CustomAnimationEffectPtr pEffect = *aIter++; EffectSequence::iterator aDownEffectPos( pSequence->find( pEffect ) ); // coverity[copy_paste_error : FALSE] - this is correct, checking if it exists @@ -2421,7 +2421,7 @@ void CustomAnimationPane::onPreview( bool bForcePreview ) { if( (*aIter)->isSelected() ) { - xMotionPathTag = (*aIter); + xMotionPathTag = *aIter; break; } } @@ -2450,7 +2450,7 @@ void CustomAnimationPane::onPreview( bool bForcePreview ) while( aIter != aEnd ) { - CustomAnimationEffectPtr pEffect = (*aIter++); + CustomAnimationEffectPtr pEffect = *aIter++; pSequence->append( pEffect->clone() ); } @@ -2497,7 +2497,7 @@ void CustomAnimationPane::onSelect() const EffectSequence::iterator aEnd( maListSelection.end() ); while( aIter != aEnd ) { - CustomAnimationEffectPtr pEffect = (*aIter++); + CustomAnimationEffectPtr pEffect = *aIter++; Reference< XShape > xShape( pEffect->getTargetShape() ); SdrObject* pObj = GetSdrObjectFromXShape( xShape ); @@ -2524,7 +2524,7 @@ void CustomAnimationPane::onDragNDropComplete(CustomAnimationEffectPtr pEffectDr while( aIter != aEnd ) { - CustomAnimationEffectPtr pEffect = (*aIter++); + CustomAnimationEffectPtr pEffect = *aIter++; // Update model with new location (function triggers a rebuild) // target may be null, which will insert at the end. diff --git a/sd/source/ui/slideshow/slideshowviewimpl.cxx b/sd/source/ui/slideshow/slideshowviewimpl.cxx index c2fc2fb8f498..b5de0743c336 100644 --- a/sd/source/ui/slideshow/slideshowviewimpl.cxx +++ b/sd/source/ui/slideshow/slideshowviewimpl.cxx @@ -77,7 +77,7 @@ void SlideShowViewListeners::notify( const lang::EventObject& _rEvent ) ViewListenerVector::iterator aIter( maListeners.begin() ); while( aIter != maListeners.end() ) { - Reference< util::XModifyListener > xListener( (*aIter) ); + Reference< util::XModifyListener > xListener( *aIter ); if( xListener.is() ) { xListener->modified( _rEvent ); @@ -97,7 +97,7 @@ void SlideShowViewListeners::disposing( const lang::EventObject& _rEventSource ) ViewListenerVector::iterator aIter( maListeners.begin() ); while( aIter != maListeners.end() ) { - Reference< util::XModifyListener > xListener( (*aIter++) ); + Reference< util::XModifyListener > xListener( *aIter++ ); if( xListener.is() ) xListener->disposing( _rEventSource ); } diff --git a/sd/source/ui/slidesorter/view/SlsLayouter.cxx b/sd/source/ui/slidesorter/view/SlsLayouter.cxx index ba9090c58173..c2332a69c56e 100644 --- a/sd/source/ui/slidesorter/view/SlsLayouter.cxx +++ b/sd/source/ui/slidesorter/view/SlsLayouter.cxx @@ -41,8 +41,8 @@ public: sal_Int32 mnRightBorder; sal_Int32 mnTopBorder; sal_Int32 mnBottomBorder; - static const sal_Int32 gnVerticalGap = (10 - 2*Theme_FocusIndicatorWidth); - static const sal_Int32 gnHorizontalGap = (10 - 2*Theme_FocusIndicatorWidth); + static const sal_Int32 gnVerticalGap = 10 - 2*Theme_FocusIndicatorWidth; + static const sal_Int32 gnHorizontalGap = 10 - 2*Theme_FocusIndicatorWidth; Size const maMinimalSize; Size const maPreferredSize; Size const maMaximalSize; diff --git a/sd/source/ui/unoidl/SdUnoDrawView.cxx b/sd/source/ui/unoidl/SdUnoDrawView.cxx index 7eea541fe2fc..27ae9bb8afbf 100644 --- a/sd/source/ui/unoidl/SdUnoDrawView.cxx +++ b/sd/source/ui/unoidl/SdUnoDrawView.cxx @@ -228,7 +228,7 @@ sal_Bool SAL_CALL SdUnoDrawView::select( const Any& aSelection ) const ::std::vector<SdrObject*>::iterator aEnd( aObjects.end() ); while( aIter != aEnd ) { - SdrObject* pObj = (*aIter++); + SdrObject* pObj = *aIter++; mrView.MarkObj( pObj, pPV ); } } diff --git a/sd/source/ui/view/DocumentRenderer.cxx b/sd/source/ui/view/DocumentRenderer.cxx index 7f4772425528..c76303f338c4 100644 --- a/sd/source/ui/view/DocumentRenderer.cxx +++ b/sd/source/ui/view/DocumentRenderer.cxx @@ -962,7 +962,7 @@ namespace { if (*iPageIndex >= rDocument.GetSdPageCount(PageKind::Standard)) continue; - SdrPageObj* pPageObj = (*aPageObjIter++); + SdrPageObj* pPageObj = *aPageObjIter++; pPageObj->SetReferencedPage(rDocument.GetSdPage(*iPageIndex, PageKind::Standard)); } @@ -1509,7 +1509,7 @@ private: if( bDrawLines && (iter != aAreas.end()) ) { - ::tools::Rectangle aRect( (*iter++) ); + ::tools::Rectangle aRect( *iter++ ); basegfx::B2DPolygon aPoly; aPoly.insert(0, basegfx::B2DPoint( aRect.Left(), aRect.Top() ) ); diff --git a/sd/source/ui/view/sdview3.cxx b/sd/source/ui/view/sdview3.cxx index d9fe8fb46367..05b5f242f5ea 100644 --- a/sd/source/ui/view/sdview3.cxx +++ b/sd/source/ui/view/sdview3.cxx @@ -656,7 +656,7 @@ bool View::InsertData( const TransferableDataHelper& rDataHelper, maDropPos.setY( pOwnData->GetStartPos().Y() + ( aSize.Height() >> 1 ) ); // delete pages, that are not of any interest for us - for( long i = ( pWorkModel->GetPageCount() - 1 ); i >= 0; i-- ) + for( long i = pWorkModel->GetPageCount() - 1; i >= 0; i-- ) { SdPage* pP = static_cast< SdPage* >( pWorkModel->GetPage( static_cast<sal_uInt16>(i) ) ); @@ -903,7 +903,7 @@ bool View::InsertData( const TransferableDataHelper& rDataHelper, } // delete pages, that are not of any interest for us - for( long i = ( pModel->GetPageCount() - 1 ); i >= 0; i-- ) + for( long i = pModel->GetPageCount() - 1; i >= 0; i-- ) { SdPage* pP = static_cast< SdPage* >( pModel->GetPage( static_cast<sal_uInt16>(i) ) ); diff --git a/sdext/source/minimizer/impoptimizer.cxx b/sdext/source/minimizer/impoptimizer.cxx index 6b3d054f1be1..520001fedabd 100644 --- a/sdext/source/minimizer/impoptimizer.cxx +++ b/sdext/source/minimizer/impoptimizer.cxx @@ -313,8 +313,8 @@ static Reference< XGraphic > ImpCompressGraphic( const Reference< XComponentCont aDestSizePixel = aSourceSizePixel; if ( rGraphicSettings.mnImageResolution && aLogicalSize.Width && aLogicalSize.Height ) { - const double fSourceDPIX = (static_cast<double>(aSourceSizePixel.Width) / (static_cast<double>(aLogicalSize.Width) / 2540.0 )); - const double fSourceDPIY = (static_cast<double>(aSourceSizePixel.Height)/ (static_cast<double>(aLogicalSize.Height)/ 2540.0 )); + const double fSourceDPIX = static_cast<double>(aSourceSizePixel.Width) / (static_cast<double>(aLogicalSize.Width) / 2540.0 ); + const double fSourceDPIY = static_cast<double>(aSourceSizePixel.Height)/ (static_cast<double>(aLogicalSize.Height)/ 2540.0 ); // check, if the bitmap DPI exceeds the maximum DPI if( ( fSourceDPIX > rGraphicSettings.mnImageResolution ) || ( fSourceDPIY > rGraphicSettings.mnImageResolution ) ) diff --git a/sfx2/source/appl/childwin.cxx b/sfx2/source/appl/childwin.cxx index 65f06344079c..6b64540fc120 100644 --- a/sfx2/source/appl/childwin.cxx +++ b/sfx2/source/appl/childwin.cxx @@ -330,7 +330,7 @@ SfxChildWinInfo SfxChildWindow::GetInfo() const aInfo.aSize = pDialog->get_size(); WindowStateMask nMask = WindowStateMask::Pos | WindowStateMask::State; if (pDialog->get_resizable()) - nMask |= (WindowStateMask::Width | WindowStateMask::Height); + nMask |= WindowStateMask::Width | WindowStateMask::Height; aInfo.aWinState = pDialog->get_window_state(nMask); } else if (pWindow) @@ -341,7 +341,7 @@ SfxChildWinInfo SfxChildWindow::GetInfo() const { WindowStateMask nMask = WindowStateMask::Pos | WindowStateMask::State; if ( pWindow->GetStyle() & WB_SIZEABLE ) - nMask |= ( WindowStateMask::Width | WindowStateMask::Height ); + nMask |= WindowStateMask::Width | WindowStateMask::Height; aInfo.aWinState = static_cast<SystemWindow*>(pWindow.get())->GetWindowState( nMask ); } else if (DockingWindow* pDockingWindow = dynamic_cast<DockingWindow*>(pWindow.get())) diff --git a/sfx2/source/control/objface.cxx b/sfx2/source/control/objface.cxx index 385d36058a82..cf93d83f064c 100644 --- a/sfx2/source/control/objface.cxx +++ b/sfx2/source/control/objface.cxx @@ -144,7 +144,7 @@ void SfxInterface::SetSlotMap( SfxSlot& rSlotMap, sal_uInt16 nSlotCount ) SfxSlot *pLastSlot = pIter; for ( sal_uInt16 n = nIter; n < Count(); ++n ) { - SfxSlot *pCurSlot = (pSlots+n); + SfxSlot *pCurSlot = pSlots+n; if ( pCurSlot->GetStateFnc() == pIter->GetStateFnc() ) { pLastSlot->pNextSlot = pCurSlot; diff --git a/sfx2/source/dialog/basedlgs.cxx b/sfx2/source/dialog/basedlgs.cxx index 288f9b71a5e1..499c9a6e59a2 100644 --- a/sfx2/source/dialog/basedlgs.cxx +++ b/sfx2/source/dialog/basedlgs.cxx @@ -258,7 +258,7 @@ IMPL_LINK_NOARG(SfxModelessDialog, TimerHdl, Timer *, void) aSize = GetSizePixel(); WindowStateMask nMask = WindowStateMask::Pos | WindowStateMask::State; if ( GetStyle() & WB_SIZEABLE ) - nMask |= ( WindowStateMask::Width | WindowStateMask::Height ); + nMask |= WindowStateMask::Width | WindowStateMask::Height; pImpl->aWinState = GetWindowState( nMask ); GetBindings().GetWorkWindow_Impl()->ConfigChild_Impl( SfxChildIdentifier::DOCKINGWINDOW, SfxDockingConfig::ALIGNDOCKINGWINDOW, pImpl->pMgr->GetType() ); } @@ -429,7 +429,7 @@ void SfxModelessDialogController::DeInit() { WindowStateMask nMask = WindowStateMask::Pos | WindowStateMask::State; if (m_xDialog->get_resizable()) - nMask |= ( WindowStateMask::Width | WindowStateMask::Height ); + nMask |= WindowStateMask::Width | WindowStateMask::Height; m_xImpl->aWinState = m_xDialog->get_window_state(nMask); GetBindings().GetWorkWindow_Impl()->ConfigChild_Impl( SfxChildIdentifier::DOCKINGWINDOW, SfxDockingConfig::ALIGNDOCKINGWINDOW, m_xImpl->pMgr->GetType() ); } @@ -652,7 +652,7 @@ IMPL_LINK_NOARG(SfxFloatingWindow, TimerHdl, Timer *, void) aSize = GetSizePixel(); WindowStateMask nMask = WindowStateMask::Pos | WindowStateMask::State; if ( GetStyle() & WB_SIZEABLE ) - nMask |= ( WindowStateMask::Width | WindowStateMask::Height ); + nMask |= WindowStateMask::Width | WindowStateMask::Height; pImpl->aWinState = GetWindowState( nMask ); GetBindings().GetWorkWindow_Impl()->ConfigChild_Impl( SfxChildIdentifier::DOCKINGWINDOW, SfxDockingConfig::ALIGNDOCKINGWINDOW, pImpl->pMgr->GetType() ); } diff --git a/sfx2/source/dialog/printopt.cxx b/sfx2/source/dialog/printopt.cxx index c50da65acdbc..92a3047aafd6 100644 --- a/sfx2/source/dialog/printopt.cxx +++ b/sfx2/source/dialog/printopt.cxx @@ -226,7 +226,7 @@ void SfxCommonPrintOptionsTabPage::ImplUpdateControls( const PrinterOptions* pCu m_pReduceBitmapsResolutionLB->SelectEntryPos( 0 ); else { - for( long i = ( DPI_COUNT - 1 ); i >= 0; i-- ) + for( long i = DPI_COUNT - 1; i >= 0; i-- ) { if( nDPI >= aDPIArray[ i ] ) { diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx index 00bb49a24c5f..04ae1f735cdc 100644 --- a/sfx2/source/doc/docfile.cxx +++ b/sfx2/source/doc/docfile.cxx @@ -737,7 +737,7 @@ bool SfxMedium::Commit() GetInitFileDate( true ); // remove truncation mode from the flags - pImpl->m_nStorOpenMode &= (~StreamMode::TRUNC); + pImpl->m_nStorOpenMode &= ~StreamMode::TRUNC; return bResult; } diff --git a/slideshow/source/engine/opengl/TransitionerImpl.cxx b/slideshow/source/engine/opengl/TransitionerImpl.cxx index 6fe8c08772ee..f8af810f813b 100644 --- a/slideshow/source/engine/opengl/TransitionerImpl.cxx +++ b/slideshow/source/engine/opengl/TransitionerImpl.cxx @@ -1068,7 +1068,7 @@ void SAL_CALL OGLTransitionerImpl::update( double nTime ) SAL_INFO("slideshow.opengl", "update time: " << nTime); SAL_INFO("slideshow.opengl", "update took: " << std::chrono::duration_cast<std::chrono::milliseconds>(m_UpdateEndTime - m_UpdateStartTime).count()); - m_TotalUpdateDuration += (m_UpdateEndTime - m_UpdateStartTime); + m_TotalUpdateDuration += m_UpdateEndTime - m_UpdateStartTime; #endif } diff --git a/slideshow/source/engine/rehearsetimingsactivity.cxx b/slideshow/source/engine/rehearsetimingsactivity.cxx index ec1370f08784..6285f73557e7 100644 --- a/slideshow/source/engine/rehearsetimingsactivity.cxx +++ b/slideshow/source/engine/rehearsetimingsactivity.cxx @@ -415,7 +415,7 @@ void RehearseTimingsActivity::paint( cppcanvas::CanvasSharedPtr const & canvas ) const sal_Int32 nTimeSecs = static_cast<sal_Int32>(maElapsedTime.getElapsedTime()); OUStringBuffer buf; - sal_Int32 n = (nTimeSecs / 3600); + sal_Int32 n = nTimeSecs / 3600; if (n < 10) buf.append( '0' ); buf.append( n ); diff --git a/slideshow/source/engine/shapes/shapeimporter.cxx b/slideshow/source/engine/shapes/shapeimporter.cxx index e829c9d4a954..d556edd24aaf 100644 --- a/slideshow/source/engine/shapes/shapeimporter.cxx +++ b/slideshow/source/engine/shapes/shapeimporter.cxx @@ -172,8 +172,8 @@ bool ShapeOfGroup::isContentChanged() const basegfx::B2DRectangle ShapeOfGroup::getBounds() const { basegfx::B2DRectangle const groupPosSize( mpGroupShape->getBounds() ); - double const posX = (groupPosSize.getMinX() + maPosOffset.getX()); - double const posY = (groupPosSize.getMinY() + maPosOffset.getY()); + double const posX = groupPosSize.getMinX() + maPosOffset.getX(); + double const posY = groupPosSize.getMinY() + maPosOffset.getY(); return basegfx::B2DRectangle( posX, posY, posX + mnWidth, posY + mnHeight ); } diff --git a/slideshow/source/engine/transitions/checkerboardwipe.cxx b/slideshow/source/engine/transitions/checkerboardwipe.cxx index 2f09145af17a..8512e398efa7 100644 --- a/slideshow/source/engine/transitions/checkerboardwipe.cxx +++ b/slideshow/source/engine/transitions/checkerboardwipe.cxx @@ -27,7 +27,7 @@ namespace internal { ::basegfx::B2DPolyPolygon CheckerBoardWipe::operator () ( double t ) { - const double d = (1.0 / m_unitsPerEdge); + const double d = 1.0 / m_unitsPerEdge; ::basegfx::B2DHomMatrix aTransform; aTransform.scale( ::basegfx::pruneScaleValue( d * 2.0 * t ), ::basegfx::pruneScaleValue( d ) ); diff --git a/slideshow/source/engine/transitions/figurewipe.cxx b/slideshow/source/engine/transitions/figurewipe.cxx index a2f3d525c32a..1761fdc1a4e4 100644 --- a/slideshow/source/engine/transitions/figurewipe.cxx +++ b/slideshow/source/engine/transitions/figurewipe.cxx @@ -93,11 +93,11 @@ FigureWipe * FigureWipe::createHexagonWipe() FigureWipe * FigureWipe::createStarWipe( sal_Int32 nPoints ) { - const double v = (M_PI / nPoints); + const double v = M_PI / nPoints; const ::basegfx::B2DPoint p_( 0.0, -M_SQRT2 ); ::basegfx::B2DPolygon figure; for ( sal_Int32 pos = 0; pos < nPoints; ++pos ) { - const double w = (pos * 2.0 * M_PI / nPoints); + const double w = pos * 2.0 * M_PI / nPoints; ::basegfx::B2DHomMatrix aTransform; ::basegfx::B2DPoint p(p_); aTransform.rotate( -w ); diff --git a/slideshow/source/engine/transitions/randomwipe.cxx b/slideshow/source/engine/transitions/randomwipe.cxx index 584c17b1c0f1..dbe78386bb6e 100644 --- a/slideshow/source/engine/transitions/randomwipe.cxx +++ b/slideshow/source/engine/transitions/randomwipe.cxx @@ -36,7 +36,7 @@ RandomWipe::RandomWipe( sal_Int32 nElements, bool randomBars ) ::basegfx::B2DHomMatrix aTransform; if (randomBars) { - double edge = (1.0 / nElements); + double edge = 1.0 / nElements; for ( sal_Int32 pos = nElements; pos--; ) m_positions[ pos ].setY( ::basegfx::pruneScaleValue( pos * edge ) ); aTransform.scale( 1.0, ::basegfx::pruneScaleValue(edge) ); @@ -45,7 +45,7 @@ RandomWipe::RandomWipe( sal_Int32 nElements, bool randomBars ) { sal_Int32 sqrtElements = static_cast<sal_Int32>( sqrt( static_cast<double>(nElements) ) ); - double edge = (1.0 / sqrtElements); + double edge = 1.0 / sqrtElements; for ( sal_Int32 pos = nElements; pos--; ) { m_positions[ pos ] = ::basegfx::B2DPoint( ::basegfx::pruneScaleValue( (pos % sqrtElements) * edge ), diff --git a/slideshow/source/engine/transitions/snakewipe.cxx b/slideshow/source/engine/transitions/snakewipe.cxx index 2fd53e121494..efa8960bbfd1 100644 --- a/slideshow/source/engine/transitions/snakewipe.cxx +++ b/slideshow/source/engine/transitions/snakewipe.cxx @@ -46,8 +46,8 @@ SnakeWipe::SnakeWipe( sal_Int32 nElements, bool diagonal, bool flipOnYAxis ) ::basegfx::B2DPolyPolygon SnakeWipe::calcSnake( double t ) const { ::basegfx::B2DPolyPolygon res; - const double area = (t * m_sqrtElements * m_sqrtElements); - const sal_Int32 line_ = (static_cast<sal_Int32>(area) / m_sqrtElements); + const double area = t * m_sqrtElements * m_sqrtElements; + const sal_Int32 line_ = static_cast<sal_Int32>(area) / m_sqrtElements; const double line = ::basegfx::pruneScaleValue( static_cast<double>(line_) / m_sqrtElements ); const double col = ::basegfx::pruneScaleValue( @@ -102,9 +102,9 @@ SnakeWipe::SnakeWipe( sal_Int32 nElements, bool diagonal, bool flipOnYAxis ) poly.setClosed(true); res.append(poly); } - const double a = (M_SQRT1_2 / m_sqrtElements); + const double a = M_SQRT1_2 / m_sqrtElements; const double d = std::modf(sqrtArea2, &o3tl::temporary(double())); - const double len = (t * M_SQRT2 * d); + const double len = t * M_SQRT2 * d; const double height = ::basegfx::pruneScaleValue( M_SQRT1_2 / m_sqrtElements ); poly.clear(); poly.append( ::basegfx::B2DPoint( 0.0, 0.0 ) ); @@ -146,9 +146,9 @@ SnakeWipe::SnakeWipe( sal_Int32 nElements, bool diagonal, bool flipOnYAxis ) poly.setClosed(true); res.append(poly); } - const double a = (M_SQRT1_2 / m_sqrtElements); + const double a = M_SQRT1_2 / m_sqrtElements; const double d = std::modf(sqrtArea2, &o3tl::temporary(double())); - const double len = ((1.0 - t) * M_SQRT2 * d); + const double len = (1.0 - t) * M_SQRT2 * d; const double height = ::basegfx::pruneScaleValue( M_SQRT1_2 / m_sqrtElements ); poly.clear(); poly.append( ::basegfx::B2DPoint( 0.0, 0.0 ) ); diff --git a/slideshow/source/engine/transitions/spiralwipe.cxx b/slideshow/source/engine/transitions/spiralwipe.cxx index 6ecad1712ed4..a00c95b0984e 100644 --- a/slideshow/source/engine/transitions/spiralwipe.cxx +++ b/slideshow/source/engine/transitions/spiralwipe.cxx @@ -40,9 +40,9 @@ SpiralWipe::SpiralWipe( sal_Int32 nElements, bool flipOnYAxis ) ::basegfx::B2DPolyPolygon SpiralWipe::calcNegSpiral( double t ) const { - const double area = (t * m_elements); - const double e = (sqrt(area) / 2.0); - const sal_Int32 edge = (static_cast<sal_Int32>(e) * 2); + const double area = t * m_elements; + const double e = sqrt(area) / 2.0; + const sal_Int32 edge = static_cast<sal_Int32>(e) * 2; basegfx::B2DHomMatrix aTransform(basegfx::utils::createTranslateB2DHomMatrix(-0.5, -0.5)); const double edge_ = ::basegfx::pruneScaleValue( @@ -54,7 +54,7 @@ SpiralWipe::SpiralWipe( sal_Int32 nElements, bool flipOnYAxis ) ::basegfx::B2DPolyPolygon res(poly); if (! ::basegfx::fTools::equalZero( 1.0 - t )) { - const sal_Int32 edge1 = (edge + 1); + const sal_Int32 edge1 = edge + 1; sal_Int32 len = static_cast<sal_Int32>( (e - (edge /2)) * edge1 * 4 ); double w = M_PI_2; while (len > 0) { diff --git a/slideshow/source/engine/transitions/waterfallwipe.cxx b/slideshow/source/engine/transitions/waterfallwipe.cxx index eb0ead303c62..97f25eef1631 100644 --- a/slideshow/source/engine/transitions/waterfallwipe.cxx +++ b/slideshow/source/engine/transitions/waterfallwipe.cxx @@ -34,11 +34,11 @@ WaterfallWipe::WaterfallWipe( sal_Int32 nElements, bool flipOnYAxis ) { const sal_Int32 sqrtElements = static_cast<sal_Int32>( sqrt( static_cast<double>(nElements) ) ); - const double elementEdge = (1.0 / sqrtElements); + const double elementEdge = 1.0 / sqrtElements; m_waterfall.append( ::basegfx::B2DPoint( 0.0, -1.0 ) ); for ( sal_Int32 pos = sqrtElements; pos--; ) { - const sal_Int32 xPos = (sqrtElements - pos - 1); + const sal_Int32 xPos = sqrtElements - pos - 1; const double yPos = ::basegfx::pruneScaleValue( ((pos + 1) * elementEdge) - 1.0 ); m_waterfall.append( ::basegfx::B2DPoint( ::basegfx::pruneScaleValue( xPos * elementEdge ), diff --git a/slideshow/source/engine/transitions/zigzagwipe.cxx b/slideshow/source/engine/transitions/zigzagwipe.cxx index adfc85c1d224..e7f80e78cf01 100644 --- a/slideshow/source/engine/transitions/zigzagwipe.cxx +++ b/slideshow/source/engine/transitions/zigzagwipe.cxx @@ -32,11 +32,11 @@ namespace internal { ZigZagWipe::ZigZagWipe( sal_Int32 nZigs ) : m_zigEdge( 1.0 / nZigs ) { const double d = m_zigEdge; - const double d2 = (d / 2.0); + const double d2 = d / 2.0; m_stdZigZag.append( ::basegfx::B2DPoint( -1.0 - d, -d ) ); m_stdZigZag.append( ::basegfx::B2DPoint( -1.0 - d, 1.0 + d ) ); m_stdZigZag.append( ::basegfx::B2DPoint( -d, 1.0 + d ) ); - for ( sal_Int32 pos = (nZigs + 2); pos--; ) { + for ( sal_Int32 pos = nZigs + 2; pos--; ) { m_stdZigZag.append( ::basegfx::B2DPoint( 0.0, ((pos - 1) * d) + d2 ) ); m_stdZigZag.append( ::basegfx::B2DPoint( -d, (pos - 1) * d ) ); } diff --git a/soltools/mkdepend/include.c b/soltools/mkdepend/include.c index b7a5df1caae8..4af7c47248e5 100644 --- a/soltools/mkdepend/include.c +++ b/soltools/mkdepend/include.c @@ -100,7 +100,7 @@ struct inclist *inc_path(char *file, char *include, boolean dot, struct Includes } else { - int partial = (p - file); + int partial = p - file; size_t inc_len = strlen(include); if(inc_len + partial >= BUFSIZ ) { diff --git a/store/source/stordata.cxx b/store/source/stordata.cxx index 4b680a504cb1..7ce39a9c1208 100644 --- a/store/source/stordata.cxx +++ b/store/source/stordata.cxx @@ -214,7 +214,7 @@ storeError OStoreIndirectionPageObject::read ( OStorePageBIOS &rBIOS) const { PageHolderObject< page > xImpl (m_xPage); - page const & rPage = (*xImpl); + page const & rPage = *xImpl; // Check arguments. sal_uInt16 const nLimit = rPage.capacityCount(); @@ -240,7 +240,7 @@ storeError OStoreIndirectionPageObject::read ( OStorePageBIOS &rBIOS) const { PageHolderObject< page > xImpl (m_xPage); - page const & rPage = (*xImpl); + page const & rPage = *xImpl; // Check arguments. sal_uInt16 const nLimit = rPage.capacityCount(); @@ -273,7 +273,7 @@ storeError OStoreIndirectionPageObject::read ( OStorePageBIOS &rBIOS) const { PageHolderObject< page > xImpl (m_xPage); - page const & rPage = (*xImpl); + page const & rPage = *xImpl; // Check arguments. sal_uInt16 const nLimit = rPage.capacityCount(); @@ -304,7 +304,7 @@ storeError OStoreIndirectionPageObject::write ( OStorePageBIOS &rBIOS) { PageHolderObject< page > xImpl (m_xPage); - page & rPage = (*xImpl); + page & rPage = *xImpl; // Check arguments. sal_uInt16 const nLimit = rPage.capacityCount(); @@ -343,7 +343,7 @@ storeError OStoreIndirectionPageObject::write ( OStorePageBIOS &rBIOS) { PageHolderObject< page > xImpl (m_xPage); - page & rPage = (*xImpl); + page & rPage = *xImpl; // Check arguments. sal_uInt16 const nLimit = rPage.capacityCount(); @@ -379,7 +379,7 @@ storeError OStoreIndirectionPageObject::write ( OStorePageBIOS &rBIOS) { PageHolderObject< page > xImpl (m_xPage); - page & rPage = (*xImpl); + page & rPage = *xImpl; // Check arguments. sal_uInt16 const nLimit = rPage.capacityCount(); @@ -412,7 +412,7 @@ storeError OStoreIndirectionPageObject::truncate ( OStorePageBIOS & rBIOS) { PageHolderObject< page > xImpl (m_xPage); - page & rPage = (*xImpl); + page & rPage = *xImpl; // Check arguments. sal_uInt16 const nLimit = rPage.capacityCount(); @@ -458,7 +458,7 @@ storeError OStoreIndirectionPageObject::truncate ( OStorePageBIOS &rBIOS) { PageHolderObject< page > xImpl (m_xPage); - page & rPage = (*xImpl); + page & rPage = *xImpl; // Check arguments. sal_uInt16 const nLimit = rPage.capacityCount(); @@ -513,7 +513,7 @@ storeError OStoreIndirectionPageObject::truncate ( OStorePageBIOS &rBIOS) { PageHolderObject< page > xImpl (m_xPage); - page & rPage = (*xImpl); + page & rPage = *xImpl; // Check arguments. sal_uInt16 const nLimit = rPage.capacityCount(); diff --git a/store/source/stortree.cxx b/store/source/stortree.cxx index 526191153bdb..87378794ba5b 100644 --- a/store/source/stortree.cxx +++ b/store/source/stortree.cxx @@ -224,7 +224,7 @@ storeError OStoreBTreeNodeObject::remove ( OStorePageBIOS & rBIOS) { PageHolderObject< page > xImpl (m_xPage); - page & rPage = (*xImpl); + page & rPage = *xImpl; // Check depth. storeError eErrCode = store_E_None; @@ -397,7 +397,7 @@ storeError OStoreBTreeRootObject::find_lookup ( for (; xPage->depth() > 0; xPage = rNode.makeHolder< page >()) { // Find next page. - page const & rPage = (*xPage); + page const & rPage = *xPage; sal_uInt16 const i = rPage.find(entry); sal_uInt16 const n = rPage.usageCount(); if (i >= n) @@ -421,7 +421,7 @@ storeError OStoreBTreeRootObject::find_lookup ( } // Find index. - page const & rPage = (*xPage); + page const & rPage = *xPage; rIndex = rPage.find(entry); if (rIndex >= rPage.usageCount()) return store_E_NotExists; @@ -482,7 +482,7 @@ storeError OStoreBTreeRootObject::find_insert ( for (; xPage->depth() > 0; xPage = rNode.makeHolder< page >()) { // Find next page. - page const & rPage = (*xPage); + page const & rPage = *xPage; sal_uInt16 const i = rPage.find (entry); sal_uInt16 const n = rPage.usageCount(); if (i >= n) @@ -524,7 +524,7 @@ storeError OStoreBTreeRootObject::find_insert ( } // Find index. - page const & rPage = (*xPage); + page const & rPage = *xPage; rIndex = rPage.find(entry); if (rIndex < rPage.usageCount()) { diff --git a/svl/source/crypto/cryptosign.cxx b/svl/source/crypto/cryptosign.cxx index 9f18e53a3eca..58dafc378af4 100644 --- a/svl/source/crypto/cryptosign.cxx +++ b/svl/source/crypto/cryptosign.cxx @@ -401,7 +401,7 @@ my_SEC_StringToOID(SECItem *to, const char *from, PRUint32 len) SECStatus rv; PRUint8 result[1024]; - static const PRUint32 max_decimal = (0xffffffff / 10); + static const PRUint32 max_decimal = 0xffffffff / 10; static const char OIDstring[] = {"OID."}; if (!from || !to) { @@ -423,7 +423,7 @@ bad_data: do { PRUint32 decimal = 0; while (len > 0 && rtl::isAsciiDigit(static_cast<unsigned char>(*from))) { - PRUint32 addend = (*from++ - '0'); + PRUint32 addend = *from++ - '0'; --len; if (decimal > max_decimal) /* overflow */ goto bad_data; @@ -1766,7 +1766,7 @@ SECStatus StringToOID(SECItem* to, const char* from, PRUint32 len) SECStatus rv; PRUint8 result[1024]; - static const PRUint32 max_decimal = (0xffffffff / 10); + static const PRUint32 max_decimal = 0xffffffff / 10; static const char OIDstring[] = {"OID."}; if (!from || !to) @@ -1794,7 +1794,7 @@ bad_data: PRUint32 decimal = 0; while (len > 0 && rtl::isAsciiDigit(static_cast<unsigned char>(*from))) { - PRUint32 addend = (*from++ - '0'); + PRUint32 addend = *from++ - '0'; --len; if (decimal > max_decimal) /* overflow */ goto bad_data; diff --git a/svl/source/misc/adrparse.cxx b/svl/source/misc/adrparse.cxx index a3b7ef6060a3..11d8742c36ed 100644 --- a/svl/source/misc/adrparse.cxx +++ b/svl/source/misc/adrparse.cxx @@ -629,7 +629,7 @@ SvAddressParser_Impl::SvAddressParser_Impl(SvAddressParser * pParser, aTheAddrSpec = reparse(m_pAddrSpec->m_pBegin, m_pAddrSpec->m_pEnd, true); else { - sal_Int32 nLen = ( m_pAddrSpec->m_pEnd - m_pAddrSpec->m_pBegin); + sal_Int32 nLen = m_pAddrSpec->m_pEnd - m_pAddrSpec->m_pBegin; if (nLen == rInput.getLength()) aTheAddrSpec = rInput; else @@ -656,7 +656,7 @@ SvAddressParser_Impl::SvAddressParser_Impl(SvAddressParser * pParser, aTheRealName = reparse(m_pRealNameBegin, m_pRealNameEnd, false); else { - sal_Int32 nLen = (m_pRealNameContentEnd - m_pRealNameContentBegin); + sal_Int32 nLen = m_pRealNameContentEnd - m_pRealNameContentBegin; if (nLen == rInput.getLength()) aTheRealName = rInput; else diff --git a/svtools/source/config/printoptions.cxx b/svtools/source/config/printoptions.cxx index a0beda999bb0..c5bc4950c162 100644 --- a/svtools/source/config/printoptions.cxx +++ b/svtools/source/config/printoptions.cxx @@ -680,7 +680,7 @@ void SvtBasePrintOptions::SetPrinterOptions( const PrinterOptions& rOptions ) SetReducedBitmapResolution( 0 ); else { - for( long i = ( DPI_COUNT - 1 ); i >= 0; i-- ) + for( long i = DPI_COUNT - 1; i >= 0; i-- ) { if( nDPI >= aDPIArray[ i ] ) { diff --git a/svtools/source/contnr/fileview.cxx b/svtools/source/contnr/fileview.cxx index 72a42bcd3b56..14d4a0b2e5b2 100644 --- a/svtools/source/contnr/fileview.cxx +++ b/svtools/source/contnr/fileview.cxx @@ -390,7 +390,7 @@ ViewTabListBox_Impl::ViewTabListBox_Impl( vcl::Window* pParentWin, mpHeaderBar = VclPtr<HeaderBar>::Create( pParentWin, WB_BUTTONSTYLE | WB_BOTTOMBORDER ); mpHeaderBar->SetPosSizePixel( Point( 0, 0 ), mpHeaderBar->CalcWindowSizePixel() ); - HeaderBarItemBits nBits = ( HeaderBarItemBits::LEFT | HeaderBarItemBits::CLICKABLE ); + HeaderBarItemBits nBits = HeaderBarItemBits::LEFT | HeaderBarItemBits::CLICKABLE; long aTabPositions[] = { 20, 180, 320, 400, 600 }; SetTabs(SAL_N_ELEMENTS(aTabPositions), aTabPositions, MapUnit::MapPixel); diff --git a/svtools/source/contnr/iconviewimpl.cxx b/svtools/source/contnr/iconviewimpl.cxx index f1613fe4e6bd..0ffe52386b5b 100644 --- a/svtools/source/contnr/iconviewimpl.cxx +++ b/svtools/source/contnr/iconviewimpl.cxx @@ -39,7 +39,7 @@ void IconViewImpl::CursorUp() if( !pPrevFirstToDraw ) return; - nFlags &= (~LBoxFlags::Filling); + nFlags &= ~LBoxFlags::Filling; long nEntryHeight = pView->GetEntryHeight(); ShowCursor( false ); pView->Update(); @@ -64,7 +64,7 @@ void IconViewImpl::CursorDown() if( pNextFirstToDraw ) { - nFlags &= (~LBoxFlags::Filling); + nFlags &= ~LBoxFlags::Filling; ShowCursor( false ); pView->Update(); pStartEntry = pNextFirstToDraw; @@ -92,7 +92,7 @@ void IconViewImpl::PageDown( sal_uInt16 nDelta ) ShowCursor( false ); - nFlags &= (~LBoxFlags::Filling); + nFlags &= ~LBoxFlags::Filling; pView->Update(); pStartEntry = pNext; @@ -128,7 +128,7 @@ void IconViewImpl::PageUp( sal_uInt16 nDelta ) if( pPrev == pStartEntry ) return; - nFlags &= (~LBoxFlags::Filling); + nFlags &= ~LBoxFlags::Filling; ShowCursor( false ); pView->Update(); @@ -167,7 +167,7 @@ void IconViewImpl::KeyDown( bool bPageDown ) if( nDelta <= 0 ) return; - nFlags &= (~LBoxFlags::Filling); + nFlags &= ~LBoxFlags::Filling; BeginScroll(); aVerSBar->SetThumbPos( nThumbPos+nDelta ); @@ -198,7 +198,7 @@ void IconViewImpl::KeyUp( bool bPageUp ) if( nDelta < 0 ) return; - nFlags &= (~LBoxFlags::Filling); + nFlags &= ~LBoxFlags::Filling; BeginScroll(); aVerSBar->SetThumbPos( nThumbPos - nDelta ); @@ -433,9 +433,9 @@ void IconViewImpl::Paint(vcl::RenderContext& rRenderContext, const tools::Rectan pEntry = pView->NextVisible(pEntry); } - nFlags &= (~LBoxFlags::DeselectAll); + nFlags &= ~LBoxFlags::DeselectAll; rRenderContext.SetClipRegion(); - nFlags &= (~LBoxFlags::InPaint); + nFlags &= ~LBoxFlags::InPaint; } void IconViewImpl::InvalidateEntry( long nId ) const @@ -462,7 +462,7 @@ bool IconViewImpl::KeyInput( const KeyEvent& rKEvt ) if( rKeyCode.IsMod2() ) return false; // don't evaluate Alt key - nFlags &= (~LBoxFlags::Filling); + nFlags &= ~LBoxFlags::Filling; if( !pCursor ) pCursor = pStartEntry; diff --git a/svtools/source/contnr/imivctl1.cxx b/svtools/source/contnr/imivctl1.cxx index 4193a3056b32..7807ed358058 100644 --- a/svtools/source/contnr/imivctl1.cxx +++ b/svtools/source/contnr/imivctl1.cxx @@ -1023,7 +1023,7 @@ bool SvxIconChoiceCtrl_Impl::KeyInput( const KeyEvent& rKEvt ) if( rKEvt.GetKeyCode().IsShift() ) { if( nFlags & IconChoiceFlags::AddMode ) - nFlags &= (~IconChoiceFlags::AddMode); + nFlags &= ~IconChoiceFlags::AddMode; else nFlags |= IconChoiceFlags::AddMode; } @@ -2151,7 +2151,7 @@ void SvxIconChoiceCtrl_Impl::DeselectAllBut( SvxIconChoiceCtrlEntry const * pThi SelectEntry( pEntry, false, true ); } pAnchor = nullptr; - nFlags &= (~IconChoiceFlags::AddMode); + nFlags &= ~IconChoiceFlags::AddMode; } Size SvxIconChoiceCtrl_Impl::GetMinGrid() const @@ -2692,7 +2692,7 @@ void SvxIconChoiceCtrl_Impl::SelectAll() SvxIconChoiceCtrlEntry* pEntry = aEntries[ nCur ]; SelectEntry( pEntry, true/*bSelect*/, true ); } - nFlags &= (~IconChoiceFlags::AddMode); + nFlags &= ~IconChoiceFlags::AddMode; pAnchor = nullptr; } diff --git a/svtools/source/contnr/imivctl2.cxx b/svtools/source/contnr/imivctl2.cxx index ccbbe3e33c59..1a452e9e5cee 100644 --- a/svtools/source/contnr/imivctl2.cxx +++ b/svtools/source/contnr/imivctl2.cxx @@ -334,7 +334,7 @@ SvxIconChoiceCtrlEntry* IcnCursor_Impl::GoPageUpDown( SvxIconChoiceCtrlEntry* pS if( pView->IsAutoArrange() && !(pView->nWinBits & WB_ALIGN_TOP) ) { const long nPos = static_cast<long>(pView->GetEntryListPos( pStart )); - long nEntriesInView = (pView->aOutputSize.Height() / pView->nGridDY); + long nEntriesInView = pView->aOutputSize.Height() / pView->nGridDY; nEntriesInView *= ((pView->aOutputSize.Width()+(pView->nGridDX/2)) / pView->nGridDX ); long nNewPos = nPos; diff --git a/svtools/source/control/calendar.cxx b/svtools/source/control/calendar.cxx index 61adb2802371..baf324e9b071 100644 --- a/svtools/source/control/calendar.cxx +++ b/svtools/source/control/calendar.cxx @@ -222,7 +222,7 @@ void Calendar::ImplFormat() mnMonthPerLine = aOutSize.Width() / mnMonthWidth; if ( !mnMonthPerLine ) mnMonthPerLine = 1; - long nOver = ((aOutSize.Width()-(mnMonthPerLine*mnMonthWidth)) / mnMonthPerLine); + long nOver = (aOutSize.Width()-(mnMonthPerLine*mnMonthWidth)) / mnMonthPerLine; mnMonthWidth += nOver; mnDaysOffX = MONTH_BORDERX; mnDaysOffX += nOver/2; diff --git a/svtools/source/control/ruler.cxx b/svtools/source/control/ruler.cxx index 7baf7ffd1c86..d380523ca7aa 100644 --- a/svtools/source/control/ruler.cxx +++ b/svtools/source/control/ruler.cxx @@ -575,7 +575,7 @@ void Ruler::ImplDrawTicks(vcl::RenderContext& rRenderContext, long nMin, long nM n = aPixSize.Height(); // Tick4 - Output (Text) - double aStep = (nTick / nTick4); + double aStep = nTick / nTick4; double aRest = std::abs(aStep - std::floor(aStep)); double nAcceptanceDelta = 0.0001; diff --git a/svtools/source/control/toolbarmenu.cxx b/svtools/source/control/toolbarmenu.cxx index 4530ec1c54dc..76de7e8534b9 100644 --- a/svtools/source/control/toolbarmenu.cxx +++ b/svtools/source/control/toolbarmenu.cxx @@ -1199,7 +1199,7 @@ void ToolbarMenu::implPaint(vcl::RenderContext& rRenderContext, ToolbarMenuEntry if( aPos.Y() >= 0 ) { - long nTextOffsetY = ((pEntry->maSize.Height() - nFontHeight) / 2); + long nTextOffsetY = (pEntry->maSize.Height() - nFontHeight) / 2; DrawTextFlags nTextStyle = DrawTextFlags::NONE; DrawSymbolFlags nSymbolStyle = DrawSymbolFlags::NONE; diff --git a/svtools/source/dialogs/wizardmachine.cxx b/svtools/source/dialogs/wizardmachine.cxx index bf14a0dae2e0..2f7cf48a8af3 100644 --- a/svtools/source/dialogs/wizardmachine.cxx +++ b/svtools/source/dialogs/wizardmachine.cxx @@ -223,7 +223,7 @@ namespace svt TabPage* pCurrentPage = GetPage(getCurrentState()); if ( pCurrentPage && !pCurrentPage->GetText().isEmpty() ) { - sCompleteTitle += (" - " + pCurrentPage->GetText()); + sCompleteTitle += " - " + pCurrentPage->GetText(); } SetText(sCompleteTitle); diff --git a/svtools/source/svhtml/parhtml.cxx b/svtools/source/svhtml/parhtml.cxx index 6f9e33a8bd2e..ab174dd713a2 100644 --- a/svtools/source/svhtml/parhtml.cxx +++ b/svtools/source/svhtml/parhtml.cxx @@ -1615,7 +1615,7 @@ HtmlTokenId HTMLParser::FilterPRE( HtmlTokenId nToken ) case HtmlTokenId::TABCHAR: { - sal_Int32 nSpaces = (8 - (nPre_LinePos % 8)); + sal_Int32 nSpaces = 8 - (nPre_LinePos % 8); DBG_ASSERT( aToken.isEmpty(), "Why is the token not empty?" ); if (aToken.getLength() < nSpaces) { diff --git a/svtools/source/uno/unoevent.cxx b/svtools/source/uno/unoevent.cxx index 54582979066e..a0ca2b82080d 100644 --- a/svtools/source/uno/unoevent.cxx +++ b/svtools/source/uno/unoevent.cxx @@ -434,7 +434,7 @@ void SvDetachedEventDescriptor::getByName( throw NoSuchElementException(); if( aMacros[nIndex] ) - rMacro = (*aMacros[nIndex]); + rMacro = *aMacros[nIndex]; } bool SvDetachedEventDescriptor::hasById( diff --git a/svx/source/customshapes/EnhancedCustomShape2d.cxx b/svx/source/customshapes/EnhancedCustomShape2d.cxx index aaeac95f71db..eed455440237 100644 --- a/svx/source/customshapes/EnhancedCustomShape2d.cxx +++ b/svx/source/customshapes/EnhancedCustomShape2d.cxx @@ -1284,8 +1284,8 @@ bool EnhancedCustomShape2d::SetHandleControllerPosition( const sal_uInt32 nIndex } const double fDX = fPos1 - fXRef; fAngle = -basegfx::rad2deg(atan2(-fPos2 + fYRef, (fDX == 0.0) ? 0.000000001 : fDX)); - double fX = ( fPos1 - fXRef ); - double fY = ( fPos2 - fYRef ); + double fX = fPos1 - fXRef; + double fY = fPos2 - fYRef; double fRadius = sqrt( fX * fX + fY * fY ); if ( aHandle.nFlags & HandleFlags::RADIUS_RANGE_MINIMUM ) { diff --git a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx index c35be6e0f47b..3310dcdd343f 100644 --- a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx +++ b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx @@ -719,7 +719,7 @@ static void FitTextOutlinesToShapeOutlines( const tools::PolyPolygon& aOutlines2 GetPoint( rOutlinePoly, vDistances, fM1, fx1, fy1 ); GetPoint( rOutlinePoly, vDistances, fM2, fx2, fy2 ); - double fvx = ( fy2 - fy1 ); + double fvx = fy2 - fy1; double fvy = - ( fx2 - fx1 ); fx1 = fx1 + ( ( fx2 - fx1 ) * 0.5 ); fy1 = fy1 + ( ( fy2 - fy1 ) * 0.5 ); diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx index e86d1f4e9847..91f62a0eebae 100644 --- a/svx/source/dialog/srchdlg.cxx +++ b/svx/source/dialog/srchdlg.cxx @@ -1360,8 +1360,8 @@ IMPL_LINK( SvxSearchDialog, CommandHdl_Impl, Button *, pBtn, void ) pSearchItem->SetUseAsianOptions(GetCheckBoxValue(m_pJapOptionsCB)); TransliterationFlags nFlags = GetTransliterationFlags(); if( !pSearchItem->IsUseAsianOptions()) - nFlags &= (TransliterationFlags::IGNORE_CASE | - TransliterationFlags::IGNORE_WIDTH ); + nFlags &= TransliterationFlags::IGNORE_CASE | + TransliterationFlags::IGNORE_WIDTH; if (GetNegatedCheckBoxValue(m_pIncludeDiacritics)) nFlags |= TransliterationFlags::IGNORE_DIACRITICS_CTL; if (GetNegatedCheckBoxValue(m_pIncludeKashida)) @@ -2337,8 +2337,8 @@ void SvxSearchDialog::SaveToModule_Impl() TransliterationFlags nFlags = GetTransliterationFlags(); if( !pSearchItem->IsUseAsianOptions()) - nFlags &= (TransliterationFlags::IGNORE_CASE | - TransliterationFlags::IGNORE_WIDTH ); + nFlags &= TransliterationFlags::IGNORE_CASE | + TransliterationFlags::IGNORE_WIDTH; if (GetNegatedCheckBoxValue(m_pIncludeDiacritics)) nFlags |= TransliterationFlags::IGNORE_DIACRITICS_CTL; if (GetNegatedCheckBoxValue(m_pIncludeKashida)) diff --git a/svx/source/engine3d/scene3d.cxx b/svx/source/engine3d/scene3d.cxx index 3eeb76cbc679..45c9fbc8a5a1 100644 --- a/svx/source/engine3d/scene3d.cxx +++ b/svx/source/engine3d/scene3d.cxx @@ -574,7 +574,7 @@ void E3dScene::RotateScene (const Point& rRef, double sn, double cs) } Size Differenz; - Point DiffPoint = (NewCenter - Center); + Point DiffPoint = NewCenter - Center; Differenz.setWidth( DiffPoint.X() ); Differenz.setHeight( -DiffPoint.Y() ); // Note that the Y-axis is counted ad positive downward. NbcMove (Differenz); // Actually executes the coordinate transformation. diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx index 9155b04bf8eb..cad58eaea61d 100644 --- a/svx/source/fmcomp/gridctrl.cxx +++ b/svx/source/fmcomp/gridctrl.cxx @@ -1218,12 +1218,12 @@ namespace if ( _bHideScrollbars ) { - _rMode |= ( BrowserMode::NO_HSCROLL | BrowserMode::NO_VSCROLL ); + _rMode |= BrowserMode::NO_HSCROLL | BrowserMode::NO_VSCROLL; _rMode &= ~BrowserMode( BrowserMode::AUTO_HSCROLL | BrowserMode::AUTO_VSCROLL ); } else { - _rMode |= ( BrowserMode::AUTO_HSCROLL | BrowserMode::AUTO_VSCROLL ); + _rMode |= BrowserMode::AUTO_HSCROLL | BrowserMode::AUTO_VSCROLL; _rMode &= ~BrowserMode( BrowserMode::NO_HSCROLL | BrowserMode::NO_VSCROLL ); } diff --git a/svx/source/table/tablelayouter.cxx b/svx/source/table/tablelayouter.cxx index c9a8961eddab..0b24df689188 100644 --- a/svx/source/table/tablelayouter.cxx +++ b/svx/source/table/tablelayouter.cxx @@ -628,7 +628,7 @@ void TableLayouter::LayoutTableWidth( tools::Rectangle& rArea, bool bFit ) auto iter( aOptimalColumns.begin() ); while( iter != aOptimalColumns.end() ) { - sal_Int32 nOptCol = (*iter++); + sal_Int32 nOptCol = *iter++; if( iter == aOptimalColumns.end() ) nDistribute = nLeft; @@ -788,7 +788,7 @@ void TableLayouter::LayoutTableHeight( tools::Rectangle& rArea, bool bFit ) auto iter( aOptimalRows.begin() ); while( iter != aOptimalRows.end() ) { - sal_Int32 nOptRow = (*iter++); + sal_Int32 nOptRow = *iter++; if( iter == aOptimalRows.end() ) nDistribute = nLeft; @@ -1212,7 +1212,7 @@ void TableLayouter::DistributeRows( ::tools::Rectangle& rArea, nAllHeight += maRows[nRow].mnSize; } - const sal_Int32 nRows = (nLastRow-nFirstRow+1); + const sal_Int32 nRows = nLastRow-nFirstRow+1; sal_Int32 nHeight = nAllHeight / nRows; if ( !bMinimize && nHeight < nMaxHeight ) diff --git a/svx/source/table/tablemodel.cxx b/svx/source/table/tablemodel.cxx index 386d00b455b6..866d2cb514a1 100644 --- a/svx/source/table/tablemodel.cxx +++ b/svx/source/table/tablemodel.cxx @@ -124,11 +124,11 @@ TableModel::TableModel( SdrTableObj* pTableObj, const TableModelRef& xSourceTabl sal_Int32 nRows = nRowCount; while( nRows-- ) - (*maRows[nRows]) = (*xSourceTable->maRows[nRows]); + (*maRows[nRows]) = *xSourceTable->maRows[nRows]; sal_Int32 nColumns = nColCount; while( nColumns-- ) - (*maColumns[nColumns]) = (*xSourceTable->maColumns[nColumns]); + (*maColumns[nColumns]) = *xSourceTable->maColumns[nColumns]; // copy cells for( sal_Int32 nCol = 0; nCol < nColCount; ++nCol ) diff --git a/svx/source/tbxctrls/PaletteManager.cxx b/svx/source/tbxctrls/PaletteManager.cxx index 779298d77ac5..bec59c3a6cc0 100644 --- a/svx/source/tbxctrls/PaletteManager.cxx +++ b/svx/source/tbxctrls/PaletteManager.cxx @@ -354,7 +354,7 @@ void PaletteManager::PopupColorPicker(weld::Window* pParent, const OUString& aCo if (aColorDlg.Execute(pParent) == RET_OK) { Color aLastColor = aColorDlg.GetColor(); - OUString sColorName = ("#" + aLastColor.AsRGBHexString().toAsciiUpperCase()); + OUString sColorName = "#" + aLastColor.AsRGBHexString().toAsciiUpperCase(); NamedColor aNamedColor = std::make_pair(aLastColor, sColorName); if (mpBtnUpdater) mpBtnUpdater->Update(aNamedColor); diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index 127e479d6e16..40957f46bb65 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -1857,7 +1857,7 @@ void SvxColorWindow::SelectEntry(const NamedColor& rNamedColor) void SvxColorWindow::SelectEntry(const Color& rColor) { - OUString sColorName = ("#" + rColor.AsRGBHexString().toAsciiUpperCase()); + OUString sColorName = "#" + rColor.AsRGBHexString().toAsciiUpperCase(); SvxColorWindow::SelectEntry(std::make_pair(rColor, sColorName)); } @@ -1898,7 +1898,7 @@ void ColorWindow::SelectEntry(const NamedColor& rNamedColor) void ColorWindow::SelectEntry(const Color& rColor) { - OUString sColorName = ("#" + rColor.AsRGBHexString().toAsciiUpperCase()); + OUString sColorName = "#" + rColor.AsRGBHexString().toAsciiUpperCase(); ColorWindow::SelectEntry(std::make_pair(rColor, sColorName)); } @@ -3183,7 +3183,7 @@ void SvxColorToolBoxControl::execute(sal_Int16 /*nSelectModifier*/) dispatchCommand( aCommand, aArgs ); EnsurePaletteManager(); - OUString sColorName = ("#" + aColor.AsRGBHexString().toAsciiUpperCase()); + OUString sColorName = "#" + aColor.AsRGBHexString().toAsciiUpperCase(); m_xPaletteManager->AddRecentColor(aColor, sColorName); } diff --git a/sw/inc/swcrsr.hxx b/sw/inc/swcrsr.hxx index 5c9214dc2d00..c463fdf37b33 100644 --- a/sw/inc/swcrsr.hxx +++ b/sw/inc/swcrsr.hxx @@ -184,9 +184,9 @@ public: // Is there a selection of content in table? // Return value indicates if cursor remains at its old position. virtual bool IsSelOvr( SwCursorSelOverFlags eFlags = - ( SwCursorSelOverFlags::CheckNodeSection | - SwCursorSelOverFlags::Toggle | - SwCursorSelOverFlags::ChangePos )); + SwCursorSelOverFlags::CheckNodeSection | + SwCursorSelOverFlags::Toggle | + SwCursorSelOverFlags::ChangePos ); bool IsInProtectTable( bool bMove = false, bool bChgCursor = true ); bool IsNoContent() const; diff --git a/sw/inc/unocrsr.hxx b/sw/inc/unocrsr.hxx index 038aff7110c0..bcc0a5f27ae8 100644 --- a/sw/inc/unocrsr.hxx +++ b/sw/inc/unocrsr.hxx @@ -55,9 +55,9 @@ public: // Does a selection of content exist in table? // Return value indicates if the cursor remains at its old position. virtual bool IsSelOvr( SwCursorSelOverFlags eFlags = - ( SwCursorSelOverFlags::CheckNodeSection | - SwCursorSelOverFlags::Toggle | - SwCursorSelOverFlags::ChangePos )) override; + SwCursorSelOverFlags::CheckNodeSection | + SwCursorSelOverFlags::Toggle | + SwCursorSelOverFlags::ChangePos ) override; virtual bool IsReadOnlyAvailable() const override; @@ -91,9 +91,9 @@ public: // Does a selection of content exist in table? // Return value indicates if the cursor remains at its old position. virtual bool IsSelOvr( SwCursorSelOverFlags eFlags = - ( SwCursorSelOverFlags::CheckNodeSection | - SwCursorSelOverFlags::Toggle | - SwCursorSelOverFlags::ChangePos )) override; + SwCursorSelOverFlags::CheckNodeSection | + SwCursorSelOverFlags::Toggle | + SwCursorSelOverFlags::ChangePos ) override; void MakeBoxSels(); diff --git a/sw/source/core/attr/swatrset.cxx b/sw/source/core/attr/swatrset.cxx index 51166259b046..a4e19fe39776 100644 --- a/sw/source/core/attr/swatrset.cxx +++ b/sw/source/core/attr/swatrset.cxx @@ -80,7 +80,7 @@ void SwAttrPool::createAndAddSecondaryPools() // #75371# change DefaultItems for the SdrEdgeObj distance items // to TWIPS. // 1/100th mm in twips - const long nDefEdgeDist = ((500 * 72) / 127); + const long nDefEdgeDist = (500 * 72) / 127; pSdrPool->SetPoolDefaultItem(SdrEdgeNode1HorzDistItem(nDefEdgeDist)); pSdrPool->SetPoolDefaultItem(SdrEdgeNode1VertDistItem(nDefEdgeDist)); diff --git a/sw/source/core/bastyp/breakit.cxx b/sw/source/core/bastyp/breakit.cxx index 3427c483a04b..fe1e9e49ca77 100644 --- a/sw/source/core/bastyp/breakit.cxx +++ b/sw/source/core/bastyp/breakit.cxx @@ -127,9 +127,9 @@ sal_uInt16 SwBreakIt::GetRealScriptOfText( const OUString& rText, sal_Int32 nPos SvtScriptType SwBreakIt::GetAllScriptsOfText( const OUString& rText ) const { - const SvtScriptType coAllScripts = ( SvtScriptType::LATIN | - SvtScriptType::ASIAN | - SvtScriptType::COMPLEX ); + const SvtScriptType coAllScripts = SvtScriptType::LATIN | + SvtScriptType::ASIAN | + SvtScriptType::COMPLEX; SvtScriptType nRet = SvtScriptType::NONE; sal_uInt16 nScript = 0; if (!rText.isEmpty()) diff --git a/sw/source/core/doc/docnew.cxx b/sw/source/core/doc/docnew.cxx index ed0f0529de6f..bc36cbc1a6ad 100644 --- a/sw/source/core/doc/docnew.cxx +++ b/sw/source/core/doc/docnew.cxx @@ -1237,7 +1237,7 @@ else // frames, otherwise the drawing layer gets confused. if ( pTargetShell ) pTargetShell->SttEndDoc( false ); - aDelIdx -= (iDelNodes - 1); + aDelIdx -= iDelNodes - 1; #ifdef DBG_UTIL SAL_INFO( "sw.docappend", "iDelNodes: " << iDelNodes << " Idx: " << aDelIdx.GetNode().GetIndex() diff --git a/sw/source/core/docnode/nodes.cxx b/sw/source/core/docnode/nodes.cxx index 57f44eb15483..40532b94ec51 100644 --- a/sw/source/core/docnode/nodes.cxx +++ b/sw/source/core/docnode/nodes.cxx @@ -1739,8 +1739,8 @@ void SwNodes::CopyNodes( const SwNodeRange& rRange, < aInsPos.GetIndex() ) { const long nDistance = - ( pCurrentNode->EndOfSectionIndex() - - aRg.aStart.GetIndex() ); + pCurrentNode->EndOfSectionIndex() - + aRg.aStart.GetIndex(); if (nDistance < nNodeCnt) nNodeCnt -= nDistance; else @@ -2208,7 +2208,7 @@ void SwNodes::RemoveNode( sal_uLong nDelPos, sal_uLong nSz, bool bDel ) #endif for (sal_uLong nCnt = 0; nCnt < nSz; nCnt++) { - SwNode* pNode = ((*this)[ nDelPos + nCnt ]); + SwNode* pNode = (*this)[ nDelPos + nCnt ]; SwTextNode * pTextNd = pNode->GetTextNode(); if (pTextNd) diff --git a/sw/source/core/docnode/threadmanager.cxx b/sw/source/core/docnode/threadmanager.cxx index 46a75c490fb7..f500f29c5260 100644 --- a/sw/source/core/docnode/threadmanager.cxx +++ b/sw/source/core/docnode/threadmanager.cxx @@ -123,7 +123,7 @@ void ThreadManager::RemoveThread( const oslInterlockedCount nThreadID, if ( aIter != maStartedThreads.end() ) { - tThreadData aTmpThreadData( (*aIter) ); + tThreadData aTmpThreadData( *aIter ); maStartedThreads.erase( aIter ); diff --git a/sw/source/core/layout/anchoredobject.cxx b/sw/source/core/layout/anchoredobject.cxx index dc2cd1326855..cdebc37ee10b 100644 --- a/sw/source/core/layout/anchoredobject.cxx +++ b/sw/source/core/layout/anchoredobject.cxx @@ -858,7 +858,7 @@ Point SwAnchoredObject::GetRelPosToPageFrame( const bool _bFollowTextFlow, } if ( pFrame->IsCellFrame() ) { - aRelPos -= ( pFrame->getFrameArea().Pos() + pFrame->getFramePrintArea().Pos() ); + aRelPos -= pFrame->getFrameArea().Pos() + pFrame->getFramePrintArea().Pos(); _obRelToTableCell = true; } else diff --git a/sw/source/core/layout/pagechg.cxx b/sw/source/core/layout/pagechg.cxx index 6c8df71ff7ad..b9f88938c409 100644 --- a/sw/source/core/layout/pagechg.cxx +++ b/sw/source/core/layout/pagechg.cxx @@ -2000,7 +2000,7 @@ static void lcl_MoveAllLowerObjs( SwFrame* pFrame, const Point& rOffset ) continue; const Point& aCurrAnchorPos = pAnchoredDrawObj->GetDrawObj()->GetAnchorPos(); - const Point aNewAnchorPos( ( aCurrAnchorPos + rOffset ) ); + const Point aNewAnchorPos( aCurrAnchorPos + rOffset ); pAnchoredDrawObj->DrawObj()->SetAnchorPos( aNewAnchorPos ); pAnchoredDrawObj->SetLastObjRect( pAnchoredDrawObj->GetObjRect().SVRect() ); diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx index e920046b1016..57d7d95da130 100644 --- a/sw/source/core/layout/paintfrm.cxx +++ b/sw/source/core/layout/paintfrm.cxx @@ -544,7 +544,7 @@ void SwLineRects::AddLineRect( const SwRect &rRect, const Color *pCol, const Svx for (reverse_iterator it = aLineRects.rbegin(); it != aLineRects.rend(); ++it) { - SwLineRect &rLRect = (*it); + SwLineRect &rLRect = *it; // Test for the orientation, color, table if ( rLRect.GetTab() == pTab && !rLRect.IsPainted() && rLRect.GetSubColor() == nSCol && @@ -596,7 +596,7 @@ void SwLineRects::ConnectEdges( OutputDevice const *pOut, SwPaintProperties cons // Collect all lines to possibly link with i1 for (iterator it2 = aLineRects.begin(); it2 != aLineRects.end(); ++it2) { - SwLineRect &rL2 = (*it2); + SwLineRect &rL2 = *it2; if ( rL2.GetTab() != rL1.GetTab() || rL2.IsPainted() || rL2.IsLocked() || diff --git a/sw/source/core/text/guess.cxx b/sw/source/core/text/guess.cxx index 3d225c139105..e966dfa6a9d7 100644 --- a/sw/source/core/text/guess.cxx +++ b/sw/source/core/text/guess.cxx @@ -93,7 +93,7 @@ bool SwTextGuess::Guess( const SwTextPortion& rPor, SwTextFormatInfo &rInf, if ( rAdjust == SvxAdjust::Right || rAdjust == SvxAdjust::Center ) { TextFrameIndex nSpaceCnt(0); - for (sal_Int32 i = (rInf.GetText().getLength() - 1); + for (sal_Int32 i = rInf.GetText().getLength() - 1; sal_Int32(rInf.GetIdx()) <= i; --i) { sal_Unicode cChar = rInf.GetText()[i]; diff --git a/sw/source/core/text/inftxt.cxx b/sw/source/core/text/inftxt.cxx index 310b9f045595..7f56b1216d6c 100644 --- a/sw/source/core/text/inftxt.cxx +++ b/sw/source/core/text/inftxt.cxx @@ -1215,7 +1215,7 @@ void SwTextPaintInfo::DrawBackBrush( const SwLinePortion &rPor ) const nIdx = GetIdx(); nLen = pPos->GetLen(); - for (TextFrameIndex i = (nIdx + nLen - TextFrameIndex(1)); + for (TextFrameIndex i = nIdx + nLen - TextFrameIndex(1); i >= nIdx; --i) { if (i < TextFrameIndex(GetText().getLength()) diff --git a/sw/source/core/text/txtfly.cxx b/sw/source/core/text/txtfly.cxx index 31f04c376233..ddeaa99b05db 100644 --- a/sw/source/core/text/txtfly.cxx +++ b/sw/source/core/text/txtfly.cxx @@ -286,7 +286,7 @@ const SwRect SwContourCache::ContourRect( const SwFormat* pFormat, size_t nIdx = 0; while( nIdx < nCount && (*pTmp)[ nIdx ] < nXPos ) ++nIdx; - bool bOdd = (nIdx % 2); + bool bOdd = nIdx % 2; bool bSet = true; if( bOdd ) --nIdx; // within interval diff --git a/sw/source/core/text/wrong.cxx b/sw/source/core/text/wrong.cxx index 8e334a232e6c..4bf9aed7c1ad 100644 --- a/sw/source/core/text/wrong.cxx +++ b/sw/source/core/text/wrong.cxx @@ -689,7 +689,7 @@ bool WrongListIterator::Check(TextFrameIndex & rStart, TextFrameIndex & rLen) } else if (rStart < m_CurrentIndex) { - rLen -= (m_CurrentIndex - rStart); + rLen -= m_CurrentIndex - rStart; assert(0 < sal_Int32(rLen)); rStart = m_CurrentIndex; } diff --git a/sw/source/core/unocore/unofield.cxx b/sw/source/core/unocore/unofield.cxx index 34d6d784baa8..a75abdc77046 100644 --- a/sw/source/core/unocore/unofield.cxx +++ b/sw/source/core/unocore/unofield.cxx @@ -2247,7 +2247,7 @@ SwXTextField::setPropertyValue( case FIELD_PROP_DATE_TIME : if (!m_pImpl->m_pProps->pDateTime) m_pImpl->m_pProps->pDateTime.reset( new util::DateTime ); - rValue >>= (*m_pImpl->m_pProps->pDateTime); + rValue >>= *m_pImpl->m_pProps->pDateTime; break; case FIELD_PROP_PROP_SEQ: rValue >>= m_pImpl->m_pProps->aPropSeq; @@ -2433,7 +2433,7 @@ uno::Any SAL_CALL SwXTextField::getPropertyValue(const OUString& rPropertyName) break; case FIELD_PROP_DATE_TIME : if (m_pImpl->m_pProps->pDateTime) - aRet <<= (*m_pImpl->m_pProps->pDateTime); + aRet <<= *m_pImpl->m_pProps->pDateTime; break; case FIELD_PROP_PROP_SEQ: aRet <<= m_pImpl->m_pProps->aPropSeq; diff --git a/sw/source/core/unocore/unoportenum.cxx b/sw/source/core/unocore/unoportenum.cxx index 1ba5b3f760a5..06e4240294cd 100644 --- a/sw/source/core/unocore/unoportenum.cxx +++ b/sw/source/core/unocore/unoportenum.cxx @@ -615,7 +615,7 @@ static void lcl_ExportBookmark( { for ( SwXBookmarkPortion_ImplList::iterator aIter = rBkmArr.begin(), aEnd = rBkmArr.end(); aIter != aEnd; ) { - const SwXBookmarkPortion_ImplSharedPtr& pPtr = (*aIter); + const SwXBookmarkPortion_ImplSharedPtr& pPtr = *aIter; if ( nIndex > pPtr->getIndex() ) { if (bOnlyFrameStarts) @@ -1124,7 +1124,7 @@ static void lcl_ExportRedline( for ( SwXRedlinePortion_ImplList::iterator aIter = rRedlineArr.begin(), aEnd = rRedlineArr.end(); aIter != aEnd; ) { - SwXRedlinePortion_ImplSharedPtr pPtr = (*aIter ); + SwXRedlinePortion_ImplSharedPtr pPtr = *aIter; sal_Int32 nRealIndex = pPtr->getRealIndex(); // If there are elements before nIndex, remove them if ( nIndex > nRealIndex ) @@ -1179,7 +1179,7 @@ static void lcl_ExportAnnotationStarts( for ( SwAnnotationStartPortion_ImplList::iterator aIter = rAnnotationStartArr.begin(), aEnd = rAnnotationStartArr.end(); aIter != aEnd; ) { - SwAnnotationStartPortion_ImplSharedPtr pPtr = (*aIter); + SwAnnotationStartPortion_ImplSharedPtr pPtr = *aIter; if ( nIndex > pPtr->getIndex() ) { aIter = rAnnotationStartArr.erase(aIter); @@ -1269,12 +1269,12 @@ static sal_Int32 lcl_GetNextIndex( sal_Int32 nRet = -1; if(!rBkmArr.empty()) { - SwXBookmarkPortion_ImplSharedPtr pPtr = (*rBkmArr.begin()); + SwXBookmarkPortion_ImplSharedPtr pPtr = *rBkmArr.begin(); nRet = pPtr->getIndex(); } if(!rRedlineArr.empty()) { - SwXRedlinePortion_ImplSharedPtr pPtr = (*rRedlineArr.begin()); + SwXRedlinePortion_ImplSharedPtr pPtr = *rRedlineArr.begin(); sal_Int32 nTmp = pPtr->getRealIndex(); if(nRet < 0 || nTmp < nRet) nRet = nTmp; diff --git a/sw/source/filter/html/css1atr.cxx b/sw/source/filter/html/css1atr.cxx index 09302c33651a..e9c6af23e09a 100644 --- a/sw/source/filter/html/css1atr.cxx +++ b/sw/source/filter/html/css1atr.cxx @@ -2037,7 +2037,7 @@ void SwHTMLWriter::OutCSS1_FrameFormatOptions( const SwFrameFormat& rFrameFormat if( nFrameOpts & HtmlFrmOpts::SWidth ) nMode |= Css1FrameSize::Width; if( nFrameOpts & HtmlFrmOpts::SHeight ) - nMode |= (Css1FrameSize::MinHeight|Css1FrameSize::FixHeight); + nMode |= Css1FrameSize::MinHeight|Css1FrameSize::FixHeight; if( nFrameOpts & HtmlFrmOpts::SPixSize ) nMode |= Css1FrameSize::Pixel; diff --git a/sw/source/filter/html/htmlsect.cxx b/sw/source/filter/html/htmlsect.cxx index 786e637a1b71..f33b7d1bf75c 100644 --- a/sw/source/filter/html/htmlsect.cxx +++ b/sw/source/filter/html/htmlsect.cxx @@ -783,7 +783,7 @@ void SwHTMLParser::InsertFlyFrame( const SfxItemSet& rItemSet, ->GetContentNode(); SwPosition aNewPos( SwNodeIndex( rFlyCntIdx, 1 ), SwIndex( pCNd, 0 ) ); - const HtmlContextFlags nFlags = (HtmlContextFlags::ProtectStack|HtmlContextFlags::StripPara); + const HtmlContextFlags nFlags = HtmlContextFlags::ProtectStack|HtmlContextFlags::StripPara; SaveDocContext( pCntxt, nFlags, &aNewPos ); } diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index 072c42c9478f..a15842e28ddc 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -8289,7 +8289,7 @@ static boost::optional<sal_Int32> lcl_getDmlAlpha(const SvxBrushItem& rBrush) // Calculate alpha value // Consider oox/source/drawingml/color.cxx : getTransparency() function. - sal_Int32 nAlpha = (::oox::drawingml::MAX_PERCENT - ( ::oox::drawingml::PER_PERCENT * nTransparencyPercent ) ); + sal_Int32 nAlpha = ::oox::drawingml::MAX_PERCENT - ( ::oox::drawingml::PER_PERCENT * nTransparencyPercent ); oRet = nAlpha; } return oRet; diff --git a/sw/source/ui/config/optcomp.cxx b/sw/source/ui/config/optcomp.cxx index 07e9aa06022c..1204eacc6314 100644 --- a/sw/source/ui/config/optcomp.cxx +++ b/sw/source/ui/config/optcomp.cxx @@ -57,7 +57,7 @@ SwCompatibilityOptPage::SwCompatibilityOptPage(vcl::Window* pParent, const SfxIt get(m_pOptionsLB, "options"); get(m_pDefaultPB, "default"); - for ( int i = (static_cast<int>(SvtCompatibilityEntry::Index::Module) + 1); i < static_cast<int>(SvtCompatibilityEntry::Index::INVALID); ++i ) + for ( int i = static_cast<int>(SvtCompatibilityEntry::Index::Module) + 1; i < static_cast<int>(SvtCompatibilityEntry::Index::INVALID); ++i ) { int nCoptIdx = i - 2; /* Do not consider "Name" & "Module" indexes */ diff --git a/sw/source/ui/vba/vbadocumentproperties.cxx b/sw/source/ui/vba/vbadocumentproperties.cxx index f9997f9f9a9c..c83c469734cb 100644 --- a/sw/source/ui/vba/vbadocumentproperties.cxx +++ b/sw/source/ui/vba/vbadocumentproperties.cxx @@ -827,7 +827,7 @@ public: uno::Sequence< beans::Property > aProps = mxUserDefinedProp->getPropertySetInfo()->getProperties(); uno::Sequence< OUString > aNames( aProps.getLength() ); OUString* pString = aNames.getArray(); - OUString* pEnd = ( pString + aNames.getLength() ); + OUString* pEnd = pString + aNames.getLength(); beans::Property* pProp = aProps.getArray(); for ( ; pString != pEnd; ++pString, ++pProp ) *pString = pProp->Name; diff --git a/sw/source/uibase/docvw/PostItMgr.cxx b/sw/source/uibase/docvw/PostItMgr.cxx index 2355151e851c..7c25ed315d81 100644 --- a/sw/source/uibase/docvw/PostItMgr.cxx +++ b/sw/source/uibase/docvw/PostItMgr.cxx @@ -247,7 +247,7 @@ void SwPostItMgr::CheckForRemovedPostIts() auto it = currentIt++; if ( !(*it)->UseElement() ) { - SwSidebarItem* p = (*it); + SwSidebarItem* p = *it; currentIt = mvPostItFields.erase(std::remove(mvPostItFields.begin(), mvPostItFields.end(), *it), mvPostItFields.end()); if (GetActiveSidebarWin() == p->pPostIt) SetActiveSidebarWin(nullptr); @@ -303,7 +303,7 @@ void SwPostItMgr::RemoveItem( SfxBroadcaster* pBroadcast ) [&pBroadcast](const SwSidebarItem* pField) { return pField->GetBroadCaster() == pBroadcast; }); if (i != mvPostItFields.end()) { - SwSidebarItem* p = (*i); + SwSidebarItem* p = *i; if (GetActiveSidebarWin() == p->pPostIt) SetActiveSidebarWin(nullptr); // tdf#120487 remove from list before dispose, so comment window diff --git a/sw/source/uibase/uiview/view.cxx b/sw/source/uibase/uiview/view.cxx index 2e048d72e617..153e33f6bad6 100644 --- a/sw/source/uibase/uiview/view.cxx +++ b/sw/source/uibase/uiview/view.cxx @@ -271,8 +271,8 @@ void SwView::SelectShell() m_pLastTableFormat = pCurTableFormat; //SEL_TBL and SEL_TBL_CELLS can be ORed! - SelectionType nNewSelectionType = (m_pWrtShell->GetSelectionType() - & ~SelectionType::TableCell); + SelectionType nNewSelectionType = m_pWrtShell->GetSelectionType() + & ~SelectionType::TableCell; if ( m_pFormShell && m_pFormShell->IsActiveControl() ) nNewSelectionType |= SelectionType::FormControl; diff --git a/sw/source/uibase/utlui/shdwcrsr.cxx b/sw/source/uibase/utlui/shdwcrsr.cxx index a9238f3040b9..dcc2bbac6eee 100644 --- a/sw/source/uibase/utlui/shdwcrsr.cxx +++ b/sw/source/uibase/utlui/shdwcrsr.cxx @@ -48,7 +48,7 @@ void SwShadowCursor::SetPos( const Point& rPt, long nHeight, sal_uInt16 nMode ) void SwShadowCursor::DrawTri( const Point& rPt, long nHeight, bool bLeft ) { - long nLineDiff = ( nHeight / 2 ); + long nLineDiff = nHeight / 2; long nLineDiffHalf = nLineDiff / 2; // Dot above diff --git a/sw/source/uibase/web/wview.cxx b/sw/source/uibase/web/wview.cxx index 7d8f7cd0eed2..c3f0c0f27ca7 100644 --- a/sw/source/uibase/web/wview.cxx +++ b/sw/source/uibase/web/wview.cxx @@ -104,8 +104,8 @@ void SwWebView::SelectShell() } SetLastTableFrameFormat(pCurTableFormat); //SEL_TBL and SEL_TBL_CELLS can be ored! - SelectionType nNewSelectionType = (GetWrtShell().GetSelectionType() - & ~SelectionType::TableCell); + SelectionType nNewSelectionType = GetWrtShell().GetSelectionType() + & ~SelectionType::TableCell; SelectionType _nSelectionType = GetSelectionType(); if ( nNewSelectionType == _nSelectionType ) diff --git a/sw/source/uibase/wrtsh/wrtsh1.cxx b/sw/source/uibase/wrtsh/wrtsh1.cxx index 233947209bbe..2d7685cfd3ae 100644 --- a/sw/source/uibase/wrtsh/wrtsh1.cxx +++ b/sw/source/uibase/wrtsh/wrtsh1.cxx @@ -1409,7 +1409,7 @@ SelectionType SwWrtShell::GetSelectionType() const nCnt |= SelectionType::Table; if ( IsTableMode() ) - nCnt |= (SelectionType::Table | SelectionType::TableCell); + nCnt |= SelectionType::Table | SelectionType::TableCell; // Do not pop up numbering toolbar, if the text node has a numbering of type SVX_NUM_NUMBER_NONE. const SwNumRule* pNumRule = GetNumRuleAtCurrCursorPos(); diff --git a/toolkit/source/controls/tree/treedatamodel.cxx b/toolkit/source/controls/tree/treedatamodel.cxx index 84838061cbdd..8878ef23b413 100644 --- a/toolkit/source/controls/tree/treedatamodel.cxx +++ b/toolkit/source/controls/tree/treedatamodel.cxx @@ -355,7 +355,7 @@ void SAL_CALL MutableTreeNode::removeChildByIndex( sal_Int32 nChildIndex ) TreeNodeVector::iterator aIter( maChildren.begin() ); std::advance(aIter, nChildIndex); - xImpl = (*aIter); + xImpl = *aIter; maChildren.erase( aIter ); if( !xImpl.is() ) diff --git a/ucb/source/ucp/file/filglob.cxx b/ucb/source/ucp/file/filglob.cxx index 56b581e5477f..98e557a228ee 100644 --- a/ucb/source/ucp/file/filglob.cxx +++ b/ucb/source/ucp/file/filglob.cxx @@ -178,9 +178,7 @@ namespace fileaccess { { sal_Int32 srcL = aOldPrefix.getLength(); - OUString new_Name = old_Name.copy( srcL ); - new_Name = ( aNewPrefix + new_Name ); - return new_Name; + return aNewPrefix + old_Name.copy( srcL ); } diff --git a/ucb/source/ucp/webdav-neon/DAVResourceAccess.cxx b/ucb/source/ucp/webdav-neon/DAVResourceAccess.cxx index dcff8c710e77..bf1004a9e411 100644 --- a/ucb/source/ucp/webdav-neon/DAVResourceAccess.cxx +++ b/ucb/source/ucp/webdav-neon/DAVResourceAccess.cxx @@ -1136,7 +1136,7 @@ void DAVResourceAccess::resetUri() { std::vector< NeonUri >::const_iterator it = m_aRedirectURIs.begin(); - NeonUri aUri( (*it) ); + NeonUri aUri( *it ); m_aRedirectURIs.clear(); setURL ( aUri.GetURI() ); initialize(); diff --git a/ucb/source/ucp/webdav-neon/NeonHeadRequest.cxx b/ucb/source/ucp/webdav-neon/NeonHeadRequest.cxx index 9f112fed099e..b830fb7926b7 100644 --- a/ucb/source/ucp/webdav-neon/NeonHeadRequest.cxx +++ b/ucb/source/ucp/webdav-neon/NeonHeadRequest.cxx @@ -74,7 +74,7 @@ void process_headers( ne_request * req, if ( it != rHeaderNames.end() ) { - aHeaderName = (*it); + aHeaderName = *it; bIncludeIt = true; } } diff --git a/ucb/source/ucp/webdav-neon/NeonSession.cxx b/ucb/source/ucp/webdav-neon/NeonSession.cxx index c10796a48e79..05260df637b3 100644 --- a/ucb/source/ucp/webdav-neon/NeonSession.cxx +++ b/ucb/source/ucp/webdav-neon/NeonSession.cxx @@ -2044,7 +2044,7 @@ void runResponseHeaderHandler( void * userdata, if ( it != pCtx->pHeaderNames->end() ) { - aHeaderName = (*it); + aHeaderName = *it; bIncludeIt = true; } } diff --git a/ucb/source/ucp/webdav-neon/webdavcontentcaps.cxx b/ucb/source/ucp/webdav-neon/webdavcontentcaps.cxx index d86371d17bc8..e650085d6229 100644 --- a/ucb/source/ucp/webdav-neon/webdavcontentcaps.cxx +++ b/ucb/source/ucp/webdav-neon/webdavcontentcaps.cxx @@ -266,7 +266,7 @@ void ContentProvider::getProperty( const PropertyMap::const_iterator it = m_pProps->find( aProp ); if ( it != m_pProps->end() ) { - rProp = (*it); + rProp = *it; } else { diff --git a/vbahelper/source/vbahelper/vbaapplicationbase.cxx b/vbahelper/source/vbahelper/vbaapplicationbase.cxx index fc3a05ebd57a..f65d2bfc6e35 100644 --- a/vbahelper/source/vbahelper/vbaapplicationbase.cxx +++ b/vbahelper/source/vbahelper/vbaapplicationbase.cxx @@ -347,7 +347,7 @@ uno::Any SAL_CALL VbaApplicationBase::Run( const OUString& MacroName, const uno: uno::Sequence< uno::Any > aArgs( nArg ); const uno::Any** pArg = aArgsPtrArray; - const uno::Any** pArgEnd = ( aArgsPtrArray + nArg ); + const uno::Any** pArgEnd = aArgsPtrArray + nArg; sal_Int32 nArgProcessed = 0; diff --git a/vbahelper/source/vbahelper/vbahelper.cxx b/vbahelper/source/vbahelper/vbahelper.cxx index 6a0a1c755010..62a51ec35f07 100644 --- a/vbahelper/source/vbahelper/vbahelper.cxx +++ b/vbahelper/source/vbahelper/vbahelper.cxx @@ -363,7 +363,7 @@ void PrintOutHelper( SfxViewShell const * pViewShell, const uno::Any& From, cons if ( nFrom || nTo ) { if ( nFrom ) - sRange = ( OUString::number( nFrom ) + sRange ); + sRange = OUString::number( nFrom ) + sRange; if ( nTo ) sRange += OUString::number( nTo ); } diff --git a/vcl/source/bitmap/BitmapScaleSuperFilter.cxx b/vcl/source/bitmap/BitmapScaleSuperFilter.cxx index ba6be51513b0..27baa334b839 100644 --- a/vcl/source/bitmap/BitmapScaleSuperFilter.cxx +++ b/vcl/source/bitmap/BitmapScaleSuperFilter.cxx @@ -358,7 +358,7 @@ void scalePallete8bit2(ScaleContext &rCtx, long nStartY, long nEndY) } else if( j == 0 ) { - long nWeightX = (nMax- rCtx.mpMapFX[ nLeft ]) ; + long nWeightX = nMax- rCtx.mpMapFX[ nLeft ]; nSumRowB += ( nWeightX *rCol.GetBlue()) ; nSumRowG += ( nWeightX *rCol.GetGreen()) ; nSumRowR += ( nWeightX *rCol.GetRed()) ; @@ -485,7 +485,7 @@ void scalePalleteGeneral2(ScaleContext &rCtx, long nStartY, long nEndY) else if( j == 0 ) { - long nWeightX = (nMax- rCtx.mpMapFX[ nLeft ]) ; + long nWeightX = nMax- rCtx.mpMapFX[ nLeft ]; nSumRowB += ( nWeightX *aCol0.GetBlue()) ; nSumRowG += ( nWeightX *aCol0.GetGreen()) ; nSumRowR += ( nWeightX *aCol0.GetRed()) ; @@ -613,7 +613,7 @@ void scale24bitBGR2(ScaleContext &rCtx, long nStartY, long nEndY) } else if( j == 0 ) { - long nWeightX = (nMax- rCtx.mpMapFX[ nLeft ]) ; + long nWeightX = nMax- rCtx.mpMapFX[ nLeft ]; nSumRowB += ( nWeightX *( *pTmpX )) ;pTmpX++; nSumRowG += ( nWeightX *( *pTmpX )) ;pTmpX++; nSumRowR += ( nWeightX *( *pTmpX )) ;pTmpX++; @@ -735,7 +735,7 @@ void scale24bitRGB2(ScaleContext &rCtx, long nStartY, long nEndY) } else if( j == 0 ) { - long nWeightX = (nMax- rCtx.mpMapFX[ nLeft ]) ; + long nWeightX = nMax- rCtx.mpMapFX[ nLeft ]; nSumRowR += ( nWeightX *( *pTmpX )) ;pTmpX++; nSumRowG += ( nWeightX *( *pTmpX )) ;pTmpX++; nSumRowB += ( nWeightX *( *pTmpX )) ;pTmpX++; @@ -860,7 +860,7 @@ void scaleNonPalleteGeneral2(ScaleContext &rCtx, long nStartY, long nEndY) else if( j == 0 ) { - long nWeightX = (nMax- rCtx.mpMapFX[ nLeft ]) ; + long nWeightX = nMax- rCtx.mpMapFX[ nLeft ]; nSumRowB += ( nWeightX *aCol0.GetBlue()) ; nSumRowG += ( nWeightX *aCol0.GetGreen()) ; nSumRowR += ( nWeightX *aCol0.GetRed()) ; diff --git a/vcl/source/control/prgsbar.cxx b/vcl/source/control/prgsbar.cxx index 20525ca63efc..569814ddb263 100644 --- a/vcl/source/control/prgsbar.cxx +++ b/vcl/source/control/prgsbar.cxx @@ -127,7 +127,7 @@ void ProgressBar::ImplDrawProgress(vcl::RenderContext& rRenderContext, sal_uInt1 mnPrgsHeight = aSize.Height() - (PROGRESSBAR_WIN_OFFSET * 2); mnPrgsWidth = (mnPrgsHeight * 2) / 3; maPos.setY( PROGRESSBAR_WIN_OFFSET ); - long nMaxWidth = (aSize.Width() - (PROGRESSBAR_WIN_OFFSET * 2) + PROGRESSBAR_OFFSET); + long nMaxWidth = aSize.Width() - (PROGRESSBAR_WIN_OFFSET * 2) + PROGRESSBAR_OFFSET; sal_uInt16 nMaxCount = static_cast<sal_uInt16>(nMaxWidth / (mnPrgsWidth+PROGRESSBAR_OFFSET)); if (nMaxCount <= 1) { diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx index 5a7bc38b643a..0a1c2c6998af 100644 --- a/vcl/source/gdi/pdfwriter_impl.cxx +++ b/vcl/source/gdi/pdfwriter_impl.cxx @@ -2939,7 +2939,7 @@ static void appendSubsetName( int nSubsetID, const OUString& rPSName, OStringBuf { for( int i = 0; i < 6; i++ ) { - int nOffset = (nSubsetID % 26); + int nOffset = nSubsetID % 26; nSubsetID /= 26; rBuffer.append( static_cast<sal_Char>('A'+nOffset) ); } @@ -6328,7 +6328,7 @@ void PDFWriterImpl::drawVerticalGlyphs( fSkewA = -fSkewB; fSkewB = 0.0; } - aDeltaPos += (PixelToLogic( Point( static_cast<int>(static_cast<double>(nXOffset)/fXScale), 0 ) ) - PixelToLogic( Point() ) ); + aDeltaPos += PixelToLogic( Point( static_cast<int>(static_cast<double>(nXOffset)/fXScale), 0 ) ) - PixelToLogic( Point() ); if( i < rGlyphs.size()-1 ) // #i120627# the text on the Y axis is reversed when export ppt file to PDF format { diff --git a/vcl/source/gdi/pngread.cxx b/vcl/source/gdi/pngread.cxx index 753c85f9ae6d..cfd9391f69b5 100644 --- a/vcl/source/gdi/pngread.cxx +++ b/vcl/source/gdi/pngread.cxx @@ -814,7 +814,7 @@ void PNGReaderImpl::ImplGetGamma() return; sal_uInt32 nGammaValue = ImplReadsal_uInt32(); - double fGamma = ( ( VIEWING_GAMMA / DISPLAY_GAMMA ) * ( static_cast<double>(nGammaValue) / 100000 ) ); + double fGamma = ( VIEWING_GAMMA / DISPLAY_GAMMA ) * ( static_cast<double>(nGammaValue) / 100000 ); double fInvGamma = ( fGamma <= 0.0 || fGamma > 10.0 ) ? 1.0 : ( 1.0 / fGamma ); if ( fInvGamma != 1.0 ) @@ -883,7 +883,7 @@ void PNGReaderImpl::ImplGetBackground() // 2 and 6 (RGB) the return value is always the 8 bit color component sal_uInt8 PNGReaderImpl::ImplScaleColor() { - sal_uInt32 nMask = ( ( 1 << mnPngDepth ) - 1 ); + sal_uInt32 nMask = ( 1 << mnPngDepth ) - 1; sal_uInt16 nCol = ( *maDataIter++ << 8 ); nCol += *maDataIter++ & static_cast<sal_uInt16>(nMask); diff --git a/vcl/source/outdev/textline.cxx b/vcl/source/outdev/textline.cxx index ba467962a080..2c88586618bf 100644 --- a/vcl/source/outdev/textline.cxx +++ b/vcl/source/outdev/textline.cxx @@ -215,7 +215,7 @@ void OutputDevice::ImplDrawWaveTextLine( long nBaseX, long nBaseY, if ( (eTextLine == LINESTYLE_SMALLWAVE) && (nLineHeight > 3) ) nLineHeight = 3; - long nLineWidth = (mnDPIX / 300); + long nLineWidth = mnDPIX / 300; if ( !nLineWidth ) nLineWidth = 1; diff --git a/vcl/source/treelist/svimpbox.cxx b/vcl/source/treelist/svimpbox.cxx index a39b18744878..1c6a222a2b3f 100644 --- a/vcl/source/treelist/svimpbox.cxx +++ b/vcl/source/treelist/svimpbox.cxx @@ -311,7 +311,7 @@ IMPL_LINK( SvImpLBox, ScrollUpDownHdl, ScrollBar *, pScrollBar, void ) if( !nDelta ) return; - nFlags &= (~LBoxFlags::Filling); + nFlags &= ~LBoxFlags::Filling; bInVScrollHdl = true; @@ -349,7 +349,7 @@ void SvImpLBox::CursorDown() SvTreeListEntry* pNextFirstToDraw = pView->NextVisible(pStartEntry); if( pNextFirstToDraw ) { - nFlags &= (~LBoxFlags::Filling); + nFlags &= ~LBoxFlags::Filling; ShowCursor( false ); pView->Update(); pStartEntry = pNextFirstToDraw; @@ -370,7 +370,7 @@ void SvImpLBox::CursorUp() if( !pPrevFirstToDraw ) return; - nFlags &= (~LBoxFlags::Filling); + nFlags &= ~LBoxFlags::Filling; long nEntryHeight = pView->GetEntryHeight(); ShowCursor( false ); pView->Update(); @@ -399,7 +399,7 @@ void SvImpLBox::PageDown( sal_uInt16 nDelta ) ShowCursor( false ); - nFlags &= (~LBoxFlags::Filling); + nFlags &= ~LBoxFlags::Filling; pView->Update(); pStartEntry = pNext; @@ -435,7 +435,7 @@ void SvImpLBox::PageUp( sal_uInt16 nDelta ) if( pPrev == pStartEntry ) return; - nFlags &= (~LBoxFlags::Filling); + nFlags &= ~LBoxFlags::Filling; ShowCursor( false ); pView->Update(); @@ -477,7 +477,7 @@ void SvImpLBox::KeyUp( bool bPageUp ) if( nDelta <= 0 ) return; - nFlags &= (~LBoxFlags::Filling); + nFlags &= ~LBoxFlags::Filling; BeginScroll(); aVerSBar->SetThumbPos( nThumbPos - nDelta ); @@ -512,7 +512,7 @@ void SvImpLBox::KeyDown( bool bPageDown ) if( nDelta <= 0 ) return; - nFlags &= (~LBoxFlags::Filling); + nFlags &= ~LBoxFlags::Filling; BeginScroll(); aVerSBar->SetThumbPos( nThumbPos+nDelta ); @@ -659,7 +659,7 @@ void SvImpLBox::SetCursor( SvTreeListEntry* pEntry, bool bForceNoSelect ) SetAnchorSelection( pOldCursor, pCursor ); } } - nFlags &= (~LBoxFlags::DeselectAll); + nFlags &= ~LBoxFlags::DeselectAll; pView->OnCurrentEntryChanged(); } @@ -724,7 +724,7 @@ void SvImpLBox::KeyLeftRight( long nDelta ) if( !(nFlags & LBoxFlags::InResize) ) pView->Update(); BeginScroll(); - nFlags &= (~LBoxFlags::Filling); + nFlags &= ~LBoxFlags::Filling; ShowCursor( false ); // calculate new origin @@ -933,9 +933,9 @@ void SvImpLBox::Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle pEntry = pView->NextVisible(pEntry); } - nFlags &= (~LBoxFlags::DeselectAll); + nFlags &= ~LBoxFlags::DeselectAll; rRenderContext.SetClipRegion(); - nFlags &= (~LBoxFlags::InPaint); + nFlags &= ~LBoxFlags::InPaint; } void SvImpLBox::MakeVisible( SvTreeListEntry* pEntry, bool bMoveToTop ) @@ -949,7 +949,7 @@ void SvImpLBox::MakeVisible( SvTreeListEntry* pEntry, bool bMoveToTop ) return; // is already visible if( pStartEntry || mbForceMakeVisible ) - nFlags &= (~LBoxFlags::Filling); + nFlags &= ~LBoxFlags::Filling; if( !bInView ) { if( !pView->IsEntryVisible(pEntry) ) // Parent(s) collapsed? @@ -994,7 +994,7 @@ void SvImpLBox::ScrollToAbsPos( long nPos ) return; if( pStartEntry || mbForceMakeVisible ) - nFlags &= (~LBoxFlags::Filling); + nFlags &= ~LBoxFlags::Filling; if( pView->IsEntryVisible(pEntry) ) { @@ -1586,7 +1586,7 @@ void SvImpLBox::EntrySelected( SvTreeListEntry* pEntry, bool bSelect ) if( nFlags & LBoxFlags::IgnoreSelect ) return; - nFlags &= (~LBoxFlags::DeselectAll); + nFlags &= ~LBoxFlags::DeselectAll; if( bSelect && aSelEng.GetSelectionMode() == SelectionMode::Single && pEntry != pCursor ) @@ -1682,7 +1682,7 @@ void SvImpLBox::EntryRemoved() { if( nFlags & LBoxFlags::RemovedEntryInvisible ) { - nFlags &= (~LBoxFlags::RemovedEntryInvisible); + nFlags &= ~LBoxFlags::RemovedEntryInvisible; return; } if( !pStartEntry ) @@ -1723,7 +1723,7 @@ void SvImpLBox::EntryRemoved() } ShowCursor( true ); } - nFlags &= (~LBoxFlags::RemovedRecalcMostRight); + nFlags &= ~LBoxFlags::RemovedRecalcMostRight; } @@ -1732,7 +1732,7 @@ void SvImpLBox::MovingEntry( SvTreeListEntry* pEntry ) bool bDeselAll(nFlags & LBoxFlags::DeselectAll); SelAllDestrAnch( false ); // DeselectAll(); if( !bDeselAll ) - nFlags &= (~LBoxFlags::DeselectAll); + nFlags &= ~LBoxFlags::DeselectAll; if( pEntry == pCursor ) ShowCursor( false ); @@ -1989,7 +1989,7 @@ void SvImpLBox::MouseButtonDown( const MouseEvent& rMEvt ) if ( pEntry != pCursor ) // new entry selected -> reset current tab position to first tab nCurTabPos = FIRST_ENTRY_TAB; - nFlags &= (~LBoxFlags::Filling); + nFlags &= ~LBoxFlags::Filling; pView->GrabFocus(); //fdo#82270 Grabbing focus can invalidate the entries, re-fetch pEntry = GetEntry(aPos); @@ -2020,7 +2020,7 @@ void SvImpLBox::MouseButtonDown( const MouseEvent& rMEvt ) if( (rMEvt.GetClicks() % 2) == 0 ) { - nFlags &= (~LBoxFlags::StartEditTimer); + nFlags &= ~LBoxFlags::StartEditTimer; pView->pHdlEntry = pEntry; if( !pView->DoubleClickHdl() ) { @@ -2077,7 +2077,7 @@ void SvImpLBox::MouseButtonUp( const MouseEvent& rMEvt) EndScroll(); if( nFlags & LBoxFlags::StartEditTimer ) { - nFlags &= (~LBoxFlags::StartEditTimer); + nFlags &= ~LBoxFlags::StartEditTimer; aEditClickPos = rMEvt.GetPosPixel(); aEditIdle.Start(); } @@ -2098,7 +2098,7 @@ bool SvImpLBox::KeyInput( const KeyEvent& rKEvt) if( rKeyCode.IsMod2() ) return false; // don't evaluate Alt key - nFlags &= (~LBoxFlags::Filling); + nFlags &= ~LBoxFlags::Filling; if( !pCursor ) pCursor = pStartEntry; @@ -2642,7 +2642,7 @@ void ImpLBSelEng::DeselectAtPoint( const Point& rPoint ) void ImpLBSelEng::DeselectAll() { pImp->SelAllDestrAnch( false, false ); // don't reset SelectionEngine! - pImp->nFlags &= (~LBoxFlags::DeselectAll); + pImp->nFlags &= ~LBoxFlags::DeselectAll; } // *********************************************************************** @@ -2761,7 +2761,7 @@ void SvImpLBox::SelAllDestrAnch( bool bSelect, bool bDestroyAnchor, bool bSingleSelToo ) { SvTreeListEntry* pEntry; - nFlags &= (~LBoxFlags::DeselectAll); + nFlags &= ~LBoxFlags::DeselectAll; if( bSelect && bSimpleTravel ) { if( pCursor && !pView->IsSelected( pCursor )) @@ -2853,7 +2853,7 @@ void SvImpLBox::SetDragDropMode( DragDropMode eDDMode ) void SvImpLBox::BeginDrag() { - nFlags &= (~LBoxFlags::Filling); + nFlags &= ~LBoxFlags::Filling; if( !bAsyncBeginDrag ) { BeginScroll(); @@ -3033,7 +3033,7 @@ void SvImpLBox::EndScroll() if( nFlags & LBoxFlags::InScrolling) { pView->NotifyEndScroll(); - nFlags &= (~LBoxFlags::InScrolling); + nFlags &= ~LBoxFlags::InScrolling; } } diff --git a/vcl/source/treelist/svlbitm.cxx b/vcl/source/treelist/svlbitm.cxx index 734c5a43a976..530113c18177 100644 --- a/vcl/source/treelist/svlbitm.cxx +++ b/vcl/source/treelist/svlbitm.cxx @@ -105,9 +105,9 @@ void SvLBoxButtonData::StoreButtonState( SvTreeListEntry* pActEntry ) SvButtonState SvLBoxButtonData::ConvertToButtonState( SvItemStateFlags nItemFlags ) { - nItemFlags &= (SvItemStateFlags::UNCHECKED | - SvItemStateFlags::CHECKED | - SvItemStateFlags::TRISTATE); + nItemFlags &= SvItemStateFlags::UNCHECKED | + SvItemStateFlags::CHECKED | + SvItemStateFlags::TRISTATE; switch( nItemFlags ) { case SvItemStateFlags::UNCHECKED: diff --git a/vcl/source/treelist/svtabbx.cxx b/vcl/source/treelist/svtabbx.cxx index 44164bceca97..c797911edfa6 100644 --- a/vcl/source/treelist/svtabbx.cxx +++ b/vcl/source/treelist/svtabbx.cxx @@ -452,7 +452,7 @@ void SvTabListBox::SetTabJustify( sal_uInt16 nTab, SvTabJustify eJustify) return; SvLBoxTab& rTab = mvTabList[ nTab ]; SvLBoxTabFlags nFlags = rTab.nFlags; - nFlags &= (~MYTABMASK); + nFlags &= ~MYTABMASK; nFlags |= static_cast<SvLBoxTabFlags>(eJustify); rTab.nFlags = nFlags; SvTreeListBox::nTreeFlags |= SvTreeFlags::RECALCTABS; diff --git a/vcl/source/treelist/treelistbox.cxx b/vcl/source/treelist/treelistbox.cxx index 00fdbb39fc9e..e4f41a51957a 100644 --- a/vcl/source/treelist/treelistbox.cxx +++ b/vcl/source/treelist/treelistbox.cxx @@ -853,12 +853,12 @@ void SvTreeListBox::EnableSelectionAsDropTarget( bool bEnable ) } else { - pSelEntry->nEntryFlags &= (~SvTLEntryFlags::DISABLE_DROP); + pSelEntry->nEntryFlags &= ~SvTLEntryFlags::DISABLE_DROP; nRefDepth = pModel->GetDepth( pSelEntry ); pTemp = Next( pSelEntry ); while( pTemp && pModel->GetDepth( pTemp ) > nRefDepth ) { - pTemp->nEntryFlags &= (~SvTLEntryFlags::DISABLE_DROP); + pTemp->nEntryFlags &= ~SvTLEntryFlags::DISABLE_DROP; pTemp = Next( pTemp ); } } @@ -899,7 +899,7 @@ IMPL_LINK_NOARG(SvTreeListBox, TextEditEndedHdl_Impl, SvInplaceEdit2&, void) // that we don't call the selection handler in the GetFocus of the listbox // with the old entry text. pEdCtrl->Hide(); - nImpFlags &= (~SvTreeListBoxFlags::IN_EDT); + nImpFlags &= ~SvTreeListBoxFlags::IN_EDT; GrabFocus(); } @@ -907,14 +907,14 @@ void SvTreeListBox::CancelTextEditing() { if ( pEdCtrl ) pEdCtrl->StopEditing( true ); - nImpFlags &= (~SvTreeListBoxFlags::IN_EDT); + nImpFlags &= ~SvTreeListBoxFlags::IN_EDT; } void SvTreeListBox::EndEditing( bool bCancel ) { if( pEdCtrl ) pEdCtrl->StopEditing( bCancel ); - nImpFlags &= (~SvTreeListBoxFlags::IN_EDT); + nImpFlags &= ~SvTreeListBoxFlags::IN_EDT; } @@ -1466,7 +1466,7 @@ void SvTreeListBox::SetTabs() { if( IsEditingActive() ) EndEditing( true ); - nTreeFlags &= (~SvTreeFlags::RECALCTABS); + nTreeFlags &= ~SvTreeFlags::RECALCTABS; nFocusWidth = -1; const WinBits nStyle( GetStyle() ); bool bHasButtons = (nStyle & WB_HASBUTTONS)!=0; @@ -1633,7 +1633,7 @@ SvTreeListEntry* SvTreeListBox::InsertEntry( aPrevInsertedExpBmp = rDefExpBmp; aPrevInsertedColBmp = rDefColBmp; - nTreeFlags &= (~SvTreeFlags::MANINS); + nTreeFlags &= ~SvTreeFlags::MANINS; return pEntry; } @@ -1662,7 +1662,7 @@ SvTreeListEntry* SvTreeListBox::InsertEntry( const OUString& rText, aPrevInsertedExpBmp = aExpEntryBmp; aPrevInsertedColBmp = aCollEntryBmp; - nTreeFlags &= (~SvTreeFlags::MANINS); + nTreeFlags &= ~SvTreeFlags::MANINS; return pEntry; } @@ -1894,7 +1894,7 @@ void SvTreeListBox::EnableCheckButton( SvLBoxButtonData* pData ) { DBG_ASSERT(!GetEntryCount(),"EnableCheckButton: Entry count != 0"); if( !pData ) - nTreeFlags &= (~SvTreeFlags::CHKBTN); + nTreeFlags &= ~SvTreeFlags::CHKBTN; else { SetCheckButtonData( pData ); diff --git a/vcl/source/treelist/treelistentry.cxx b/vcl/source/treelist/treelistentry.cxx index 35e0d80b6946..05729f2399e7 100644 --- a/vcl/source/treelist/treelistentry.cxx +++ b/vcl/source/treelist/treelistentry.cxx @@ -120,7 +120,7 @@ void SvTreeListEntry::EnableChildrenOnDemand( bool bEnable ) if ( bEnable ) nEntryFlags |= SvTLEntryFlags::CHILDREN_ON_DEMAND; else - nEntryFlags &= (~SvTLEntryFlags::CHILDREN_ON_DEMAND); + nEntryFlags &= ~SvTLEntryFlags::CHILDREN_ON_DEMAND; } void SvTreeListEntry::ReplaceItem(std::unique_ptr<SvLBoxItem> pNewItem, size_t const nPos) diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx index 1799efe80997..210c867c8e38 100644 --- a/vcl/source/window/builder.cxx +++ b/vcl/source/window/builder.cxx @@ -1978,7 +1978,7 @@ VclPtr<vcl::Window> VclBuilder::makeObject(vcl::Window *pParent, const OString & if (HeaderBar* pHeaderBar = pTreeView ? pTreeView->GetHeaderBar() : nullptr) { OUString sTitle(extractTitle(rMap)); - HeaderBarItemBits nBits = (HeaderBarItemBits::LEFTIMAGE | HeaderBarItemBits::CLICKABLE); + HeaderBarItemBits nBits = HeaderBarItemBits::LEFTIMAGE | HeaderBarItemBits::CLICKABLE; float fAlign = extractAlignment(rMap); if (fAlign == 0.0) nBits |= HeaderBarItemBits::LEFT; diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx index 45532cd448a8..549595049b5f 100644 --- a/vcl/source/window/menu.cxx +++ b/vcl/source/window/menu.cxx @@ -1788,7 +1788,7 @@ void Menu::ImplPaint(vcl::RenderContext& rRenderContext, Size const & rSize, if (aPos.Y() >= 0) { - long nTextOffsetY = ((pData->aSz.Height() - nFontHeight) / 2); + long nTextOffsetY = (pData->aSz.Height() - nFontHeight) / 2; if (IsMenuBar()) nTextOffsetY += (aOutSz.Height()-pData->aSz.Height()) / 2; DrawTextFlags nTextStyle = DrawTextFlags::NONE; diff --git a/vcl/source/window/seleng.cxx b/vcl/source/window/seleng.cxx index 8e81ce88d095..53dff53e7fd5 100644 --- a/vcl/source/window/seleng.cxx +++ b/vcl/source/window/seleng.cxx @@ -98,7 +98,7 @@ void SelectionEngine::CursorPosChanging( bool bShift, bool bMod1 ) { // pFunctionSet->CreateCursor(); pFunctionSet->DestroyAnchor(); - nFlags &= (~SelectionEngineFlags::HAS_ANCH); + nFlags &= ~SelectionEngineFlags::HAS_ANCH; } } else @@ -107,14 +107,14 @@ void SelectionEngine::CursorPosChanging( bool bShift, bool bMod1 ) pFunctionSet->DeselectAll(); else pFunctionSet->DestroyAnchor(); - nFlags &= (~SelectionEngineFlags::HAS_ANCH); + nFlags &= ~SelectionEngineFlags::HAS_ANCH; } } } bool SelectionEngine::SelMouseButtonDown( const MouseEvent& rMEvt ) { - nFlags &= (~SelectionEngineFlags::CMDEVT); + nFlags &= ~SelectionEngineFlags::CMDEVT; if ( !pFunctionSet || !pWin || rMEvt.GetClicks() > 1 || rMEvt.IsRight() ) return false; @@ -144,7 +144,7 @@ bool SelectionEngine::SelMouseButtonDown( const MouseEvent& rMEvt ) case 0: // KEY_NO_KEY { bool bSelAtPoint = pFunctionSet->IsSelectionAtPoint( aPos ); - nFlags &= (~SelectionEngineFlags::IN_ADD); + nFlags &= ~SelectionEngineFlags::IN_ADD; if ( (nFlags & SelectionEngineFlags::DRG_ENAB) && bSelAtPoint ) { nFlags |= SelectionEngineFlags::WAIT_UPEVT; @@ -158,7 +158,7 @@ bool SelectionEngine::SelMouseButtonDown( const MouseEvent& rMEvt ) pFunctionSet->DeselectAll(); else pFunctionSet->DestroyAnchor(); - nFlags &= (~SelectionEngineFlags::HAS_ANCH); // bHasAnchor = false; + nFlags &= ~SelectionEngineFlags::HAS_ANCH; // bHasAnchor = false; } pFunctionSet->SetCursorAtPoint( aPos ); // special case Single-Selection, to enable simple Select+Drag @@ -171,13 +171,13 @@ bool SelectionEngine::SelMouseButtonDown( const MouseEvent& rMEvt ) if ( eSelMode == SelectionMode::Single ) { pWin->ReleaseMouse(); - nFlags &= (~SelectionEngineFlags::IN_SEL); + nFlags &= ~SelectionEngineFlags::IN_SEL; return false; } if ( nFlags & SelectionEngineFlags::ADD_ALW ) nFlags |= SelectionEngineFlags::IN_ADD; else - nFlags &= (~SelectionEngineFlags::IN_ADD); + nFlags &= ~SelectionEngineFlags::IN_ADD; if( !(nFlags & SelectionEngineFlags::HAS_ANCH) ) { @@ -193,7 +193,7 @@ bool SelectionEngine::SelMouseButtonDown( const MouseEvent& rMEvt ) // allow Control only for Multi-Select if ( eSelMode != SelectionMode::Multiple ) { - nFlags &= (~SelectionEngineFlags::IN_SEL); + nFlags &= ~SelectionEngineFlags::IN_SEL; pWin->ReleaseMouse(); return true; // skip Mouse-Click } @@ -201,7 +201,7 @@ bool SelectionEngine::SelMouseButtonDown( const MouseEvent& rMEvt ) { // pFunctionSet->CreateCursor(); pFunctionSet->DestroyAnchor(); - nFlags &= (~SelectionEngineFlags::HAS_ANCH); + nFlags &= ~SelectionEngineFlags::HAS_ANCH; } if ( pFunctionSet->IsSelectionAtPoint( aPos ) ) { @@ -218,7 +218,7 @@ bool SelectionEngine::SelMouseButtonDown( const MouseEvent& rMEvt ) if ( eSelMode != SelectionMode::Multiple ) { pWin->ReleaseMouse(); - nFlags &= (~SelectionEngineFlags::IN_SEL); + nFlags &= ~SelectionEngineFlags::IN_SEL; return false; } nFlags |= SelectionEngineFlags::IN_ADD; //bIsInAddMode = true; @@ -239,7 +239,7 @@ bool SelectionEngine::SelMouseButtonUp( const MouseEvent& rMEvt ) aWTimer.Stop(); if( !pFunctionSet || !pWin ) { - const SelectionEngineFlags nMask = (SelectionEngineFlags::CMDEVT | SelectionEngineFlags::WAIT_UPEVT | SelectionEngineFlags::IN_SEL); + const SelectionEngineFlags nMask = SelectionEngineFlags::CMDEVT | SelectionEngineFlags::WAIT_UPEVT | SelectionEngineFlags::IN_SEL; nFlags &= ~nMask; return false; } @@ -260,21 +260,21 @@ bool SelectionEngine::SelMouseButtonUp( const MouseEvent& rMEvt ) if( !(nModifier & KEY_SHIFT) ) { pFunctionSet->DestroyAnchor(); - nFlags &= (~SelectionEngineFlags::HAS_ANCH); // uncheck anchor + nFlags &= ~SelectionEngineFlags::HAS_ANCH; // uncheck anchor } pFunctionSet->DeselectAtPoint( aLastMove.GetPosPixel() ); - nFlags &= (~SelectionEngineFlags::HAS_ANCH); // uncheck anchor + nFlags &= ~SelectionEngineFlags::HAS_ANCH; // uncheck anchor pFunctionSet->SetCursorAtPoint( aLastMove.GetPosPixel(), true ); } else { pFunctionSet->DeselectAll(); - nFlags &= (~SelectionEngineFlags::HAS_ANCH); // uncheck anchor + nFlags &= ~SelectionEngineFlags::HAS_ANCH; // uncheck anchor pFunctionSet->SetCursorAtPoint( aLastMove.GetPosPixel() ); } } - const SelectionEngineFlags nMask = (SelectionEngineFlags::CMDEVT | SelectionEngineFlags::WAIT_UPEVT | SelectionEngineFlags::IN_SEL); + const SelectionEngineFlags nMask = SelectionEngineFlags::CMDEVT | SelectionEngineFlags::WAIT_UPEVT | SelectionEngineFlags::IN_SEL; nFlags &= ~nMask; return true; } @@ -359,7 +359,7 @@ void SelectionEngine::Command( const CommandEvent& rCEvt ) aLastMove.GetClicks(), aLastMove.GetMode(), aLastMove.GetButtons(), aLastMove.GetModifier() ); pFunctionSet->BeginDrag(); - const SelectionEngineFlags nMask = (SelectionEngineFlags::CMDEVT|SelectionEngineFlags::WAIT_UPEVT|SelectionEngineFlags::IN_SEL); + const SelectionEngineFlags nMask = SelectionEngineFlags::CMDEVT|SelectionEngineFlags::WAIT_UPEVT|SelectionEngineFlags::IN_SEL; nFlags &= ~nMask; } else diff --git a/vcl/source/window/status.cxx b/vcl/source/window/status.cxx index ce605fa4d4b1..be83ef42282c 100644 --- a/vcl/source/window/status.cxx +++ b/vcl/source/window/status.cxx @@ -1394,7 +1394,7 @@ Size StatusBar::CalcWindowSizePixel() const size_t i = 0; size_t nCount = mvItemList.size(); long nOffset = 0; - long nCalcWidth = (STATUSBAR_OFFSET_X*2); + long nCalcWidth = STATUSBAR_OFFSET_X*2; long nCalcHeight; while ( i < nCount ) diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx index a12d597091a7..11fd8d5f482e 100644 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -996,7 +996,7 @@ void Window::ImplInit( vcl::Window* pParent, WinBits nStyle, SystemParentData* p { nFrameStyle = SalFrameStyleFlags::FLOAT; if( nStyle & WB_OWNERDRAWDECORATION ) - nFrameStyle |= (SalFrameStyleFlags::OWNERDRAWDECORATION | SalFrameStyleFlags::NOSHADOW); + nFrameStyle |= SalFrameStyleFlags::OWNERDRAWDECORATION | SalFrameStyleFlags::NOSHADOW; } else if( mpWindowImpl->mbFloatWin ) nFrameStyle |= SalFrameStyleFlags::TOOLWINDOW; diff --git a/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx b/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx index f78eb392e1af..babe9273948b 100644 --- a/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx +++ b/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx @@ -1072,8 +1072,8 @@ void GtkSalGraphics::PaintOneSpinButton( GtkStyleContext *context, buttonRect.Left(), buttonRect.Top(), buttonRect.GetWidth(), buttonRect.GetHeight() ); - gint iconWidth = (buttonRect.GetWidth() - padding.left - padding.right - border.left - border.right); - gint iconHeight = (buttonRect.GetHeight() - padding.top - padding.bottom - border.top - border.bottom); + gint iconWidth = buttonRect.GetWidth() - padding.left - padding.right - border.left - border.right; + gint iconHeight = buttonRect.GetHeight() - padding.top - padding.bottom - border.top - border.bottom; const char* icon = (nPart == ControlPart::ButtonUp) ? "list-add-symbolic" : "list-remove-symbolic"; GtkIconTheme *pIconTheme = gtk_icon_theme_get_for_screen(gtk_widget_get_screen(mpWindow)); diff --git a/xmlhelp/source/treeview/tvread.cxx b/xmlhelp/source/treeview/tvread.cxx index c6fe6d0c74ab..c81a31bab743 100644 --- a/xmlhelp/source/treeview/tvread.cxx +++ b/xmlhelp/source/treeview/tvread.cxx @@ -232,7 +232,7 @@ TVRead::TVRead( const ConfigData& configData,TVDom* tvDom ) configData.replaceName( Title ); if( tvDom->isLeaf() ) { - TargetURL = ( tvDom->getTargetURL() + configData.appendix ); + TargetURL = tvDom->getTargetURL() + configData.appendix; if( !tvDom->anchor.isEmpty() ) TargetURL += "#" + tvDom->anchor; } diff --git a/xmloff/source/meta/xmlmetai.cxx b/xmloff/source/meta/xmlmetai.cxx index 3f82594627cc..21f634fe50e5 100644 --- a/xmloff/source/meta/xmlmetai.cxx +++ b/xmloff/source/meta/xmlmetai.cxx @@ -280,7 +280,7 @@ void SvXMLMetaDocumentContext::setBuildId(OUString const& i_rBuildId, const uno: } if (!sNumber.isEmpty()) { - sBuildId += (";" + sNumber.makeStringAndClear()); + sBuildId += ";" + sNumber.makeStringAndClear(); } } |