[Libreoffice-commits] core.git: vcl/quartz

Tor Lillqvist tml at collabora.com
Mon Mar 31 08:01:33 PDT 2014


 vcl/quartz/salgdicommon.cxx |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

New commits:
commit 449aa3c6757da834e03129dfff40ac74b385f0e4
Author: Tor Lillqvist <tml at collabora.com>
Date:   Mon Mar 31 17:59:37 2014 +0300

    Just spell out the NULL instead of having a const variable for it
    
    Change-Id: Iee45a5bb80a1d3149aa231f2848910eee415a64b

diff --git a/vcl/quartz/salgdicommon.cxx b/vcl/quartz/salgdicommon.cxx
index 8d4b035..d628325 100644
--- a/vcl/quartz/salgdicommon.cxx
+++ b/vcl/quartz/salgdicommon.cxx
@@ -56,7 +56,6 @@ static void AddPolygonToPath( CGMutablePathRef xPath,
         return;
     }
     (void)bPixelSnap; // TODO
-    const CGAffineTransform* pTransform = NULL;
 
     const bool bHasCurves = rPolygon.areControlPointsUsed();
     for( int nPointIdx = 0, nPrevIdx = 0;; nPrevIdx = nPointIdx++ )
@@ -91,7 +90,7 @@ static void AddPolygonToPath( CGMutablePathRef xPath,
         if( !nPointIdx )
         {
             // first point => just move there
-            CGPathMoveToPoint( xPath, pTransform, aPoint.getX(), aPoint.getY() );
+            CGPathMoveToPoint( xPath, NULL, aPoint.getX(), aPoint.getY() );
             continue;
         }
 
@@ -104,7 +103,7 @@ static void AddPolygonToPath( CGMutablePathRef xPath,
 
         if( !bPendingCurve )    // line segment
         {
-            CGPathAddLineToPoint( xPath, pTransform, aPoint.getX(), aPoint.getY() );
+            CGPathAddLineToPoint( xPath, NULL, aPoint.getX(), aPoint.getY() );
         }
         else                        // cubic bezier segment
         {
@@ -115,7 +114,7 @@ static void AddPolygonToPath( CGMutablePathRef xPath,
                 aCP1 += aHalfPointOfs;
                 aCP2 += aHalfPointOfs;
             }
-            CGPathAddCurveToPoint( xPath, pTransform, aCP1.getX(), aCP1.getY(),
+            CGPathAddCurveToPoint( xPath, NULL, aCP1.getX(), aCP1.getY(),
                                    aCP2.getX(), aCP2.getY(), aPoint.getX(), aPoint.getY() );
         }
     }


More information about the Libreoffice-commits mailing list