summaryrefslogtreecommitdiff
path: root/vcl/unx/generic/gdi
diff options
context:
space:
mode:
authorHerbert Dürr <hdu@apache.org>2013-12-17 16:47:23 +0000
committerCaolán McNamara <caolanm@redhat.com>2013-12-31 10:45:02 +0000
commit5033fa376f33250eb41d7734c6ff7ffc44201d2d (patch)
tree6064028de49d30785665236eaa08335ff92ee02f /vcl/unx/generic/gdi
parentd6f9ddb0aaa3fd9e3877f94a3147c68dd64bc77e (diff)
Resolves: #i123840# normalize SalGraphics point count argument types...
to sal_uInt32 The old mixture of sal_uInt32, ULONG, sal_uLong, sal_uIntPtr gets consolidated. 4e9 points are more than enough for a SalGraphics. (cherry picked from commit 03f5dce97331acc1a5e832f956d711a5dc0aac0e) Conflicts: vcl/aqua/source/gdi/salgdi.cxx vcl/generic/print/genpspgraphics.cxx vcl/inc/os2/salgdi.h vcl/inc/quartz/salgdi.h vcl/inc/salgdi.hxx vcl/os2/source/gdi/salgdi.cxx vcl/os2/source/gdi/salgdi2.cxx vcl/source/gdi/salgdilayout.cxx vcl/unx/generic/gdi/salgdi.cxx vcl/unx/headless/svpgdi.hxx vcl/unx/headless/svppspgraphics.cxx vcl/unx/headless/svppspgraphics.hxx Change-Id: Iddf806256c7e5403158635e3f5f0049e9382500f
Diffstat (limited to 'vcl/unx/generic/gdi')
-rw-r--r--vcl/unx/generic/gdi/salgdi.cxx14
1 files changed, 7 insertions, 7 deletions
diff --git a/vcl/unx/generic/gdi/salgdi.cxx b/vcl/unx/generic/gdi/salgdi.cxx
index feba94a7ae87..2c3c160d20bb 100644
--- a/vcl/unx/generic/gdi/salgdi.cxx
+++ b/vcl/unx/generic/gdi/salgdi.cxx
@@ -800,12 +800,12 @@ void X11SalGraphics::drawRect( long nX, long nY, long nDX, long nDY )
nX, nY, nDX-1, nDY-1 );
}
-void X11SalGraphics::drawPolyLine( sal_uLong nPoints, const SalPoint *pPtAry )
+void X11SalGraphics::drawPolyLine( sal_uInt32 nPoints, const SalPoint *pPtAry )
{
drawPolyLine( nPoints, pPtAry, false );
}
-void X11SalGraphics::drawPolyLine( sal_uLong nPoints, const SalPoint *pPtAry, bool bClose )
+void X11SalGraphics::drawPolyLine( sal_uInt32 nPoints, const SalPoint *pPtAry, bool bClose )
{
if( nPenColor_ != SALCOLOR_NONE )
{
@@ -815,7 +815,7 @@ void X11SalGraphics::drawPolyLine( sal_uLong nPoints, const SalPoint *pPtAry, bo
}
}
-void X11SalGraphics::drawPolygon( sal_uLong nPoints, const SalPoint* pPtAry )
+void X11SalGraphics::drawPolygon( sal_uInt32 nPoints, const SalPoint* pPtAry )
{
if( nPoints == 0 )
return;
@@ -881,7 +881,7 @@ void X11SalGraphics::drawPolygon( sal_uLong nPoints, const SalPoint* pPtAry )
DrawLines( nPoints, Points, SelectPen(), true );
}
-void X11SalGraphics::drawPolyPolygon( sal_uInt32 nPoly,
+void X11SalGraphics::drawPolyPolygon( sal_uInt32 nPoly,
const sal_uInt32 *pPoints,
PCONSTSALPOINT *pPtAry )
{
@@ -928,12 +928,12 @@ void X11SalGraphics::drawPolyPolygon( sal_uInt32 nPoly,
drawPolyLine( pPoints[i], pPtAry[i], true );
}
-sal_Bool X11SalGraphics::drawPolyLineBezier( sal_uLong, const SalPoint*, const sal_uInt8* )
+sal_Bool X11SalGraphics::drawPolyLineBezier( sal_uInt32, const SalPoint*, const sal_uInt8* )
{
return sal_False;
}
-sal_Bool X11SalGraphics::drawPolygonBezier( sal_uLong, const SalPoint*, const sal_uInt8* )
+sal_Bool X11SalGraphics::drawPolygonBezier( sal_uInt32, const SalPoint*, const sal_uInt8* )
{
return sal_False;
}
@@ -944,7 +944,7 @@ sal_Bool X11SalGraphics::drawPolyPolygonBezier( sal_uInt32, const sal_uInt32*,
return sal_False;
}
-void X11SalGraphics::invert( sal_uLong nPoints,
+void X11SalGraphics::invert( sal_uInt32 nPoints,
const SalPoint* pPtAry,
SalInvert nFlags )
{