Kaydet (Commit) bb5d1006 authored tarafından Chris Sherlock's avatar Chris Sherlock

VCL: rename OutputDevice::ImplInitFillColor and make it private

Change-Id: I01c0974d3a2f79cf3c6b9730ea306dcd49927a3c
üst ffd55ff0
......@@ -441,8 +441,6 @@ private:
*/
///@{
public:
SAL_DLLPRIVATE void ImplInitFillColor();
void EnableOutput( bool bEnable = true );
bool IsOutputEnabled() const { return mbOutput; }
bool IsDeviceOutput() const { return mbDevOutput; }
......@@ -488,6 +486,9 @@ public:
void SetFont( const Font& rNewFont );
const Font& GetFont() const { return maFont; }
private:
void InitFillColor();
///@}
/** @name Clipping functions
......
......@@ -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++ )
......
......@@ -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 );
}
}
......
......@@ -322,7 +322,7 @@ void OutputDevice::PaintLineGeometryWithEvtlExpand(
SetLineColor();
InitLineColor();
SetFillColor( aOldLineColor );
ImplInitFillColor();
InitFillColor();
bool bDone(false);
......
......@@ -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
......
......@@ -938,7 +938,7 @@ void OutputDevice::ImplGetFrameDev( const Point& rPt, const Point& rDevPt, const
}
void OutputDevice::ImplInitFillColor()
void OutputDevice::InitFillColor()
{
DBG_TESTSOLARMUTEX();
......
......@@ -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 );
......
......@@ -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)
{
......
......@@ -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 )
{
......
......@@ -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 ) );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment