vcl/generic/print/genpspgraphics.cxx | 11 ++++++-----
vcl/headless/svpgdi.cxx | 12 ++++++------
vcl/inc/generic/genpspgraphics.h | 10 +++++-----
vcl/inc/headless/svpgdi.hxx | 10 +++++-----
vcl/inc/quartz/salgdi.h | 10 +++++-----
vcl/inc/salgdi.hxx | 22 +++++++++++-----------
vcl/inc/unx/salgdi.h | 12 ++++++------
vcl/inc/win/salgdi.h | 10 +++++-----
vcl/quartz/salgdicommon.cxx | 34 +++++++++++++++++-----------------
vcl/source/gdi/salgdilayout.cxx | 10 +++++-----
vcl/unx/generic/gdi/salgdi.cxx | 14 +++++++-------
vcl/win/source/gdi/salgdi.cxx | 8 ++++----
vcl/win/source/gdi/salgdi2.cxx | 2 +-
13 files changed, 83 insertions(+), 82 deletions(-)
New commits:
commit 5033fa376f33250eb41d7734c6ff7ffc44201d2d
Author: Herbert Dürr <h...@apache.org>
Date: Tue Dec 17 16:47:23 2013 +0000
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
diff --git a/vcl/generic/print/genpspgraphics.cxx
b/vcl/generic/print/genpspgraphics.cxx
index 02aecef..319ee2a 100644
--- a/vcl/generic/print/genpspgraphics.cxx
+++ b/vcl/generic/print/genpspgraphics.cxx
@@ -428,12 +428,12 @@ void GenPspGraphics::drawRect( long nX, long nY, long
nDX, long nDY )
m_pPrinterGfx->DrawRect (Rectangle(Point(nX, nY), Size(nDX, nDY)));
}
-void GenPspGraphics::drawPolyLine( sal_uLong nPoints, const SalPoint *pPtAry )
+void GenPspGraphics::drawPolyLine( sal_uInt32 nPoints, const SalPoint *pPtAry )
{
m_pPrinterGfx->DrawPolyLine (nPoints, (Point*)pPtAry);
}
-void GenPspGraphics::drawPolygon( sal_uLong nPoints, const SalPoint* pPtAry )
+void GenPspGraphics::drawPolygon( sal_uInt32 nPoints, const SalPoint* pPtAry )
{
// Point must be equal to SalPoint! see vcl/inc/salgtype.hxx
m_pPrinterGfx->DrawPolygon (nPoints, (Point*)pPtAry);
@@ -463,13 +463,13 @@ bool GenPspGraphics::drawPolyLine(
return false;
}
-sal_Bool GenPspGraphics::drawPolyLineBezier( sal_uLong nPoints, const
SalPoint* pPtAry, const sal_uInt8* pFlgAry )
+sal_Bool GenPspGraphics::drawPolyLineBezier( sal_uInt32 nPoints, const
SalPoint* pPtAry, const sal_uInt8* pFlgAry )
{
m_pPrinterGfx->DrawPolyLineBezier (nPoints, (Point*)pPtAry, pFlgAry);
return sal_True;
}
-sal_Bool GenPspGraphics::drawPolygonBezier( sal_uLong nPoints, const SalPoint*
pPtAry, const sal_uInt8* pFlgAry )
+sal_Bool GenPspGraphics::drawPolygonBezier( sal_uInt32 nPoints, const
SalPoint* pPtAry, const sal_uInt8* pFlgAry )
{
m_pPrinterGfx->DrawPolygonBezier (nPoints, (Point*)pPtAry, pFlgAry);
return sal_True;
@@ -485,12 +485,13 @@ sal_Bool GenPspGraphics::drawPolyPolygonBezier(
sal_uInt32 nPoly,
return sal_True;
}
-void GenPspGraphics::invert( sal_uLong,
+void GenPspGraphics::invert( sal_uInt32,
const SalPoint*,
SalInvert )
{
DBG_ASSERT( 0, "Error: PrinterGfx::Invert() not implemented" );
}
+
sal_Bool GenPspGraphics::drawEPS( long nX, long nY, long nWidth, long nHeight,
void* pPtr, sal_uLong nSize )
{
return m_pPrinterGfx->DrawEPS( Rectangle( Point( nX, nY ), Size( nWidth,
nHeight ) ), pPtr, nSize );
diff --git a/vcl/headless/svpgdi.cxx b/vcl/headless/svpgdi.cxx
index 0917f9e..aef1908 100644
--- a/vcl/headless/svpgdi.cxx
+++ b/vcl/headless/svpgdi.cxx
@@ -438,7 +438,7 @@ void SvpSalGraphics::drawRect( long nX, long nY, long
nWidth, long nHeight )
dbgOut( m_aDevice );
}
-void SvpSalGraphics::drawPolyLine( sal_uLong nPoints, const SalPoint* pPtAry )
+void SvpSalGraphics::drawPolyLine( sal_uInt32 nPoints, const SalPoint* pPtAry )
{
if( m_bUseLineColor && nPoints )
{
@@ -453,7 +453,7 @@ void SvpSalGraphics::drawPolyLine( sal_uLong nPoints, const
SalPoint* pPtAry )
dbgOut( m_aDevice );
}
-void SvpSalGraphics::drawPolygon( sal_uLong nPoints, const SalPoint* pPtAry )
+void SvpSalGraphics::drawPolygon( sal_uInt32 nPoints, const SalPoint* pPtAry )
{
if( ( m_bUseLineColor || m_bUseFillColor ) && nPoints )
{
@@ -476,7 +476,7 @@ void SvpSalGraphics::drawPolygon( sal_uLong nPoints, const
SalPoint* pPtAry )
dbgOut( m_aDevice );
}
-void SvpSalGraphics::drawPolyPolygon( sal_uInt32 nPoly,
+void SvpSalGraphics::drawPolyPolygon( sal_uInt32 nPoly,
const sal_uInt32* pPointCounts,
PCONSTSALPOINT* pPtAry )
{
@@ -525,14 +525,14 @@ bool SvpSalGraphics::drawPolyLine(
return false;
}
-sal_Bool SvpSalGraphics::drawPolyLineBezier( sal_uLong,
+sal_Bool SvpSalGraphics::drawPolyLineBezier( sal_uInt32,
const SalPoint*,
const sal_uInt8* )
{
return sal_False;
}
-sal_Bool SvpSalGraphics::drawPolygonBezier( sal_uLong,
+sal_Bool SvpSalGraphics::drawPolygonBezier( sal_uInt32,
const SalPoint*,
const sal_uInt8* )
{
@@ -704,7 +704,7 @@ void SvpSalGraphics::invert( long nX, long nY, long nWidth,
long nHeight, SalInv
dbgOut( m_aDevice );
}
-void SvpSalGraphics::invert( sal_uLong nPoints, const SalPoint* pPtAry,
SalInvert /*nFlags*/ )
+void SvpSalGraphics::invert( sal_uInt32 nPoints, const SalPoint* pPtAry,
SalInvert /*nFlags*/ )
{
// FIXME: handle SAL_INVERT_50 and SAL_INVERT_TRACKFRAME
basegfx::B2DPolygon aPoly;
diff --git a/vcl/inc/generic/genpspgraphics.h b/vcl/inc/generic/genpspgraphics.h
index a80f75c..28ee5c3 100644
--- a/vcl/inc/generic/genpspgraphics.h
+++ b/vcl/inc/generic/genpspgraphics.h
@@ -125,8 +125,8 @@ public:
virtual void drawPixel( long nX, long nY, SalColor nSalColor );
virtual void drawLine( long nX1, long nY1, long nX2, long nY2 );
virtual void drawRect( long nX, long nY, long nWidth, long
nHeight );
- virtual void drawPolyLine( sal_uIntPtr nPoints, const SalPoint*
pPtAry );
- virtual void drawPolygon( sal_uIntPtr nPoints, const SalPoint*
pPtAry );
+ virtual void drawPolyLine( sal_uInt32 nPoints, const SalPoint*
pPtAry );
+ virtual void drawPolygon( sal_uInt32 nPoints, const SalPoint*
pPtAry );
virtual void drawPolyPolygon( sal_uInt32 nPoly,
const sal_uInt32* pPoints,
PCONSTSALPOINT* pPtAry );
@@ -137,10 +137,10 @@ public:
const basegfx::B2DVector& rLineWidths,
basegfx::B2DLineJoin,
com::sun::star::drawing::LineCap);
- virtual sal_Bool drawPolyLineBezier( sal_uIntPtr nPoints,
+ virtual sal_Bool drawPolyLineBezier( sal_uInt32 nPoints,
const SalPoint* pPtAry,
const sal_uInt8* pFlgAry );
- virtual sal_Bool drawPolygonBezier( sal_uIntPtr nPoints,
+ virtual sal_Bool drawPolygonBezier( sal_uInt32 nPoints,
const SalPoint* pPtAry,
const sal_uInt8* pFlgAry );
virtual sal_Bool drawPolyPolygonBezier( sal_uInt32 nPoly,
@@ -170,7 +170,7 @@ public:
virtual SalBitmap* getBitmap( long nX, long nY, long nWidth, long
nHeight );
virtual SalColor getPixel( long nX, long nY );
virtual void invert( long nX, long nY, long nWidth, long
nHeight, SalInvert nFlags );
- virtual void invert( sal_uIntPtr nPoints, const SalPoint*
pPtAry, SalInvert nFlags );
+ virtual void invert( sal_uInt32 nPoints, const SalPoint*
pPtAry, SalInvert nFlags );
virtual sal_Bool drawEPS( long nX, long nY, long nWidth, long
nHeight, void* pPtr, sal_uIntPtr nSize );
virtual bool filterText( const OUString& rOrigText, OUString&
rNewText, sal_Int32 nIndex, sal_Int32& rLen, sal_Int32& rCutStart, sal_Int32&
rCutStop );
diff --git a/vcl/inc/headless/svpgdi.hxx b/vcl/inc/headless/svpgdi.hxx
index c3ffc65..9d006bf 100644
--- a/vcl/inc/headless/svpgdi.hxx
+++ b/vcl/inc/headless/svpgdi.hxx
@@ -189,15 +189,15 @@ public:
const ::basegfx::B2DVector&
rLineWidths,
basegfx::B2DLineJoin,
com::sun::star::drawing::LineCap);
- virtual void drawPolyLine( sal_uLong nPoints, const SalPoint*
pPtAry );
- virtual void drawPolygon( sal_uLong nPoints, const SalPoint*
pPtAry );
+ virtual void drawPolyLine( sal_uInt32 nPoints, const SalPoint*
pPtAry );
+ virtual void drawPolygon( sal_uInt32 nPoints, const SalPoint*
pPtAry );
virtual void drawPolyPolygon( sal_uInt32 nPoly,
const sal_uInt32* pPoints,
PCONSTSALPOINT* pPtAry );
- virtual sal_Bool drawPolyLineBezier( sal_uLong nPoints,
+ virtual sal_Bool drawPolyLineBezier( sal_uInt32 nPoints,
const SalPoint* pPtAry,
const sal_uInt8* pFlgAry );
- virtual sal_Bool drawPolygonBezier( sal_uLong nPoints,
+ virtual sal_Bool drawPolygonBezier( sal_uInt32 nPoints,
const SalPoint* pPtAry,
const sal_uInt8* pFlgAry );
virtual sal_Bool drawPolyPolygonBezier( sal_uInt32 nPoly,
@@ -228,7 +228,7 @@ public:
virtual SalBitmap* getBitmap( long nX, long nY, long nWidth, long
nHeight );
virtual SalColor getPixel( long nX, long nY );
virtual void invert( long nX, long nY, long nWidth, long
nHeight, SalInvert nFlags );
- virtual void invert( sal_uLong nPoints, const SalPoint* pPtAry,
SalInvert nFlags );
+ virtual void invert( sal_uInt32 nPoints, const SalPoint*
pPtAry, SalInvert nFlags );
virtual sal_Bool drawEPS( long nX, long nY, long nWidth, long
nHeight, void* pPtr, sal_uLong nSize );
diff --git a/vcl/inc/quartz/salgdi.h b/vcl/inc/quartz/salgdi.h
index e0b86c3..15e58e1 100644
--- a/vcl/inc/quartz/salgdi.h
+++ b/vcl/inc/quartz/salgdi.h
@@ -224,12 +224,12 @@ public:
virtual void drawPixel( long nX, long nY, SalColor nSalColor );
virtual void drawLine( long nX1, long nY1, long nX2, long nY2 );
virtual void drawRect( long nX, long nY, long nWidth, long nHeight
);
- virtual void drawPolyLine( sal_uLong nPoints, const SalPoint*
pPtAry );
- virtual void drawPolygon( sal_uLong nPoints, const SalPoint* pPtAry
);
+ virtual void drawPolyLine( sal_uInt32 nPoints, const SalPoint*
pPtAry );
+ virtual void drawPolygon( sal_uInt32 nPoints, const SalPoint*
pPtAry );
virtual void drawPolyPolygon( sal_uInt32 nPoly, const sal_uInt32*
pPoints, PCONSTSALPOINT* pPtAry );
virtual bool drawPolyPolygon( const ::basegfx::B2DPolyPolygon&,
double fTransparency );
- virtual sal_Bool drawPolyLineBezier( sal_uLong nPoints, const SalPoint*
pPtAry, const sal_uInt8* pFlgAry );
- virtual sal_Bool drawPolygonBezier( sal_uLong nPoints, const SalPoint*
pPtAry, const sal_uInt8* pFlgAry );
+ virtual sal_Bool drawPolyLineBezier( sal_uInt32 nPoints, const
SalPoint* pPtAry, const sal_uInt8* pFlgAry );
+ virtual sal_Bool drawPolygonBezier( sal_uInt32 nPoints, const SalPoint*
pPtAry, const sal_uInt8* pFlgAry );
virtual sal_Bool drawPolyPolygonBezier( sal_uInt32 nPoly, const
sal_uInt32* pPoints, const SalPoint* const* pPtAry, const sal_uInt8* const*
pFlgAry );
virtual bool drawPolyLine(
const ::basegfx::B2DPolygon&,
@@ -261,7 +261,7 @@ public:
// invert --> ClipRegion (only Windows or VirDevs)
virtual void invert( long nX, long nY, long nWidth, long nHeight,
SalInvert nFlags);
- virtual void invert( sal_uLong nPoints, const SalPoint* pPtAry,
SalInvert nFlags );
+ virtual void invert( sal_uInt32 nPoints, const SalPoint* pPtAry,
SalInvert nFlags );
virtual sal_Bool drawEPS( long nX, long nY, long nWidth, long
nHeight, void* pPtr, sal_uLong nSize );
diff --git a/vcl/inc/salgdi.hxx b/vcl/inc/salgdi.hxx
index abb57bd..e12c5ac 100644
--- a/vcl/inc/salgdi.hxx
+++ b/vcl/inc/salgdi.hxx
@@ -100,8 +100,8 @@ protected:
virtual void drawPixel( long nX, long nY, SalColor nSalColor )
= 0;
virtual void drawLine( long nX1, long nY1, long nX2, long nY2 )
= 0;
virtual void drawRect( long nX, long nY, long nWidth, long
nHeight ) = 0;
- virtual void drawPolyLine( sal_uLong nPoints, const SalPoint*
pPtAry ) = 0;
- virtual void drawPolygon( sal_uLong nPoints, const SalPoint*
pPtAry ) = 0;
+ virtual void drawPolyLine( sal_uInt32 nPoints, const SalPoint*
pPtAry ) = 0;
+ virtual void drawPolygon( sal_uInt32 nPoints, const SalPoint*
pPtAry ) = 0;
virtual void drawPolyPolygon( sal_uInt32 nPoly, const
sal_uInt32* pPoints, PCONSTSALPOINT* pPtAry ) = 0;
virtual bool drawPolyPolygon( const ::basegfx::B2DPolyPolygon&,
double fTransparency ) = 0;
virtual bool drawPolyLine( const ::basegfx::B2DPolygon&,
@@ -109,8 +109,8 @@ protected:
const ::basegfx::B2DVector&
rLineWidths,
basegfx::B2DLineJoin,
com::sun::star::drawing::LineCap) =
0;
- virtual sal_Bool drawPolyLineBezier( sal_uLong nPoints, const
SalPoint* pPtAry, const sal_uInt8* pFlgAry ) = 0;
- virtual sal_Bool drawPolygonBezier( sal_uLong nPoints, const
SalPoint* pPtAry, const sal_uInt8* pFlgAry ) = 0;
+ virtual sal_Bool drawPolyLineBezier( sal_uInt32 nPoints, const
SalPoint* pPtAry, const sal_uInt8* pFlgAry ) = 0;
+ virtual sal_Bool drawPolygonBezier( sal_uInt32 nPoints, const
SalPoint* pPtAry, const sal_uInt8* pFlgAry ) = 0;
virtual sal_Bool drawPolyPolygonBezier( sal_uInt32 nPoly, const
sal_uInt32* pPoints, const SalPoint* const* pPtAry, const sal_uInt8* const*
pFlgAry ) = 0;
// CopyArea --> No RasterOp, but ClipRegion
@@ -135,8 +135,8 @@ protected:
virtual SalColor getPixel( long nX, long nY ) = 0;
// invert --> ClipRegion (only Windows or VirDevs)
- virtual void invert( long nX, long nY, long nWidth, long
nHeight, SalInvert nFlags) = 0;
- virtual void invert( sal_uLong nPoints, const SalPoint* pPtAry,
SalInvert nFlags ) = 0;
+ virtual void invert( long nX, long nY, long nWidth, long nHeight,
SalInvert nFlags) = 0;
+ virtual void invert( sal_uInt32 nPoints, const SalPoint* pPtAry,
SalInvert nFlags ) = 0;
virtual sal_Bool drawEPS( long nX, long nY, long nWidth, long
nHeight, void* pPtr, sal_uLong nSize ) = 0;
@@ -368,8 +368,8 @@ public:
void DrawPixel( long nX, long nY, SalColor nSalColor,
const OutputDevice *pOutDev );
void DrawLine( long nX1, long nY1, long nX2, long nY2,
const OutputDevice *pOutDev );
void DrawRect( long nX, long nY, long nWidth, long
nHeight, const OutputDevice *pOutDev );
- void DrawPolyLine( sal_uLong nPoints, const SalPoint*
pPtAry, const OutputDevice *pOutDev );
- void DrawPolygon( sal_uLong nPoints, const SalPoint*
pPtAry, const OutputDevice *pOutDev );
+ void DrawPolyLine( sal_uInt32 nPoints, const SalPoint*
pPtAry, const OutputDevice *pOutDev );
+ void DrawPolygon( sal_uInt32 nPoints, const SalPoint*
pPtAry, const OutputDevice *pOutDev );
void DrawPolyPolygon( sal_uInt32 nPoly,
const sal_uInt32* pPoints,
PCONSTSALPOINT* pPtAry,
@@ -383,11 +383,11 @@ public:
com::sun::star::drawing::LineCap
i_eLineCap,
const OutputDevice* i_pOutDev);
- sal_Bool DrawPolyLineBezier( sal_uLong nPoints,
+ sal_Bool DrawPolyLineBezier( sal_uInt32 nPoints,
const SalPoint* pPtAry,
const sal_uInt8* pFlgAry,
const OutputDevice *pOutDev );
- sal_Bool DrawPolygonBezier( sal_uLong nPoints,
+ sal_Bool DrawPolygonBezier( sal_uInt32 nPoints,
const SalPoint* pPtAry,
const sal_uInt8* pFlgAry,
const OutputDevice *pOutDev );
@@ -436,7 +436,7 @@ public:
SalInvert nFlags,
const OutputDevice *pOutDev );
- void Invert( sal_uLong nPoints,
+ void Invert( sal_uInt32 nPoints,
const SalPoint* pPtAry,
SalInvert nFlags,
const OutputDevice *pOutDev );
diff --git a/vcl/inc/unx/salgdi.h b/vcl/inc/unx/salgdi.h
index 68ca728..ddadb55 100644
--- a/vcl/inc/unx/salgdi.h
+++ b/vcl/inc/unx/salgdi.h
@@ -261,9 +261,9 @@ public:
virtual void drawPixel( long nX, long nY, SalColor nSalColor );
virtual void drawLine( long nX1, long nY1, long nX2, long nY2 );
virtual void drawRect( long nX, long nY, long nWidth, long
nHeight );
- void drawPolyLine( sal_uIntPtr nPoints, const SalPoint*
pPtAry, bool bClose );
- virtual void drawPolyLine( sal_uIntPtr nPoints, const SalPoint*
pPtAry );
- virtual void drawPolygon( sal_uIntPtr nPoints, const SalPoint*
pPtAry );
+ void drawPolyLine( sal_uInt32 nPoints, const SalPoint*
pPtAry, bool bClose );
+ virtual void drawPolyLine( sal_uInt32 nPoints, const SalPoint*
pPtAry );
+ virtual void drawPolygon( sal_uInt32 nPoints, const SalPoint*
pPtAry );
virtual void drawPolyPolygon( sal_uInt32 nPoly,
const sal_uInt32* pPoints,
PCONSTSALPOINT* pPtAry );
@@ -277,10 +277,10 @@ public:
virtual bool drawFilledTrapezoids( const
::basegfx::B2DTrapezoid*, int nTrapCount, double fTransparency );
#if 1 // TODO: remove these obselete methods
- virtual sal_Bool drawPolyLineBezier( sal_uIntPtr nPoints,
+ virtual sal_Bool drawPolyLineBezier( sal_uInt32 nPoints,
const SalPoint* pPtAry,
const sal_uInt8* pFlgAry );
- virtual sal_Bool drawPolygonBezier( sal_uIntPtr nPoints,
+ virtual sal_Bool drawPolygonBezier( sal_uInt32 nPoints,
const SalPoint* pPtAry,
const sal_uInt8* pFlgAry );
virtual sal_Bool drawPolyPolygonBezier( sal_uInt32 nPoly,
@@ -312,7 +312,7 @@ public:
virtual SalBitmap* getBitmap( long nX, long nY, long nWidth, long
nHeight );
virtual SalColor getPixel( long nX, long nY );
virtual void invert( long nX, long nY, long nWidth, long
nHeight, SalInvert nFlags );
- virtual void invert( sal_uIntPtr nPoints, const SalPoint*
pPtAry, SalInvert nFlags );
+ virtual void invert( sal_uInt32 nPoints, const SalPoint*
pPtAry, SalInvert nFlags );
virtual sal_Bool drawEPS( long nX, long nY, long nWidth, long
nHeight, void* pPtr, sal_uIntPtr nSize );
diff --git a/vcl/inc/win/salgdi.h b/vcl/inc/win/salgdi.h
index 13a9a64..bd9483a 100644
--- a/vcl/inc/win/salgdi.h
+++ b/vcl/inc/win/salgdi.h
@@ -204,8 +204,8 @@ protected:
virtual void drawPixel( long nX, long nY, SalColor nSalColor );
virtual void drawLine( long nX1, long nY1, long nX2, long nY2 );
virtual void drawRect( long nX, long nY, long nWidth, long nHeight
);
- virtual void drawPolyLine( sal_uIntPtr nPoints, const SalPoint*
pPtAry );
- virtual void drawPolygon( sal_uIntPtr nPoints, const SalPoint*
pPtAry );
+ virtual void drawPolyLine( sal_uInt32 nPoints, const SalPoint*
pPtAry );
+ virtual void drawPolygon( sal_uInt32 nPoints, const SalPoint*
pPtAry );
virtual void drawPolyPolygon( sal_uInt32 nPoly, const sal_uInt32*
pPoints, PCONSTSALPOINT* pPtAry );
virtual bool drawPolyPolygon( const ::basegfx::B2DPolyPolygon&,
double fTransparency );
virtual bool drawPolyLine(
@@ -214,8 +214,8 @@ protected:
const ::basegfx::B2DVector& rLineWidth,
basegfx::B2DLineJoin,
com::sun::star::drawing::LineCap);
- virtual sal_Bool drawPolyLineBezier( sal_uIntPtr nPoints, const
SalPoint* pPtAry, const sal_uInt8* pFlgAry );
- virtual sal_Bool drawPolygonBezier( sal_uIntPtr nPoints, const
SalPoint* pPtAry, const sal_uInt8* pFlgAry );
+ virtual sal_Bool drawPolyLineBezier( sal_uInt32 nPoints, const
SalPoint* pPtAry, const sal_uInt8* pFlgAry );
+ virtual sal_Bool drawPolygonBezier( sal_uInt32 nPoints, const SalPoint*
pPtAry, const sal_uInt8* pFlgAry );
virtual sal_Bool drawPolyPolygonBezier( sal_uInt32 nPoly, const
sal_uInt32* pPoints, const SalPoint* const* pPtAry, const BYTE* const* pFlgAry
);
// CopyArea --> No RasterOp, but ClipRegion
@@ -241,7 +241,7 @@ protected:
// invert --> ClipRegion (only Windows or VirDevs)
virtual void invert( long nX, long nY, long nWidth, long nHeight,
SalInvert nFlags);
- virtual void invert( sal_uIntPtr nPoints, const SalPoint* pPtAry,
SalInvert nFlags );
+ virtual void invert( sal_uInt32 nPoints, const SalPoint* pPtAry,
SalInvert nFlags );
virtual sal_Bool drawEPS( long nX, long nY, long nWidth, long
nHeight, void* pPtr, sal_uIntPtr nSize );
diff --git a/vcl/quartz/salgdicommon.cxx b/vcl/quartz/salgdicommon.cxx
index d5c1f88..57e8eb1 100644
--- a/vcl/quartz/salgdicommon.cxx
+++ b/vcl/quartz/salgdicommon.cxx
@@ -398,13 +398,13 @@ static void DrawPattern50( void*, CGContextRef rContext )
CGContextFillPath( rContext );
}
-static void getBoundRect( sal_uLong nPoints, const SalPoint *pPtAry, long &rX,
long& rY, long& rWidth, long& rHeight )
+static void getBoundRect( sal_uInt32 nPoints, const SalPoint *pPtAry, long
&rX, long& rY, long& rWidth, long& rHeight )
{
long nX1 = pPtAry->mnX;
long nX2 = nX1;
long nY1 = pPtAry->mnY;
long nY2 = nY1;
- for( sal_uLong n = 1; n < nPoints; n++ )
+ for( sal_uInt32 n = 1; n < nPoints; n++ )
{
if( pPtAry[n].mnX < nX1 )
{
@@ -872,7 +872,7 @@ bool AquaSalGraphics::drawPolyLine(
return true;
}
-sal_Bool AquaSalGraphics::drawPolyLineBezier( sal_uLong, const SalPoint*,
const sal_uInt8* )
+sal_Bool AquaSalGraphics::drawPolyLineBezier( sal_uInt32, const SalPoint*,
const sal_uInt8* )
{
return sal_False;
}
@@ -933,7 +933,7 @@ void AquaSalGraphics::drawPolyPolygon( sal_uInt32
nPolyCount, const sal_uInt32 *
// find bound rect
long leftX = 0, topY = 0, maxWidth = 0, maxHeight = 0;
getBoundRect( pPoints[0], ppPtAry[0], leftX, topY, maxWidth, maxHeight );
- for( sal_uLong n = 1; n < nPolyCount; n++ )
+ for( sal_uInt32 n = 1; n < nPolyCount; n++ )
{
long nX = leftX, nY = topY, nW = maxWidth, nH = maxHeight;
getBoundRect( pPoints[n], ppPtAry[n], nX, nY, nW, nH );
@@ -979,9 +979,9 @@ void AquaSalGraphics::drawPolyPolygon( sal_uInt32
nPolyCount, const sal_uInt32 *
CGContextBeginPath( mrContext );
if( IsPenVisible() )
{
- for( sal_uLong nPoly = 0; nPoly < nPolyCount; nPoly++ )
+ for( sal_uInt32 nPoly = 0; nPoly < nPolyCount; nPoly++ )
{
- const sal_uLong nPoints = pPoints[nPoly];
+ const sal_uInt32 nPoints = pPoints[nPoly];
if( nPoints > 1 )
{
const SalPoint *pPtAry = ppPtAry[nPoly];
@@ -989,7 +989,7 @@ void AquaSalGraphics::drawPolyPolygon( sal_uInt32
nPolyCount, const sal_uInt32 *
alignLinePoint( pPtAry, fX, fY );
CGContextMoveToPoint( mrContext, fX, fY );
pPtAry++;
- for( sal_uLong nPoint = 1; nPoint < nPoints; nPoint++,
pPtAry++ )
+ for( sal_uInt32 nPoint = 1; nPoint < nPoints; nPoint++,
pPtAry++ )
{
alignLinePoint( pPtAry, fX, fY );
CGContextAddLineToPoint( mrContext, fX, fY );
@@ -1000,15 +1000,15 @@ void AquaSalGraphics::drawPolyPolygon( sal_uInt32
nPolyCount, const sal_uInt32 *
}
else
{
- for( sal_uLong nPoly = 0; nPoly < nPolyCount; nPoly++ )
+ for( sal_uInt32 nPoly = 0; nPoly < nPolyCount; nPoly++ )
{
- const sal_uLong nPoints = pPoints[nPoly];
+ const sal_uInt32 nPoints = pPoints[nPoly];
if( nPoints > 1 )
{
const SalPoint *pPtAry = ppPtAry[nPoly];
CGContextMoveToPoint( mrContext, pPtAry->mnX, pPtAry->mnY );
pPtAry++;
- for( sal_uLong nPoint = 1; nPoint < nPoints; nPoint++,
pPtAry++ )
+ for( sal_uInt32 nPoint = 1; nPoint < nPoints; nPoint++,
pPtAry++ )
{
CGContextAddLineToPoint( mrContext, pPtAry->mnX,
pPtAry->mnY );
}
@@ -1022,7 +1022,7 @@ void AquaSalGraphics::drawPolyPolygon( sal_uInt32
nPolyCount, const sal_uInt32 *
RefreshRect( leftX, topY, maxWidth, maxHeight );
}
-void AquaSalGraphics::drawPolygon( sal_uLong nPoints, const SalPoint *pPtAry )
+void AquaSalGraphics::drawPolygon( sal_uInt32 nPoints, const SalPoint *pPtAry )
{
if( nPoints <= 1 )
return;
@@ -1057,7 +1057,7 @@ void AquaSalGraphics::drawPolygon( sal_uLong nPoints,
const SalPoint *pPtAry )
alignLinePoint( pPtAry, fX, fY );
CGContextMoveToPoint( mrContext, fX, fY );
pPtAry++;
- for( sal_uLong nPoint = 1; nPoint < nPoints; nPoint++, pPtAry++ )
+ for( sal_uInt32 nPoint = 1; nPoint < nPoints; nPoint++, pPtAry++ )
{
alignLinePoint( pPtAry, fX, fY );
CGContextAddLineToPoint( mrContext, fX, fY );
@@ -1067,7 +1067,7 @@ void AquaSalGraphics::drawPolygon( sal_uLong nPoints,
const SalPoint *pPtAry )
{
CGContextMoveToPoint( mrContext, pPtAry->mnX, pPtAry->mnY );
pPtAry++;
- for( sal_uLong nPoint = 1; nPoint < nPoints; nPoint++, pPtAry++ )
+ for( sal_uInt32 nPoint = 1; nPoint < nPoints; nPoint++, pPtAry++ )
{
CGContextAddLineToPoint( mrContext, pPtAry->mnX, pPtAry->mnY );
}
@@ -1078,7 +1078,7 @@ void AquaSalGraphics::drawPolygon( sal_uLong nPoints,
const SalPoint *pPtAry )
RefreshRect( nX, nY, nWidth, nHeight );
}
-sal_Bool AquaSalGraphics::drawPolygonBezier( sal_uLong, const SalPoint*, const
sal_uInt8* )
+sal_Bool AquaSalGraphics::drawPolygonBezier( sal_uInt32, const SalPoint*,
const sal_uInt8* )
{
return sal_False;
}
@@ -1116,7 +1116,7 @@ void AquaSalGraphics::drawRect( long nX, long nY, long
nWidth, long nHeight )
}
-void AquaSalGraphics::drawPolyLine( sal_uLong nPoints, const SalPoint *pPtAry )
+void AquaSalGraphics::drawPolyLine( sal_uInt32 nPoints, const SalPoint *pPtAry
)
{
if( nPoints < 1 )
{
@@ -1135,7 +1135,7 @@ void AquaSalGraphics::drawPolyLine( sal_uLong nPoints,
const SalPoint *pPtAry )
alignLinePoint( pPtAry, fX, fY );
CGContextMoveToPoint( mrContext, fX, fY );
pPtAry++;
- for( sal_uLong nPoint = 1; nPoint < nPoints; nPoint++, pPtAry++ )
+ for( sal_uInt32 nPoint = 1; nPoint < nPoints; nPoint++, pPtAry++ )
{
alignLinePoint( pPtAry, fX, fY );
CGContextAddLineToPoint( mrContext, fX, fY );
@@ -1391,7 +1391,7 @@ void AquaSalGraphics::invert( long nX, long nY, long
nWidth, long nHeight, SalIn
}
}
-void AquaSalGraphics::invert( sal_uLong nPoints, const SalPoint* pPtAry,
SalInvert nSalFlags )
+void AquaSalGraphics::invert( sal_uInt32 nPoints, const SalPoint* pPtAry,
SalInvert nSalFlags )
{
CGPoint* CGpoints ;
if ( CheckContext() )
diff --git a/vcl/source/gdi/salgdilayout.cxx b/vcl/source/gdi/salgdilayout.cxx
index 3d34a5f..27193e8 100644
--- a/vcl/source/gdi/salgdilayout.cxx
+++ b/vcl/source/gdi/salgdilayout.cxx
@@ -416,7 +416,7 @@ void SalGraphics::DrawRect( long nX, long nY, long
nWidth, long nHeight, cons
drawRect( nX, nY, nWidth, nHeight );
}
-void SalGraphics::DrawPolyLine( sal_uLong nPoints, const SalPoint* pPtAry,
const OutputDevice *pOutDev )
+void SalGraphics::DrawPolyLine( sal_uInt32 nPoints, const SalPoint* pPtAry,
const OutputDevice *pOutDev )
{
if( (m_nLayout & SAL_LAYOUT_BIDI_RTL) || (pOutDev &&
pOutDev->IsRTLEnabled()) )
{
@@ -429,7 +429,7 @@ void SalGraphics::DrawPolyLine( sal_uLong nPoints, const
SalPoint* pPtAry, const
drawPolyLine( nPoints, pPtAry );
}
-void SalGraphics::DrawPolygon( sal_uLong nPoints, const SalPoint* pPtAry,
const OutputDevice *pOutDev )
+void SalGraphics::DrawPolygon( sal_uInt32 nPoints, const SalPoint* pPtAry,
const OutputDevice *pOutDev )
{
if( (m_nLayout & SAL_LAYOUT_BIDI_RTL) || (pOutDev &&
pOutDev->IsRTLEnabled()) )
{
@@ -479,7 +479,7 @@ bool SalGraphics::DrawPolyPolygon( const
::basegfx::B2DPolyPolygon& i_rPolyPolyg
return bRet;
}
-sal_Bool SalGraphics::DrawPolyLineBezier( sal_uLong nPoints, const SalPoint*
pPtAry, const sal_uInt8* pFlgAry, const OutputDevice* pOutDev )
+sal_Bool SalGraphics::DrawPolyLineBezier( sal_uInt32 nPoints, const SalPoint*
pPtAry, const sal_uInt8* pFlgAry, const OutputDevice* pOutDev )
{
sal_Bool bResult = sal_False;
if( (m_nLayout & SAL_LAYOUT_BIDI_RTL) || (pOutDev &&
pOutDev->IsRTLEnabled()) )
@@ -494,7 +494,7 @@ sal_Bool SalGraphics::DrawPolyLineBezier( sal_uLong
nPoints, const SalPoint* pPt
return bResult;
}
-sal_Bool SalGraphics::DrawPolygonBezier( sal_uLong nPoints, const SalPoint*
pPtAry, const sal_uInt8* pFlgAry, const OutputDevice* pOutDev )
+sal_Bool SalGraphics::DrawPolygonBezier( sal_uInt32 nPoints, const SalPoint*
pPtAry, const sal_uInt8* pFlgAry, const OutputDevice* pOutDev )
{
sal_Bool bResult = sal_False;
if( (m_nLayout & SAL_LAYOUT_BIDI_RTL) || (pOutDev &&
pOutDev->IsRTLEnabled()) )
@@ -639,7 +639,7 @@ void SalGraphics::Invert( long nX, long nY, long nWidth,
long nHeight, SalInv
mirror( nX, nWidth, pOutDev );
invert( nX, nY, nWidth, nHeight, nFlags );
}
-void SalGraphics::Invert( sal_uLong nPoints, const SalPoint* pPtAry,
SalInvert nFlags, const OutputDevice *pOutDev )
+void SalGraphics::Invert( sal_uInt32 nPoints, const SalPoint* pPtAry,
SalInvert nFlags, const OutputDevice *pOutDev )
{
if( (m_nLayout & SAL_LAYOUT_BIDI_RTL) || (pOutDev &&
pOutDev->IsRTLEnabled()) )
{
diff --git a/vcl/unx/generic/gdi/salgdi.cxx b/vcl/unx/generic/gdi/salgdi.cxx
index feba94a..2c3c160 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 )
{
diff --git a/vcl/win/source/gdi/salgdi.cxx b/vcl/win/source/gdi/salgdi.cxx
index 920648c..591909f 100644
--- a/vcl/win/source/gdi/salgdi.cxx
+++ b/vcl/win/source/gdi/salgdi.cxx
@@ -1395,7 +1395,7 @@ void WinSalGraphics::drawRect( long nX, long nY, long
nWidth, long nHeight )
// -----------------------------------------------------------------------
-void WinSalGraphics::drawPolyLine( sal_uLong nPoints, const SalPoint* pPtAry )
+void WinSalGraphics::drawPolyLine( sal_uInt32 nPoints, const SalPoint* pPtAry )
{
// for NT, we can handover the array directly
DBG_ASSERT( sizeof( POINT ) == sizeof( SalPoint ),
@@ -1444,7 +1444,7 @@ void WinSalGraphics::drawPolyLine( sal_uLong nPoints,
const SalPoint* pPtAry )
// -----------------------------------------------------------------------
-void WinSalGraphics::drawPolygon( sal_uLong nPoints, const SalPoint* pPtAry )
+void WinSalGraphics::drawPolygon( sal_uInt32 nPoints, const SalPoint* pPtAry )
{
// for NT, we can handover the array directly
DBG_ASSERT( sizeof( POINT ) == sizeof( SalPoint ),
@@ -1531,7 +1531,7 @@ void WinSalGraphics::drawPolyPolygon( sal_uInt32 nPoly,
const sal_uInt32* pPoint
// -----------------------------------------------------------------------
-sal_Bool WinSalGraphics::drawPolyLineBezier( sal_uLong nPoints, const
SalPoint* pPtAry, const BYTE* pFlgAry )
+sal_Bool WinSalGraphics::drawPolyLineBezier( sal_uInt32 nPoints, const
SalPoint* pPtAry, const BYTE* pFlgAry )
{
#ifdef USE_GDI_BEZIERS
// for NT, we can handover the array directly
@@ -1548,7 +1548,7 @@ sal_Bool WinSalGraphics::drawPolyLineBezier( sal_uLong
nPoints, const SalPoint*
// -----------------------------------------------------------------------
-sal_Bool WinSalGraphics::drawPolygonBezier( sal_uLong nPoints, const SalPoint*
pPtAry, const BYTE* pFlgAry )
+sal_Bool WinSalGraphics::drawPolygonBezier( sal_uInt32 nPoints, const
SalPoint* pPtAry, const BYTE* pFlgAry )
{
#ifdef USE_GDI_BEZIERS
// for NT, we can handover the array directly
diff --git a/vcl/win/source/gdi/salgdi2.cxx b/vcl/win/source/gdi/salgdi2.cxx
index 1c8c43a..9e85379 100644
--- a/vcl/win/source/gdi/salgdi2.cxx
+++ b/vcl/win/source/gdi/salgdi2.cxx
@@ -785,7 +785,7 @@ void WinSalGraphics::invert( long nX, long nY, long nWidth,
long nHeight, SalInv
// -----------------------------------------------------------------------
-void WinSalGraphics::invert( sal_uLong nPoints, const SalPoint* pPtAry,
SalInvert nSalFlags )
+void WinSalGraphics::invert( sal_uInt32 nPoints, const SalPoint* pPtAry,
SalInvert nSalFlags )
{
HPEN hPen;
HPEN hOldPen;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
