diff options
author | Chris Sherlock <chris.sherlock79@gmail.com> | 2014-04-27 19:38:55 +1000 |
---|---|---|
committer | Chris Sherlock <chris.sherlock79@gmail.com> | 2014-04-27 20:53:30 +1000 |
commit | bb5d1006bd97dca3311d2960aec11595feae3b09 (patch) | |
tree | 19e83fca9c0ac93ab7c631221db5f0625916c9ab /vcl | |
parent | ffd55ff0b919a982f54db558b2341309bbabf0b9 (diff) |
VCL: rename OutputDevice::ImplInitFillColor and make it private
Change-Id: I01c0974d3a2f79cf3c6b9730ea306dcd49927a3c
Diffstat (limited to 'vcl')
-rw-r--r-- | vcl/source/gdi/print.cxx | 2 | ||||
-rw-r--r-- | vcl/source/outdev/curvedshapes.cxx | 6 | ||||
-rw-r--r-- | vcl/source/outdev/line.cxx | 2 | ||||
-rw-r--r-- | vcl/source/outdev/nativecontrols.cxx | 2 | ||||
-rw-r--r-- | vcl/source/outdev/outdev.cxx | 2 | ||||
-rw-r--r-- | vcl/source/outdev/polygon.cxx | 8 | ||||
-rw-r--r-- | vcl/source/outdev/polyline.cxx | 4 | ||||
-rw-r--r-- | vcl/source/outdev/rect.cxx | 4 | ||||
-rw-r--r-- | vcl/source/outdev/transparent.cxx | 6 |
9 files changed, 18 insertions, 18 deletions
diff --git a/vcl/source/gdi/print.cxx b/vcl/source/gdi/print.cxx index cc8b34543c96..bf2066df93ca 100644 --- a/vcl/source/gdi/print.cxx +++ b/vcl/source/gdi/print.cxx @@ -858,7 +858,7 @@ void Printer::ApplyMask( const Bitmap& rMask, const Color& rMaskColor, SetLineColor( rMaskColor ); SetFillColor( rMaskColor ); InitLineColor(); - ImplInitFillColor(); + InitFillColor(); // create forward mapping tables for( nX = 0L; nX <= nSrcWidth; nX++ ) diff --git a/vcl/source/outdev/curvedshapes.cxx b/vcl/source/outdev/curvedshapes.cxx index b5b4140f6c24..bca6c7489b80 100644 --- a/vcl/source/outdev/curvedshapes.cxx +++ b/vcl/source/outdev/curvedshapes.cxx @@ -58,7 +58,7 @@ void OutputDevice::DrawEllipse( const Rectangle& rRect ) else { if ( mbInitFillColor ) - ImplInitFillColor(); + InitFillColor(); mpGraphics->DrawPolygon( aRectPoly.GetSize(), pPtAry, this ); } } @@ -149,7 +149,7 @@ void OutputDevice::DrawPie( const Rectangle& rRect, else { if ( mbInitFillColor ) - ImplInitFillColor(); + InitFillColor(); mpGraphics->DrawPolygon( aPiePoly.GetSize(), pPtAry, this ); } } @@ -198,7 +198,7 @@ void OutputDevice::DrawChord( const Rectangle& rRect, else { if ( mbInitFillColor ) - ImplInitFillColor(); + InitFillColor(); mpGraphics->DrawPolygon( aChordPoly.GetSize(), pPtAry, this ); } } diff --git a/vcl/source/outdev/line.cxx b/vcl/source/outdev/line.cxx index 0d5784bfc1ce..ea987fa56918 100644 --- a/vcl/source/outdev/line.cxx +++ b/vcl/source/outdev/line.cxx @@ -322,7 +322,7 @@ void OutputDevice::PaintLineGeometryWithEvtlExpand( SetLineColor(); InitLineColor(); SetFillColor( aOldLineColor ); - ImplInitFillColor(); + InitFillColor(); bool bDone(false); diff --git a/vcl/source/outdev/nativecontrols.cxx b/vcl/source/outdev/nativecontrols.cxx index dc454c32920b..28e2d35921f5 100644 --- a/vcl/source/outdev/nativecontrols.cxx +++ b/vcl/source/outdev/nativecontrols.cxx @@ -275,7 +275,7 @@ bool OutputDevice::DrawNativeControl( ControlType nType, if ( mbInitLineColor ) InitLineColor(); if ( mbInitFillColor ) - ImplInitFillColor(); + InitFillColor(); // Convert the coordinates from relative to Window-absolute, so we draw // in the correct place in platform code diff --git a/vcl/source/outdev/outdev.cxx b/vcl/source/outdev/outdev.cxx index 5100c631f3ab..b72779621f42 100644 --- a/vcl/source/outdev/outdev.cxx +++ b/vcl/source/outdev/outdev.cxx @@ -938,7 +938,7 @@ void OutputDevice::ImplGetFrameDev( const Point& rPt, const Point& rDevPt, const } -void OutputDevice::ImplInitFillColor() +void OutputDevice::InitFillColor() { DBG_TESTSOLARMUTEX(); diff --git a/vcl/source/outdev/polygon.cxx b/vcl/source/outdev/polygon.cxx index 5dc154e50751..b3c60019191f 100644 --- a/vcl/source/outdev/polygon.cxx +++ b/vcl/source/outdev/polygon.cxx @@ -56,7 +56,7 @@ void OutputDevice::DrawPolyPolygon( const PolyPolygon& rPolyPoly ) InitLineColor(); if ( mbInitFillColor ) - ImplInitFillColor(); + InitFillColor(); // use b2dpolygon drawing if possible if((mnAntialiasing & ANTIALIASING_ENABLE_B2DDRAW) && @@ -163,7 +163,7 @@ void OutputDevice::DrawPolygon( const Polygon& rPoly ) InitLineColor(); if ( mbInitFillColor ) - ImplInitFillColor(); + InitFillColor(); // use b2dpolygon drawing if possible if((mnAntialiasing & ANTIALIASING_ENABLE_B2DDRAW) && @@ -263,7 +263,7 @@ void OutputDevice::ImplDrawPolyPolygonWithB2DPolyPolygon(const basegfx::B2DPolyP InitLineColor(); if( mbInitFillColor ) - ImplInitFillColor(); + InitFillColor(); if((mnAntialiasing & ANTIALIASING_ENABLE_B2DDRAW) && mpGraphics->supportsOperation(OutDevSupport_B2DDraw) && @@ -537,7 +537,7 @@ void OutputDevice::DrawGrid( const Rectangle& rRect, const Size& rDist, sal_uLon InitLineColor(); if( mbInitFillColor ) - ImplInitFillColor(); + InitFillColor(); const bool bOldMap = mbMap; EnableMapMode( false ); diff --git a/vcl/source/outdev/polyline.cxx b/vcl/source/outdev/polyline.cxx index 2ddb191aa749..d261ccebc1f5 100644 --- a/vcl/source/outdev/polyline.cxx +++ b/vcl/source/outdev/polyline.cxx @@ -194,7 +194,7 @@ void OutputDevice::DrawPolyLine( const basegfx::B2DPolygon& rB2DPolygon, SetLineColor(); InitLineColor(); SetFillColor(aOldLineColor); - ImplInitFillColor(); + InitFillColor(); // draw usig a loop; else the topology will paint a PolyPolygon for(sal_uInt32 a(0); a < aAreaPolyPolygon.count(); a++) @@ -206,7 +206,7 @@ void OutputDevice::DrawPolyLine( const basegfx::B2DPolygon& rB2DPolygon, SetLineColor(aOldLineColor); InitLineColor(); SetFillColor(aOldFillColor); - ImplInitFillColor(); + InitFillColor(); if(bTryAA) { diff --git a/vcl/source/outdev/rect.cxx b/vcl/source/outdev/rect.cxx index 8a5d884f2264..8a847fc5650d 100644 --- a/vcl/source/outdev/rect.cxx +++ b/vcl/source/outdev/rect.cxx @@ -55,7 +55,7 @@ void OutputDevice::DrawRect( const Rectangle& rRect ) InitLineColor(); if ( mbInitFillColor ) - ImplInitFillColor(); + InitFillColor(); mpGraphics->DrawRect( aRect.Left(), aRect.Top(), aRect.GetWidth(), aRect.GetHeight(), this ); @@ -98,7 +98,7 @@ void OutputDevice::DrawRect( const Rectangle& rRect, InitLineColor(); if ( mbInitFillColor ) - ImplInitFillColor(); + InitFillColor(); if ( !nHorzRound && !nVertRound ) { diff --git a/vcl/source/outdev/transparent.cxx b/vcl/source/outdev/transparent.cxx index ec4351f664b5..21d7bb466370 100644 --- a/vcl/source/outdev/transparent.cxx +++ b/vcl/source/outdev/transparent.cxx @@ -183,7 +183,7 @@ void OutputDevice::DrawTransparent( const basegfx::B2DPolyPolygon& rB2DPolyPoly, InitLineColor(); if( mbInitFillColor ) - ImplInitFillColor(); + InitFillColor(); if((mnAntialiasing & ANTIALIASING_ENABLE_B2DDRAW) && mpGraphics->supportsOperation(OutDevSupport_B2DDraw) && @@ -268,7 +268,7 @@ bool OutputDevice::DrawTransparentNatively ( const PolyPolygon& rPolyPoly, InitLineColor(); if( mbInitFillColor ) - ImplInitFillColor(); + InitFillColor(); // get the polygon in device coordinates basegfx::B2DPolyPolygon aB2DPolyPolygon( rPolyPoly.getB2DPolyPolygon() ); @@ -355,7 +355,7 @@ void OutputDevice::EmulateDrawTransparent ( const PolyPolygon& rPolyPoly, InitLineColor(); if ( mbInitFillColor ) - ImplInitFillColor(); + InitFillColor(); Rectangle aLogicPolyRect( rPolyPoly.GetBoundRect() ); Rectangle aPixelRect( ImplLogicToDevicePixel( aLogicPolyRect ) ); |