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

[Chris Sherlock]

 include/vcl/outdev.hxx         |    2 +-
 vcl/source/outdev/line.cxx     |    6 ++----
 vcl/source/outdev/polyline.cxx |    2 +-
 3 files changed, 4 insertions(+), 6 deletions(-)

New commits:
commit 988477e2cef162c28eb5e8e91a6c40497a18f19c
Author: Chris Sherlock <chris.sherlock79 at gmail.com>
Date:   Wed Nov 5 22:30:49 2014 +1100

    vcl: renamed OutputDevice::PaintLineGeometryWithEvtlExpand()
    
    I asked on the LO dev mailing list what Evtl means and what is being
    expanded, and Michael Stahl kindly responded:
    
    >  "Evtl" usually means German "eventuell" which means "possible" or
    >  "optional" (i.e. totally different meaning from English "eventual").
    
    So in other words, it means paint using line geometry and optionally
    expand. Or in other words, it just draws a line using a B2DPolyPolygon.
    Thus, I have renamed it to drawLine(), which is a private function of
    OutputDevice. I think this makes it somewhat clearer :-)
    
    Change-Id: I7eec23c61eda9dc1074922f5f2f67eacbc7fd725
    Reviewed-on: https://gerrit.libreoffice.org/12264
    Reviewed-by: Chris Sherlock <chris.sherlock79 at gmail.com>
    Tested-by: Chris Sherlock <chris.sherlock79 at gmail.com>

diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index 7603351..6beb928 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -687,7 +687,7 @@ private:
 
     /** Helper for line geometry paint with support for graphic expansion (pattern and fat_to_area)
      */
-    SAL_DLLPRIVATE void         PaintLineGeometryWithEvtlExpand( const LineInfo& rInfo, basegfx::B2DPolyPolygon aLinePolyPolygon );
+    SAL_DLLPRIVATE void         drawLine( basegfx::B2DPolyPolygon aLinePolyPolygon, const LineInfo& rInfo );
     ///@}
 
 
diff --git a/vcl/source/outdev/line.cxx b/vcl/source/outdev/line.cxx
index 366d992..50e5a47 100644
--- a/vcl/source/outdev/line.cxx
+++ b/vcl/source/outdev/line.cxx
@@ -74,7 +74,7 @@ void OutputDevice::DrawLine( const Point& rStartPt, const Point& rEndPt,
         aLinePolygon.append(basegfx::B2DPoint(aStartPt.X(), aStartPt.Y()));
         aLinePolygon.append(basegfx::B2DPoint(aEndPt.X(), aEndPt.Y()));
 
-        PaintLineGeometryWithEvtlExpand(aInfo, basegfx::B2DPolyPolygon(aLinePolygon));
+        drawLine( basegfx::B2DPolyPolygon(aLinePolygon), aInfo );
     }
     else
     {
@@ -145,9 +145,7 @@ void OutputDevice::DrawLine( const Point& rStartPt, const Point& rEndPt )
         mpAlphaVDev->DrawLine( rStartPt, rEndPt );
 }
 
-void OutputDevice::PaintLineGeometryWithEvtlExpand(
-            const LineInfo& rInfo,
-            basegfx::B2DPolyPolygon aLinePolyPolygon)
+void OutputDevice::drawLine( basegfx::B2DPolyPolygon aLinePolyPolygon, const LineInfo& rInfo )
 {
     const bool bTryAA((mnAntialiasing & ANTIALIASING_ENABLE_B2DDRAW)
         && mpGraphics->supportsOperation(OutDevSupport_B2DDraw)
diff --git a/vcl/source/outdev/polyline.cxx b/vcl/source/outdev/polyline.cxx
index fd71306..ece1d6f 100644
--- a/vcl/source/outdev/polyline.cxx
+++ b/vcl/source/outdev/polyline.cxx
@@ -244,7 +244,7 @@ void OutputDevice::drawPolyLine(const Polygon& rPoly, const LineInfo& rLineInfo)
 
     if(bDashUsed || bLineWidthUsed)
     {
-        PaintLineGeometryWithEvtlExpand(aInfo, basegfx::B2DPolyPolygon(aPoly.getB2DPolygon()));
+        drawLine ( basegfx::B2DPolyPolygon(aPoly.getB2DPolygon()), aInfo );
     }
     else
     {