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

Change acessibility level for private functions

The following functions should be private members functions of OutputDevice:

* DrawComplexGradient
* DrawLinearGradient

These were previously called ImplDrawComplexGradient and
ImplDrawLinearGradient.

Change-Id: I4fc996ddd578bca6738128fcc883709359534c95
üst 96cdea53
...@@ -693,16 +693,27 @@ public: ...@@ -693,16 +693,27 @@ public:
// without MetaFile processing // without MetaFile processing
SAL_DLLPRIVATE void ImplDrawPolyPolygonWithB2DPolyPolygon(const basegfx::B2DPolyPolygon& rB2DPolyPoly); SAL_DLLPRIVATE void ImplDrawPolyPolygonWithB2DPolyPolygon(const basegfx::B2DPolyPolygon& rB2DPolyPoly);
private:
///@} ///@}
/** @name Gradient functions /** @name Gradient functions
*/ */
///@{ ///@{
SAL_DLLPRIVATE void ImplDrawLinearGradient( const Rectangle& rRect, const Gradient& rGradient, bool bMtf, const PolyPolygon* pClipPolyPoly ); SAL_DLLPRIVATE void DrawLinearGradient( const Rectangle& rRect, const Gradient& rGradient, bool bMtf, const PolyPolygon* pClipPolyPoly );
SAL_DLLPRIVATE void ImplDrawComplexGradient( const Rectangle& rRect, const Gradient& rGradient, bool bMtf, const PolyPolygon* pClipPolyPoly ); SAL_DLLPRIVATE void DrawComplexGradient( const Rectangle& rRect, const Gradient& rGradient, bool bMtf, const PolyPolygon* pClipPolyPoly );
public:
void DrawGradient( const Rectangle& rRect, const Gradient& rGradient );
void DrawGradient( const PolyPolygon& rPolyPoly, const Gradient& rGradient );
void AddGradientActions(
const Rectangle& rRect,
const Gradient& rGradient,
GDIMetaFile& rMtf );
///@} ///@}
public:
/** @name Hatch functions /** @name Hatch functions
*/ */
///@{ ///@{
...@@ -1102,12 +1113,6 @@ public: ...@@ -1102,12 +1113,6 @@ public:
void DrawImage( const Point& rPos, const Size& rSize, void DrawImage( const Point& rPos, const Size& rSize,
const Image& rImage, sal_uInt16 nStyle = 0 ); const Image& rImage, sal_uInt16 nStyle = 0 );
void DrawGradient( const Rectangle& rRect, const Gradient& rGradient );
void DrawGradient( const PolyPolygon& rPolyPoly, const Gradient& rGradient );
void AddGradientActions( const Rectangle& rRect,
const Gradient& rGradient,
GDIMetaFile& rMtf );
#ifdef _MSC_VER #ifdef _MSC_VER
void DrawHatch( const PolyPolygon& rPolyPoly, const ::Hatch& rHatch ); void DrawHatch( const PolyPolygon& rPolyPoly, const ::Hatch& rHatch );
void AddHatchActions( const PolyPolygon& rPolyPoly, void AddHatchActions( const PolyPolygon& rPolyPoly,
......
...@@ -163,9 +163,9 @@ void OutputDevice::DrawGradient( const PolyPolygon& rPolyPoly, ...@@ -163,9 +163,9 @@ void OutputDevice::DrawGradient( const PolyPolygon& rPolyPoly,
// if the clipping polypolygon is a rectangle, then it's the same size as the bounding of the // if the clipping polypolygon is a rectangle, then it's the same size as the bounding of the
// polypolygon, so pass in a NULL for the clipping parameter // polypolygon, so pass in a NULL for the clipping parameter
if( aGradient.GetStyle() == GradientStyle_LINEAR || rGradient.GetStyle() == GradientStyle_AXIAL ) if( aGradient.GetStyle() == GradientStyle_LINEAR || rGradient.GetStyle() == GradientStyle_AXIAL )
ImplDrawLinearGradient( aRect, aGradient, false, aClipPolyPoly.IsRect() ? NULL : &aClipPolyPoly ); DrawLinearGradient( aRect, aGradient, false, aClipPolyPoly.IsRect() ? NULL : &aClipPolyPoly );
else else
ImplDrawComplexGradient( aRect, aGradient, false, aClipPolyPoly.IsRect() ? NULL : &aClipPolyPoly ); DrawComplexGradient( aRect, aGradient, false, aClipPolyPoly.IsRect() ? NULL : &aClipPolyPoly );
} }
Pop(); Pop();
...@@ -177,7 +177,7 @@ void OutputDevice::DrawGradient( const PolyPolygon& rPolyPoly, ...@@ -177,7 +177,7 @@ void OutputDevice::DrawGradient( const PolyPolygon& rPolyPoly,
mpAlphaVDev->DrawPolyPolygon( rPolyPoly ); mpAlphaVDev->DrawPolyPolygon( rPolyPoly );
} }
void OutputDevice::ImplDrawLinearGradient( const Rectangle& rRect, void OutputDevice::DrawLinearGradient( const Rectangle& rRect,
const Gradient& rGradient, const Gradient& rGradient,
bool bMtf, const PolyPolygon* pClipPolyPoly ) bool bMtf, const PolyPolygon* pClipPolyPoly )
{ {
...@@ -372,7 +372,7 @@ void OutputDevice::ImplDrawLinearGradient( const Rectangle& rRect, ...@@ -372,7 +372,7 @@ void OutputDevice::ImplDrawLinearGradient( const Rectangle& rRect,
} }
} }
void OutputDevice::ImplDrawComplexGradient( const Rectangle& rRect, void OutputDevice::DrawComplexGradient( const Rectangle& rRect,
const Gradient& rGradient, const Gradient& rGradient,
bool bMtf, const PolyPolygon* pClipPolyPoly ) bool bMtf, const PolyPolygon* pClipPolyPoly )
{ {
...@@ -683,9 +683,9 @@ void OutputDevice::AddGradientActions( const Rectangle& rRect, const Gradient& r ...@@ -683,9 +683,9 @@ void OutputDevice::AddGradientActions( const Rectangle& rRect, const Gradient& r
aGradient.SetSteps( GRADIENT_DEFAULT_STEPCOUNT ); aGradient.SetSteps( GRADIENT_DEFAULT_STEPCOUNT );
if( aGradient.GetStyle() == GradientStyle_LINEAR || aGradient.GetStyle() == GradientStyle_AXIAL ) if( aGradient.GetStyle() == GradientStyle_LINEAR || aGradient.GetStyle() == GradientStyle_AXIAL )
ImplDrawLinearGradient( aRect, aGradient, true, NULL ); DrawLinearGradient( aRect, aGradient, true, NULL );
else else
ImplDrawComplexGradient( aRect, aGradient, true, NULL ); DrawComplexGradient( aRect, aGradient, true, NULL );
mpMetaFile->AddAction( new MetaPopAction() ); mpMetaFile->AddAction( new MetaPopAction() );
mpMetaFile = pOldMtf; mpMetaFile = pOldMtf;
......
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