include/vcl/outdev.hxx | 8 ++++----
include/vcl/print.hxx | 4 ++--
vcl/source/gdi/outdev4.cxx | 16 ++++++++--------
vcl/source/gdi/print.cxx | 6 +++---
4 files changed, 17 insertions(+), 17 deletions(-)
New commits:
commit 9413750057ad8f55203aa7c589b69211826ac30f
Author: Chris Sherlock <chris.sherloc...@gmail.com>
Date: Mon Apr 7 14:32:17 2014 +1000
Change newly introduced Clip* functions to ClipAndDraw
A number of new clipping functions have been introduced, but to make
it more clear as to their purpose they have been renamed. They are:
+ ClipGradientToBounds -> ClipAndDrawGradientToBounds
+ ClipGradient -> ClipAndDrawGradient
+ XORClipGradient -> XORClipAndDrawGradient
+ ClipGradientMetafile -> ClipAndDrawGradientMetafile
Change-Id: I2448a62d0473501a8d2613e685ee909cb6df7708
Reviewed-on: https://gerrit.libreoffice.org/8878
Reviewed-by: Chris Sherlock <chris.sherloc...@gmail.com>
Tested-by: Chris Sherlock <chris.sherloc...@gmail.com>
diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index 1195736..037d6d1 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -844,11 +844,11 @@ protected:
virtual void EmulateDrawTransparent( const PolyPolygon&
rPolyPoly, sal_uInt16 nTransparencePercent );
void DrawInvisiblePolygon( const PolyPolygon&
rPolyPoly );
- virtual void ClipGradientToBounds( Gradient &rGradient,
const PolyPolygon &rPolyPoly );
- void ClipGradient( Gradient &rGradient, const
PolyPolygon &rPolyPoly, const Rectangle &rBoundRect );
- void XORClipGradient( Gradient &rGradient, const
PolyPolygon &rPolyPoly, const Rectangle &rBoundRect );
+ virtual void ClipAndDrawGradientToBounds( Gradient
&rGradient, const PolyPolygon &rPolyPoly );
+ void ClipAndDrawGradient( Gradient &rGradient,
const PolyPolygon &rPolyPoly, const Rectangle &rBoundRect );
+ void XORClipAndDrawGradient( Gradient &rGradient,
const PolyPolygon &rPolyPoly, const Rectangle &rBoundRect );
- virtual void ClipGradientMetafile ( const Gradient
&rGradient, const PolyPolygon &rPolyPoly, const Rectangle &rBoundRect );
+ virtual void ClipAndDrawGradientMetafile ( const Gradient
&rGradient, const PolyPolygon &rPolyPoly, const Rectangle &rBoundRect );
private:
typedef void ( OutputDevice::* FontUpdateHandler_t )( bool );
diff --git a/include/vcl/print.hxx b/include/vcl/print.hxx
index f9179bd..4ad4207 100644
--- a/include/vcl/print.hxx
+++ b/include/vcl/print.hxx
@@ -274,8 +274,8 @@ public:
protected:
long ImplGetGradientStepCount( long nMinRect )
SAL_OVERRIDE;
- virtual void ClipGradientToBounds( Gradient &rGradient,
const PolyPolygon &rPolyPoly ) SAL_OVERRIDE;
- virtual void ClipGradientMetafile ( const Gradient
&rGradient, const PolyPolygon &rPolyPoly, const Rectangle &rBoundRect )
SAL_OVERRIDE;
+ virtual void ClipAndDrawGradientToBounds( Gradient
&rGradient, const PolyPolygon &rPolyPoly ) SAL_OVERRIDE;
+ virtual void ClipAndDrawGradientMetafile ( const Gradient
&rGradient, const PolyPolygon &rPolyPoly, const Rectangle &rBoundRect )
SAL_OVERRIDE;
virtual bool UsePolyPolygonForComplexGradient()
SAL_OVERRIDE;
void ScaleBitmap ( Bitmap&, SalTwoRect& )
SAL_OVERRIDE { };
diff --git a/vcl/source/gdi/outdev4.cxx b/vcl/source/gdi/outdev4.cxx
index 51033a5..f402244 100644
--- a/vcl/source/gdi/outdev4.cxx
+++ b/vcl/source/gdi/outdev4.cxx
@@ -675,7 +675,7 @@ void OutputDevice::DrawGradient( const Rectangle& rRect,
}
}
-void OutputDevice::ClipGradientMetafile ( const Gradient &rGradient, const
PolyPolygon &rPolyPoly, const Rectangle &rBoundRect )
+void OutputDevice::ClipAndDrawGradientMetafile ( const Gradient &rGradient,
const PolyPolygon &rPolyPoly, const Rectangle &rBoundRect )
{
const bool bOldOutput = IsOutputEnabled();
@@ -692,17 +692,17 @@ void OutputDevice::ClipGradientMetafile ( const Gradient
&rGradient, const PolyP
EnableOutput( bOldOutput );
}
-void OutputDevice::ClipGradientToBounds ( Gradient &rGradient, const
PolyPolygon &rPolyPoly )
+void OutputDevice::ClipAndDrawGradientToBounds ( Gradient &rGradient, const
PolyPolygon &rPolyPoly )
{
const Rectangle aBoundRect( rPolyPoly.GetBoundRect() );
if( ImplGetSVData()->maGDIData.mbNoXORClipping )
- ClipGradient ( rGradient, rPolyPoly, aBoundRect );
+ ClipAndDrawGradient ( rGradient, rPolyPoly, aBoundRect );
else
- XORClipGradient ( rGradient, rPolyPoly, aBoundRect );
+ XORClipAndDrawGradient ( rGradient, rPolyPoly, aBoundRect );
}
-void OutputDevice::ClipGradient ( Gradient &rGradient, const PolyPolygon
&rPolyPoly, const Rectangle &rBoundRect )
+void OutputDevice::ClipAndDrawGradient ( Gradient &rGradient, const
PolyPolygon &rPolyPoly, const Rectangle &rBoundRect )
{
if( !Rectangle( PixelToLogic( Point() ), GetOutputSize() ).IsEmpty() )
{
@@ -745,7 +745,7 @@ void OutputDevice::ClipGradient ( Gradient &rGradient,
const PolyPolygon &rPolyP
}
}
-void OutputDevice::XORClipGradient ( Gradient &rGradient, const PolyPolygon
&rPolyPoly, const Rectangle &rBoundRect )
+void OutputDevice::XORClipAndDrawGradient ( Gradient &rGradient, const
PolyPolygon &rPolyPoly, const Rectangle &rBoundRect )
{
const PolyPolygon aPolyPoly( LogicToPixel( rPolyPoly ) );
Point aPoint;
@@ -847,7 +847,7 @@ void OutputDevice::DrawGradient( const PolyPolygon&
rPolyPoly,
mpMetaFile->AddAction( new MetaCommentAction( "XGRAD_SEQ_BEGIN" )
);
mpMetaFile->AddAction( new MetaGradientExAction( rPolyPoly,
rGradient ) );
- ClipGradientMetafile ( rGradient, rPolyPoly, aBoundRect );
+ ClipAndDrawGradientMetafile ( rGradient, rPolyPoly, aBoundRect );
mpMetaFile->AddAction( new MetaCommentAction( "XGRAD_SEQ_END" ) );
}
@@ -884,7 +884,7 @@ void OutputDevice::DrawGradient( const PolyPolygon&
rPolyPoly,
aGradient.SetEndColor( aEndCol );
}
- ClipGradientToBounds ( aGradient, rPolyPoly );
+ ClipAndDrawGradientToBounds ( aGradient, rPolyPoly );
}
if( mpAlphaVDev )
diff --git a/vcl/source/gdi/print.cxx b/vcl/source/gdi/print.cxx
index c66f121..774a82f 100644
--- a/vcl/source/gdi/print.cxx
+++ b/vcl/source/gdi/print.cxx
@@ -1812,14 +1812,14 @@ bool Printer::UsePolyPolygonForComplexGradient()
return true;
}
-void Printer::ClipGradientToBounds ( Gradient &rGradient, const PolyPolygon
&rPolyPoly )
+void Printer::ClipAndDrawGradientToBounds ( Gradient &rGradient, const
PolyPolygon &rPolyPoly )
{
const Rectangle aBoundRect( rPolyPoly.GetBoundRect() );
- ClipGradient ( rGradient, rPolyPoly, aBoundRect );
+ ClipAndDrawGradient ( rGradient, rPolyPoly, aBoundRect );
}
-void Printer::ClipGradientMetafile ( const Gradient &rGradient, const
PolyPolygon &rPolyPoly, const Rectangle &rBoundRect )
+void Printer::ClipAndDrawGradientMetafile ( const Gradient &rGradient, const
PolyPolygon &rPolyPoly, const Rectangle &rBoundRect )
{
Push( PUSH_CLIPREGION );
IntersectClipRegion(Region(rPolyPoly));
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
