diff options
| -rw-r--r-- | include/vcl/outdev.hxx | 23 | ||||
| -rw-r--r-- | vcl/source/gdi/outdev/gradient.cxx | 16 |
2 files changed, 22 insertions, 17 deletions
diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx index 8dab29999693..3e4f265fdcad 100644 --- a/include/vcl/outdev.hxx +++ b/include/vcl/outdev.hxx @@ -693,16 +693,27 @@ public: // without MetaFile processing SAL_DLLPRIVATE void ImplDrawPolyPolygonWithB2DPolyPolygon(const basegfx::B2DPolyPolygon& rB2DPolyPoly); - +private: ///@} /** @name Gradient functions */ ///@{ - SAL_DLLPRIVATE void ImplDrawLinearGradient( 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 DrawLinearGradient( 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 */ ///@{ @@ -1102,12 +1113,6 @@ public: void DrawImage( const Point& rPos, const Size& rSize, 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 void DrawHatch( const PolyPolygon& rPolyPoly, const ::Hatch& rHatch ); void AddHatchActions( const PolyPolygon& rPolyPoly, diff --git a/vcl/source/gdi/outdev/gradient.cxx b/vcl/source/gdi/outdev/gradient.cxx index a109b80d9440..65a3b7b6cf2b 100644 --- a/vcl/source/gdi/outdev/gradient.cxx +++ b/vcl/source/gdi/outdev/gradient.cxx @@ -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 // polypolygon, so pass in a NULL for the clipping parameter 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 - ImplDrawComplexGradient( aRect, aGradient, false, aClipPolyPoly.IsRect() ? NULL : &aClipPolyPoly ); + DrawComplexGradient( aRect, aGradient, false, aClipPolyPoly.IsRect() ? NULL : &aClipPolyPoly ); } Pop(); @@ -177,9 +177,9 @@ void OutputDevice::DrawGradient( const PolyPolygon& rPolyPoly, mpAlphaVDev->DrawPolyPolygon( rPolyPoly ); } -void OutputDevice::ImplDrawLinearGradient( const Rectangle& rRect, - const Gradient& rGradient, - bool bMtf, const PolyPolygon* pClipPolyPoly ) +void OutputDevice::DrawLinearGradient( const Rectangle& rRect, + const Gradient& rGradient, + bool bMtf, const PolyPolygon* pClipPolyPoly ) { // get BoundRect of rotated rectangle Rectangle aRect; @@ -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, bool bMtf, const PolyPolygon* pClipPolyPoly ) { @@ -683,9 +683,9 @@ void OutputDevice::AddGradientActions( const Rectangle& rRect, const Gradient& r aGradient.SetSteps( GRADIENT_DEFAULT_STEPCOUNT ); if( aGradient.GetStyle() == GradientStyle_LINEAR || aGradient.GetStyle() == GradientStyle_AXIAL ) - ImplDrawLinearGradient( aRect, aGradient, true, NULL ); + DrawLinearGradient( aRect, aGradient, true, NULL ); else - ImplDrawComplexGradient( aRect, aGradient, true, NULL ); + DrawComplexGradient( aRect, aGradient, true, NULL ); mpMetaFile->AddAction( new MetaPopAction() ); mpMetaFile = pOldMtf; |