[Libreoffice-commits] core.git: include/vcl vcl/source

[Chris Sherlock]

 include/vcl/outdev.hxx     |    2 --
 include/vcl/print.hxx      |    1 -
 vcl/source/gdi/outdev4.cxx |    7 +------
 vcl/source/gdi/print.cxx   |    5 -----
 4 files changed, 1 insertion(+), 14 deletions(-)

New commits:
commit 4f8d667c7075cab08b4a1918bfba2c42811a436d
Author: Chris Sherlock <chris.sherlock79 at gmail.com>
Date:   Fri Apr 11 18:43:10 2014 +1000

    ClipAndDrawGradientToBounds no longer required
    
    Now that we have removed XORClipAndDrawGradient, there is no need
    for the function ClipAndDrawGradientToBounds because the sole
    purpose of that function was to work out whether the system should
    use XOR clipping or not for gradients!
    
    Change-Id: Id29b804054dfc30a9cc350bf4958ea3b2420e272

diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index be31840..596f6b3 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -841,9 +841,7 @@ protected:
     virtual void                EmulateDrawTransparent( const PolyPolygon& rPolyPoly, sal_uInt16 nTransparencePercent );
     void                        DrawInvisiblePolygon( const PolyPolygon& rPolyPoly );
 
-    virtual void                ClipAndDrawGradientToBounds( Gradient &rGradient, const PolyPolygon &rPolyPoly );
     void                        ClipAndDrawGradient( Gradient &rGradient, const PolyPolygon &rPolyPoly );
-
     virtual void                ClipAndDrawGradientMetafile ( const Gradient &rGradient, const PolyPolygon &rPolyPoly );
 
 private:
diff --git a/include/vcl/print.hxx b/include/vcl/print.hxx
index 1f9b6fd..b08e27b 100644
--- a/include/vcl/print.hxx
+++ b/include/vcl/print.hxx
@@ -274,7 +274,6 @@ public:
 
 protected:
     long                        ImplGetGradientStepCount( long nMinRect ) SAL_OVERRIDE;
-    virtual void                ClipAndDrawGradientToBounds( Gradient &rGradient, const PolyPolygon &rPolyPoly ) SAL_OVERRIDE;
     virtual void                ClipAndDrawGradientMetafile ( const Gradient &rGradient, const PolyPolygon &rPolyPoly ) SAL_OVERRIDE;
     virtual bool                UsePolyPolygonForComplexGradient() SAL_OVERRIDE;
 
diff --git a/vcl/source/gdi/outdev4.cxx b/vcl/source/gdi/outdev4.cxx
index a371384..ed149c6 100644
--- a/vcl/source/gdi/outdev4.cxx
+++ b/vcl/source/gdi/outdev4.cxx
@@ -720,11 +720,6 @@ void OutputDevice::ClipAndDrawGradientMetafile ( const Gradient &rGradient, cons
     EnableOutput( bOldOutput );
 }
 
-void OutputDevice::ClipAndDrawGradientToBounds ( Gradient &rGradient, const PolyPolygon &rPolyPoly )
-{
-    ClipAndDrawGradient ( rGradient, rPolyPoly );
-}
-
 void OutputDevice::ClipAndDrawGradient ( Gradient &rGradient, const PolyPolygon &rPolyPoly )
 {
     const Rectangle aBoundRect( rPolyPoly.GetBoundRect() );
@@ -824,7 +819,7 @@ void OutputDevice::DrawGradient( const PolyPolygon& rPolyPoly,
         if( !IsDeviceOutputNecessary() || ImplIsRecordLayout() )
             return;
 
-        ClipAndDrawGradientToBounds ( aGradient, rPolyPoly );
+        ClipAndDrawGradient ( aGradient, rPolyPoly );
     }
 
     if( mpAlphaVDev )
diff --git a/vcl/source/gdi/print.cxx b/vcl/source/gdi/print.cxx
index cb8d903..95fb0f1 100644
--- a/vcl/source/gdi/print.cxx
+++ b/vcl/source/gdi/print.cxx
@@ -1812,11 +1812,6 @@ bool Printer::UsePolyPolygonForComplexGradient()
     return true;
 }
 
-void Printer::ClipAndDrawGradientToBounds ( Gradient &rGradient, const PolyPolygon &rPolyPoly )
-{
-    ClipAndDrawGradient ( rGradient, rPolyPoly );
-}
-
 void Printer::ClipAndDrawGradientMetafile ( const Gradient &rGradient, const PolyPolygon &rPolyPoly )
 {
     const Rectangle aBoundRect( rPolyPoly.GetBoundRect() );