remove SalPoint

<caolan> that "SalPoint" doesn't really seem to to have a purpose
except to highlight that "Point" is assumed to use LONG under windows
and can be passed unchanged to those windows drawing apis
<caolan> so I guess remove SalPoint entirely, use Point instead,
and convert to "POINT" under windows ?

Change-Id: Ic15a7f4516e2075a228fa65cac4e8494d5b3abaa
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105634
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>

1 files changed, 16 insertions, 16 deletions

diff --git a/vcl/headless/svpgdi.cxx b/vcl/headless/svpgdi.cxx
index d878527562c2..40e2ad1542b1 100644
--- a/vcl/headless/svpgdi.cxx
+++ b/vcl/headless/svpgdi.cxx
@@ -1082,12 +1082,12 @@ void SvpSalGraphics::drawRect( tools::Long nX, tools::Long nY, tools::Long nWidt
     m_aLineColor = aOrigLineColor;
 }
 
-void SvpSalGraphics::drawPolyLine(sal_uInt32 nPoints, const SalPoint* pPtAry)
+void SvpSalGraphics::drawPolyLine(sal_uInt32 nPoints, const Point* pPtAry)
 {
     basegfx::B2DPolygon aPoly;
-    aPoly.append(basegfx::B2DPoint(pPtAry->mnX, pPtAry->mnY), nPoints);
+    aPoly.append(basegfx::B2DPoint(pPtAry->getX(), pPtAry->getY()), nPoints);
     for (sal_uInt32 i = 1; i < nPoints; ++i)
-        aPoly.setB2DPoint(i, basegfx::B2DPoint(pPtAry[i].mnX, pPtAry[i].mnY));
+        aPoly.setB2DPoint(i, basegfx::B2DPoint(pPtAry[i].getX(), pPtAry[i].getY()));
     aPoly.setClosed(false);
 
     drawPolyLine(
@@ -1102,12 +1102,12 @@ void SvpSalGraphics::drawPolyLine(sal_uInt32 nPoints, const SalPoint* pPtAry)
         false);
 }
 
-void SvpSalGraphics::drawPolygon(sal_uInt32 nPoints, const SalPoint* pPtAry)
+void SvpSalGraphics::drawPolygon(sal_uInt32 nPoints, const Point* pPtAry)
 {
     basegfx::B2DPolygon aPoly;
-    aPoly.append(basegfx::B2DPoint(pPtAry->mnX, pPtAry->mnY), nPoints);
+    aPoly.append(basegfx::B2DPoint(pPtAry->getX(), pPtAry->getY()), nPoints);
     for (sal_uInt32 i = 1; i < nPoints; ++i)
-        aPoly.setB2DPoint(i, basegfx::B2DPoint(pPtAry[i].mnX, pPtAry[i].mnY));
+        aPoly.setB2DPoint(i, basegfx::B2DPoint(pPtAry[i].getX(), pPtAry[i].getY()));
 
     drawPolyPolygon(
         basegfx::B2DHomMatrix(),
@@ -1117,7 +1117,7 @@ void SvpSalGraphics::drawPolygon(sal_uInt32 nPoints, const SalPoint* pPtAry)
 
 void SvpSalGraphics::drawPolyPolygon(sal_uInt32 nPoly,
                                      const sal_uInt32* pPointCounts,
-                                     PCONSTSALPOINT*   pPtAry)
+                                     const Point**   pPtAry)
 {
     basegfx::B2DPolyPolygon aPolyPoly;
     for(sal_uInt32 nPolygon = 0; nPolygon < nPoly; ++nPolygon)
@@ -1125,11 +1125,11 @@ void SvpSalGraphics::drawPolyPolygon(sal_uInt32 nPoly,
         sal_uInt32 nPoints = pPointCounts[nPolygon];
         if (nPoints)
         {
-            PCONSTSALPOINT pPoints = pPtAry[nPolygon];
+            const Point* pPoints = pPtAry[nPolygon];
             basegfx::B2DPolygon aPoly;
-            aPoly.append( basegfx::B2DPoint(pPoints->mnX, pPoints->mnY), nPoints);
+            aPoly.append( basegfx::B2DPoint(pPoints->getX(), pPoints->getY()), nPoints);
             for (sal_uInt32 i = 1; i < nPoints; ++i)
-                aPoly.setB2DPoint(i, basegfx::B2DPoint( pPoints[i].mnX, pPoints[i].mnY));
+                aPoly.setB2DPoint(i, basegfx::B2DPoint( pPoints[i].getX(), pPoints[i].getY()));
 
             aPolyPoly.append(aPoly);
         }
@@ -1772,7 +1772,7 @@ bool SvpSalGraphics::drawPolyLine(
 }
 
 bool SvpSalGraphics::drawPolyLineBezier( sal_uInt32,
-                                         const SalPoint*,
+                                         const Point*,
                                          const PolyFlags* )
 {
     SAL_INFO("vcl.gdi", "unsupported SvpSalGraphics::drawPolyLineBezier case");
@@ -1780,7 +1780,7 @@ bool SvpSalGraphics::drawPolyLineBezier( sal_uInt32,
 }
 
 bool SvpSalGraphics::drawPolygonBezier( sal_uInt32,
-                                        const SalPoint*,
+                                        const Point*,
                                         const PolyFlags* )
 {
     SAL_INFO("vcl.gdi", "unsupported SvpSalGraphics::drawPolygonBezier case");
@@ -1789,7 +1789,7 @@ bool SvpSalGraphics::drawPolygonBezier( sal_uInt32,
 
 bool SvpSalGraphics::drawPolyPolygonBezier( sal_uInt32,
                                             const sal_uInt32*,
-                                            const SalPoint* const*,
+                                            const Point* const*,
                                             const PolyFlags* const* )
 {
     SAL_INFO("vcl.gdi", "unsupported SvpSalGraphics::drawPolyPolygonBezier case");
@@ -2413,12 +2413,12 @@ void SvpSalGraphics::invert( tools::Long nX, tools::Long nY, tools::Long nWidth,
     invert(aRect, nFlags);
 }
 
-void SvpSalGraphics::invert(sal_uInt32 nPoints, const SalPoint* pPtAry, SalInvert nFlags)
+void SvpSalGraphics::invert(sal_uInt32 nPoints, const Point* pPtAry, SalInvert nFlags)
 {
     basegfx::B2DPolygon aPoly;
-    aPoly.append(basegfx::B2DPoint(pPtAry->mnX, pPtAry->mnY), nPoints);
+    aPoly.append(basegfx::B2DPoint(pPtAry->getX(), pPtAry->getY()), nPoints);
     for (sal_uInt32 i = 1; i < nPoints; ++i)
-        aPoly.setB2DPoint(i, basegfx::B2DPoint(pPtAry[i].mnX, pPtAry[i].mnY));
+        aPoly.setB2DPoint(i, basegfx::B2DPoint(pPtAry[i].getX(), pPtAry[i].getY()));
     aPoly.setClosed(true);
 
     invert(aPoly, nFlags);