Rearrange OutputDevice's gradient functions

Rearranged gradient functions in outdev.hxx to group them together,
also renamed ImplGetGradientSteps to GetGradientSteps and
ImplGetGradientStepCount to GetGradientStepCount.

Change-Id: I98ea0d177531e50b9bdc097df15cfb93d26474e7

2 files changed, 44 insertions, 33 deletions

diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index e8d03da789cd..34c675378674 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -735,31 +735,6 @@ public:
     SAL_DLLPRIVATE void         ImplDrawPolyPolygonWithB2DPolyPolygon(const basegfx::B2DPolyPolygon& rB2DPolyPoly);
     ///@}
 
-    /** @name Gradient functions
-     */
-    ///@{
-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 );
-
-protected:
-    virtual long                ImplGetGradientStepCount( long nMinRect );
-
-private:
-    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 );
-
-    SAL_DLLPRIVATE long         ImplGetGradientSteps( const Gradient& rGradient, const Rectangle& rRect, bool bMtf, bool bComplex=false );
-
-    SAL_DLLPRIVATE Color        GetSingleColorGradientFill();
-    SAL_DLLPRIVATE void         SetGrayscaleColors( Gradient &rGradient );
-    ///@}
-
 public:
     /** @name Hatch functions
      */
@@ -1029,13 +1004,6 @@ public:
     void                        DrawRect( const Rectangle& rRect );
     void                        DrawRect( const Rectangle& rRect,
                                           sal_uLong nHorzRount, sal_uLong nVertRound );
-    void                        DrawEllipse( const Rectangle& rRect );
-    void                        DrawArc( const Rectangle& rRect,
-                                         const Point& rStartPt, const Point& rEndPt );
-    void                        DrawPie( const Rectangle& rRect,
-                                         const Point& rStartPt, const Point& rEndPt );
-    void                        DrawChord( const Rectangle& rRect,
-                                           const Point& rStartPt, const Point& rEndPt );
 
     virtual void                DrawOutDev( const Point& rDestPt, const Size& rDestSize,
                                             const Point& rSrcPt,  const Size& rSrcSize );
@@ -1178,6 +1146,49 @@ private:
     ///@}
 
 public:
+    /** @name Curved shape functions
+     */
+    ///@{
+    void                        DrawEllipse( const Rectangle& rRect );
+
+    void                        DrawArc( const Rectangle& rRect,
+                                         const Point& rStartPt, const Point& rEndPt );
+
+    void                        DrawPie( const Rectangle& rRect,
+                                         const Point& rStartPt, const Point& rEndPt );
+
+    void                        DrawChord( const Rectangle& rRect,
+                                           const Point& rStartPt, const Point& rEndPt );
+
+    ///@}
+
+
+public:
+    /** @name Gradient functions
+     */
+    ///@{
+    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 );
+
+protected:
+    virtual long                GetGradientStepCount( long nMinRect );
+
+private:
+    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 );
+
+    SAL_DLLPRIVATE long         GetGradientSteps( const Gradient& rGradient, const Rectangle& rRect, bool bMtf, bool bComplex=false );
+
+    SAL_DLLPRIVATE Color        GetSingleColorGradientFill();
+    SAL_DLLPRIVATE void         SetGrayscaleColors( Gradient &rGradient );
+    ///@}
+
+public:
     void                        DrawMask( const Point& rDestPt,
                                           const Bitmap& rBitmap, const Color& rMaskColor );
     void                        DrawMask( const Point& rDestPt, const Size& rDestSize,
diff --git a/include/vcl/print.hxx b/include/vcl/print.hxx
index 9780c0d9abdb..1eb2a45a0357 100644
--- a/include/vcl/print.hxx
+++ b/include/vcl/print.hxx
@@ -271,7 +271,7 @@ public:
     SAL_DLLPRIVATE void         ImplEndPage();
 
 protected:
-    long                        ImplGetGradientStepCount( long nMinRect ) SAL_OVERRIDE;
+    virtual long                GetGradientStepCount( long nMinRect ) SAL_OVERRIDE;
     virtual bool                UsePolyPolygonForComplexGradient() SAL_OVERRIDE;
 
     void                        ScaleBitmap ( Bitmap&, SalTwoRect& ) SAL_OVERRIDE { };