diff options
Diffstat (limited to 'vcl/source/outdev')
-rw-r--r-- | vcl/source/outdev/gradient.cxx | 4 | ||||
-rw-r--r-- | vcl/source/outdev/text.cxx | 4 | ||||
-rw-r--r-- | vcl/source/outdev/transparent.cxx | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/vcl/source/outdev/gradient.cxx b/vcl/source/outdev/gradient.cxx index 864a3d91da7a..56e6da7b4787 100644 --- a/vcl/source/outdev/gradient.cxx +++ b/vcl/source/outdev/gradient.cxx @@ -555,7 +555,7 @@ void OutputDevice::DrawComplexGradient( const tools::Rectangle& rRect, aPoly.Rotate( aCenter, nAngle ); // adapt colour accordingly - const long nStepIndex = ( ( xPolyPoly ) ? i : ( i + 1 ) ); + const long nStepIndex = ( xPolyPoly ? i : ( i + 1 ) ); nRed = GetGradientColorValue( nStartRed + ( ( nRedSteps * nStepIndex ) / nSteps ) ); nGreen = GetGradientColorValue( nStartGreen + ( ( nGreenSteps * nStepIndex ) / nSteps ) ); nBlue = GetGradientColorValue( nStartBlue + ( ( nBlueSteps * nStepIndex ) / nSteps ) ); @@ -883,7 +883,7 @@ void OutputDevice::DrawComplexGradientToMetafile( const tools::Rectangle& rRect, aPoly.Rotate( aCenter, nAngle ); // adapt colour accordingly - const long nStepIndex = ( ( xPolyPoly ) ? i : ( i + 1 ) ); + const long nStepIndex = ( xPolyPoly ? i : ( i + 1 ) ); nRed = GetGradientColorValue( nStartRed + ( ( nRedSteps * nStepIndex ) / nSteps ) ); nGreen = GetGradientColorValue( nStartGreen + ( ( nGreenSteps * nStepIndex ) / nSteps ) ); nBlue = GetGradientColorValue( nStartBlue + ( ( nBlueSteps * nStepIndex ) / nSteps ) ); diff --git a/vcl/source/outdev/text.cxx b/vcl/source/outdev/text.cxx index ba9208d5ba1c..580a6c372664 100644 --- a/vcl/source/outdev/text.cxx +++ b/vcl/source/outdev/text.cxx @@ -1731,8 +1731,8 @@ void OutputDevice::ImplDrawText( OutputDevice& rTargetDevice, const tools::Recta { std::unique_ptr<long[]> const pCaretXArray(new long[2 * aStr.getLength()]); /*sal_Bool bRet =*/ _rLayout.GetCaretPositions( aStr, pCaretXArray.get(), 0, aStr.getLength() ); - long lc_x1 = pCaretXArray[2*(nMnemonicPos)]; - long lc_x2 = pCaretXArray[2*(nMnemonicPos)+1]; + long lc_x1 = pCaretXArray[2*nMnemonicPos]; + long lc_x2 = pCaretXArray[2*nMnemonicPos+1]; nMnemonicWidth = rTargetDevice.LogicWidthToDeviceCoordinate( std::abs(lc_x1 - lc_x2) ); Point aTempPos = rTargetDevice.LogicToPixel( aPos ); diff --git a/vcl/source/outdev/transparent.cxx b/vcl/source/outdev/transparent.cxx index 91dfec3b24cc..e4e21d49b0a1 100644 --- a/vcl/source/outdev/transparent.cxx +++ b/vcl/source/outdev/transparent.cxx @@ -677,7 +677,7 @@ void OutputDevice::DrawTransparent( const GDIMetaFile& rMtf, const Point& rPos, return; if( ( rTransparenceGradient.GetStartColor() == aBlack && rTransparenceGradient.GetEndColor() == aBlack ) || - ( mnDrawMode & ( DrawModeFlags::NoTransparency ) ) ) + ( mnDrawMode & DrawModeFlags::NoTransparency ) ) { const_cast<GDIMetaFile&>(rMtf).WindStart(); const_cast<GDIMetaFile&>(rMtf).Play( this, rPos, rSize ); |