Author: hdu
Date: Tue Dec 17 16:47:23 2013
New Revision: 1551617
URL: http://svn.apache.org/r1551617
Log:
#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.
Modified:
openoffice/trunk/main/vcl/aqua/source/gdi/salgdi.cxx
openoffice/trunk/main/vcl/inc/aqua/salgdi.h
openoffice/trunk/main/vcl/inc/os2/salgdi.h
openoffice/trunk/main/vcl/inc/salgdi.hxx
openoffice/trunk/main/vcl/inc/unx/pspgraphics.h
openoffice/trunk/main/vcl/inc/unx/salgdi.h
openoffice/trunk/main/vcl/inc/win/salgdi.h
openoffice/trunk/main/vcl/os2/source/gdi/salgdi.cxx
openoffice/trunk/main/vcl/os2/source/gdi/salgdi2.cxx
openoffice/trunk/main/vcl/source/gdi/salgdilayout.cxx
openoffice/trunk/main/vcl/unx/generic/gdi/pspgraphics.cxx
openoffice/trunk/main/vcl/unx/generic/gdi/salgdi.cxx
openoffice/trunk/main/vcl/unx/headless/svpgdi.cxx
openoffice/trunk/main/vcl/unx/headless/svpgdi.hxx
openoffice/trunk/main/vcl/unx/headless/svppspgraphics.cxx
openoffice/trunk/main/vcl/unx/headless/svppspgraphics.hxx
openoffice/trunk/main/vcl/win/source/gdi/salgdi.cxx
openoffice/trunk/main/vcl/win/source/gdi/salgdi2.cxx
Modified: openoffice/trunk/main/vcl/aqua/source/gdi/salgdi.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/aqua/source/gdi/salgdi.cxx?rev=1551617&r1=1551616&r2=1551617&view=diff
==============================================================================
--- openoffice/trunk/main/vcl/aqua/source/gdi/salgdi.cxx (original)
+++ openoffice/trunk/main/vcl/aqua/source/gdi/salgdi.cxx Tue Dec 17 16:47:23
2013
@@ -744,13 +744,13 @@ void AquaSalGraphics::drawRect( long nX,
// -----------------------------------------------------------------------
-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 )
nX1 = pPtAry[n].mnX;
@@ -774,7 +774,7 @@ static inline void alignLinePoint( const
o_fY = static_cast<float>(i_pIn->mnY ) + 0.5;
}
-void AquaSalGraphics::drawPolyLine( sal_uLong nPoints, const SalPoint *pPtAry )
+void AquaSalGraphics::drawPolyLine( sal_uInt32 nPoints, const SalPoint* pPtAry
)
{
if( nPoints < 1 )
return;
@@ -790,7 +790,7 @@ void AquaSalGraphics::drawPolyLine( sal_
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 );
@@ -802,7 +802,7 @@ void AquaSalGraphics::drawPolyLine( sal_
// -----------------------------------------------------------------------
-void AquaSalGraphics::drawPolygon( sal_uLong nPoints, const SalPoint *pPtAry )
+void AquaSalGraphics::drawPolygon( sal_uInt32 nPoints, const SalPoint* pPtAry )
{
if( nPoints <= 1 )
return;
@@ -830,7 +830,7 @@ void AquaSalGraphics::drawPolygon( sal_u
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 );
@@ -840,7 +840,7 @@ void AquaSalGraphics::drawPolygon( sal_u
{
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 );
}
@@ -850,7 +850,7 @@ void AquaSalGraphics::drawPolygon( sal_u
// -----------------------------------------------------------------------
-void AquaSalGraphics::drawPolyPolygon( sal_uLong nPolyCount, const sal_uLong
*pPoints, PCONSTSALPOINT *ppPtAry )
+void AquaSalGraphics::drawPolyPolygon( sal_uInt32 nPolyCount, const
sal_uInt32* pPoints, PCONSTSALPOINT* ppPtAry )
{
if( nPolyCount <= 0 )
return;
@@ -897,7 +897,7 @@ void AquaSalGraphics::drawPolyPolygon( s
{
for( sal_uLong 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];
@@ -905,7 +905,7 @@ void AquaSalGraphics::drawPolyPolygon( s
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 );
@@ -918,13 +918,13 @@ void AquaSalGraphics::drawPolyPolygon( s
{
for( sal_uLong 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 );
CGContextClosePath(mrContext);
}
@@ -1074,21 +1074,21 @@ bool AquaSalGraphics::drawPolyLine(
// -----------------------------------------------------------------------
-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;
}
// -----------------------------------------------------------------------
-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;
}
// -----------------------------------------------------------------------
-sal_Bool AquaSalGraphics::drawPolyPolygonBezier( sal_uLong, const sal_uLong*,
+sal_Bool AquaSalGraphics::drawPolyPolygonBezier( sal_uInt32, const sal_uInt32*,
const SalPoint* const*, const
sal_uInt8* const* )
{
return sal_False;
@@ -1419,7 +1419,7 @@ void AquaSalGraphics::invert( long nX, l
// -----------------------------------------------------------------------
-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() )
Modified: openoffice/trunk/main/vcl/inc/aqua/salgdi.h
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/inc/aqua/salgdi.h?rev=1551617&r1=1551616&r2=1551617&view=diff
==============================================================================
--- openoffice/trunk/main/vcl/inc/aqua/salgdi.h (original)
+++ openoffice/trunk/main/vcl/inc/aqua/salgdi.h Tue Dec 17 16:47:23 2013
@@ -179,13 +179,13 @@ 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 drawPolyPolygon( sal_uLong nPoly, const
sal_uLong* pPoints, PCONSTSALPOINT* 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 drawPolyPolygonBezier( sal_uLong nPoly, const
sal_uLong* pPoints, const SalPoint* const* pPtAry, const sal_uInt8* const*
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&,
double fTransparency,
@@ -216,7 +216,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 );
Modified: openoffice/trunk/main/vcl/inc/os2/salgdi.h
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/inc/os2/salgdi.h?rev=1551617&r1=1551616&r2=1551617&view=diff
==============================================================================
--- openoffice/trunk/main/vcl/inc/os2/salgdi.h (original)
+++ openoffice/trunk/main/vcl/inc/os2/salgdi.h Tue Dec 17 16:47:23 2013
@@ -162,9 +162,9 @@ 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( ULONG nPoints, const SalPoint*
pPtAry );
- virtual void drawPolygon( ULONG nPoints, const SalPoint*
pPtAry );
- virtual void drawPolyPolygon( ULONG nPoly, const ULONG*
pPoints, PCONSTSALPOINT* 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(
const ::basegfx::B2DPolygon&,
@@ -172,8 +172,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 sal_uInt8* const*
pFlgAry );
// CopyArea --> No RasterOp, but ClipRegion
@@ -199,7 +199,7 @@ protected:
// invert --> ClipRegion (only Windows or VirDevs)
virtual void invert( long nX, long nY, long nWidth, long
nHeight, SalInvert nFlags);
- virtual void invert( 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, ULONG nSize );
Modified: openoffice/trunk/main/vcl/inc/salgdi.hxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/inc/salgdi.hxx?rev=1551617&r1=1551616&r2=1551617&view=diff
==============================================================================
--- openoffice/trunk/main/vcl/inc/salgdi.hxx (original)
+++ openoffice/trunk/main/vcl/inc/salgdi.hxx Tue Dec 17 16:47:23 2013
@@ -117,8 +117,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(
@@ -127,8 +127,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
@@ -154,7 +154,7 @@ protected:
// 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( 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;
@@ -370,8 +370,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,
@@ -386,11 +386,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 );
@@ -438,7 +438,7 @@ public:
// invert --> ClipRegion (only Windows)
void Invert( long nX, long nY, long nWidth, long
nHeight, SalInvert nFlags, const OutputDevice *pOutDev );
- void Invert( sal_uLong nPoints, const SalPoint* pPtAry,
SalInvert nFlags, const OutputDevice *pOutDev );
+ void Invert( sal_uInt32 nPoints, const SalPoint*
pPtAry, SalInvert nFlags, const OutputDevice *pOutDev );
sal_Bool DrawEPS( long nX, long nY, long nWidth, long
nHeight, void* pPtr, sal_uLong nSize, const OutputDevice *pOutDev );
Modified: openoffice/trunk/main/vcl/inc/unx/pspgraphics.h
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/inc/unx/pspgraphics.h?rev=1551617&r1=1551616&r2=1551617&view=diff
==============================================================================
--- openoffice/trunk/main/vcl/inc/unx/pspgraphics.h (original)
+++ openoffice/trunk/main/vcl/inc/unx/pspgraphics.h Tue Dec 17 16:47:23 2013
@@ -130,8 +130,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 );
@@ -142,10 +142,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,
@@ -175,7 +175,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 String& rOrigText, String&
rNewText, xub_StrLen nIndex, xub_StrLen& rLen, xub_StrLen& rCutStart,
xub_StrLen& rCutStop );
Modified: openoffice/trunk/main/vcl/inc/unx/salgdi.h
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/inc/unx/salgdi.h?rev=1551617&r1=1551616&r2=1551617&view=diff
==============================================================================
--- openoffice/trunk/main/vcl/inc/unx/salgdi.h (original)
+++ openoffice/trunk/main/vcl/inc/unx/salgdi.h Tue Dec 17 16:47:23 2013
@@ -277,9 +277,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 );
@@ -293,10 +293,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,
@@ -328,7 +328,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 );
Modified: openoffice/trunk/main/vcl/inc/win/salgdi.h
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/inc/win/salgdi.h?rev=1551617&r1=1551616&r2=1551617&view=diff
==============================================================================
--- openoffice/trunk/main/vcl/inc/win/salgdi.h (original)
+++ openoffice/trunk/main/vcl/inc/win/salgdi.h Tue Dec 17 16:47:23 2013
@@ -190,8 +190,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(
@@ -200,8 +200,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
@@ -227,7 +227,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 );
Modified: openoffice/trunk/main/vcl/os2/source/gdi/salgdi.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/os2/source/gdi/salgdi.cxx?rev=1551617&r1=1551616&r2=1551617&view=diff
==============================================================================
--- openoffice/trunk/main/vcl/os2/source/gdi/salgdi.cxx (original)
+++ openoffice/trunk/main/vcl/os2/source/gdi/salgdi.cxx Tue Dec 17 16:47:23 2013
@@ -504,13 +504,13 @@ void Os2SalGraphics::drawRect( long nX,
// -----------------------------------------------------------------------
-void Os2SalGraphics::drawPolyLine( ULONG nPoints, const SalPoint* pPtAry )
+void Os2SalGraphics::drawPolyLine( sal_uInt32 nPoints, const SalPoint* pPtAry )
{
// convert all points to sys orientation
POINTL* pOS2PtAry = new POINTL[ nPoints ];
POINTL* pTempOS2PtAry = pOS2PtAry;
const SalPoint* pTempPtAry = pPtAry;
- ULONG nTempPoints = nPoints;
+ sal_uInt32 nTempPoints = nPoints;
long nHeight = mnHeight - 1;
while( nTempPoints-- )
@@ -528,7 +528,7 @@ void Os2SalGraphics::drawPolyLine( ULONG
// -----------------------------------------------------------------------
-void Os2SalGraphics::drawPolygon( ULONG nPoints, const SalPoint* pPtAry )
+void Os2SalGraphics::drawPolygon( sal_uInt32 nPoints, const SalPoint* pPtAry )
{
PM_POLYGON aPolygon;
@@ -539,7 +539,7 @@ void Os2SalGraphics::drawPolygon( ULONG
// convert all points to sys orientation
POINTL* pTempOS2PtAry = aPolygon.aPointl;
const SalPoint* pTempPtAry = pPtAry;
- ULONG nTempPoints = nPoints;
+ sal_uInt32 nTempPoints = nPoints;
long nHeight = mnHeight - 1;
while( nTempPoints-- )
@@ -596,7 +596,7 @@ void Os2SalGraphics::drawPolygon( ULONG
// -----------------------------------------------------------------------
-void Os2SalGraphics::drawPolyPolygon( ULONG nPoly, const ULONG* pPoints,
+void Os2SalGraphics::drawPolyPolygon( sal_uInt32 nPoly, const sal_uInt32*
pPoints,
PCONSTSALPOINT* pPtAry )
{
ULONG i;
@@ -694,21 +694,21 @@ bool Os2SalGraphics::drawPolyLine(
// -----------------------------------------------------------------------
-sal_Bool Os2SalGraphics::drawPolyLineBezier( ULONG nPoints, const SalPoint*
pPtAry, const sal_uInt8* pFlgAry )
+sal_Bool Os2SalGraphics::drawPolyLineBezier( sal_uInt32 /*nPoints*/, const
SalPoint* pPtAry, const sal_uInt8* pFlgAry )
{
return sal_False;
}
// -----------------------------------------------------------------------
-sal_Bool Os2SalGraphics::drawPolygonBezier( ULONG nPoints, const SalPoint*
pPtAry, const sal_uInt8* pFlgAry )
+sal_Bool Os2SalGraphics::drawPolygonBezier( sal_uInt32 /*nPoints*/, const
SalPoint* pPtAry, const sal_uInt8* pFlgAry )
{
return sal_False;
}
// -----------------------------------------------------------------------
-sal_Bool Os2SalGraphics::drawPolyPolygonBezier( ULONG nPoly, const ULONG*
pPoints,
+sal_Bool Os2SalGraphics::drawPolyPolygonBezier( sal_uInt32 /*nPoly*/, const
sal_uInt32* /*pPoints*/,
const SalPoint* const* pPtAry,
const sal_uInt8* const* pFlgAry )
{
return sal_False;
Modified: openoffice/trunk/main/vcl/os2/source/gdi/salgdi2.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/os2/source/gdi/salgdi2.cxx?rev=1551617&r1=1551616&r2=1551617&view=diff
==============================================================================
--- openoffice/trunk/main/vcl/os2/source/gdi/salgdi2.cxx (original)
+++ openoffice/trunk/main/vcl/os2/source/gdi/salgdi2.cxx Tue Dec 17 16:47:23
2013
@@ -743,7 +743,7 @@ void Os2SalGraphics::invert( long nX, lo
// -----------------------------------------------------------------------
-void Os2SalGraphics::invert( ULONG nPoints, const SalPoint* pPtAry, SalInvert
nFlags )
+void Os2SalGraphics::invert( sal_uInt32 nPoints, const SalPoint* pPtAry,
SalInvert nFlags )
{
if( nFlags & SAL_INVERT_TRACKFRAME )
{
Modified: openoffice/trunk/main/vcl/source/gdi/salgdilayout.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/source/gdi/salgdilayout.cxx?rev=1551617&r1=1551616&r2=1551617&view=diff
==============================================================================
--- openoffice/trunk/main/vcl/source/gdi/salgdilayout.cxx (original)
+++ openoffice/trunk/main/vcl/source/gdi/salgdilayout.cxx Tue Dec 17 16:47:23
2013
@@ -440,7 +440,7 @@ bool SalGraphics::drawPolyLine(
return false;
}
-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()) )
{
@@ -453,7 +453,7 @@ void SalGraphics::DrawPolyLine( sal_uLon
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()) )
{
@@ -508,7 +508,7 @@ bool SalGraphics::drawPolyPolygon( const
return false;
}
-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()) )
@@ -523,7 +523,7 @@ sal_Bool SalGraphics::DrawPolyLineBezier
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()) )
@@ -681,7 +681,7 @@ void SalGraphics::Invert( long nX, long
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()) )
{
Modified: openoffice/trunk/main/vcl/unx/generic/gdi/pspgraphics.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/unx/generic/gdi/pspgraphics.cxx?rev=1551617&r1=1551616&r2=1551617&view=diff
==============================================================================
--- openoffice/trunk/main/vcl/unx/generic/gdi/pspgraphics.cxx (original)
+++ openoffice/trunk/main/vcl/unx/generic/gdi/pspgraphics.cxx Tue Dec 17
16:47:23 2013
@@ -401,12 +401,12 @@ void PspGraphics::drawRect( long nX, lon
m_pPrinterGfx->DrawRect (Rectangle(Point(nX, nY), Size(nDX, nDY)));
}
-void PspGraphics::drawPolyLine( sal_uLong nPoints, const SalPoint *pPtAry )
+void PspGraphics::drawPolyLine( sal_uInt32 nPoints, const SalPoint *pPtAry )
{
m_pPrinterGfx->DrawPolyLine (nPoints, (Point*)pPtAry);
}
-void PspGraphics::drawPolygon( sal_uLong nPoints, const SalPoint* pPtAry )
+void PspGraphics::drawPolygon( sal_uInt32 nPoints, const SalPoint* pPtAry )
{
// Point must be equal to SalPoint! see vcl/inc/salgtype.hxx
m_pPrinterGfx->DrawPolygon (nPoints, (Point*)pPtAry);
@@ -436,13 +436,13 @@ bool PspGraphics::drawPolyLine(
return false;
}
-sal_Bool PspGraphics::drawPolyLineBezier( sal_uLong nPoints, const SalPoint*
pPtAry, const sal_uInt8* pFlgAry )
+sal_Bool PspGraphics::drawPolyLineBezier( sal_uInt32 nPoints, const SalPoint*
pPtAry, const sal_uInt8* pFlgAry )
{
m_pPrinterGfx->DrawPolyLineBezier (nPoints, (Point*)pPtAry, pFlgAry);
return sal_True;
}
-sal_Bool PspGraphics::drawPolygonBezier( sal_uLong nPoints, const SalPoint*
pPtAry, const sal_uInt8* pFlgAry )
+sal_Bool PspGraphics::drawPolygonBezier( sal_uInt32 nPoints, const SalPoint*
pPtAry, const sal_uInt8* pFlgAry )
{
m_pPrinterGfx->DrawPolygonBezier (nPoints, (Point*)pPtAry, pFlgAry);
return sal_True;
@@ -458,12 +458,11 @@ sal_Bool PspGraphics::drawPolyPolygonBez
return sal_True;
}
-void PspGraphics::invert( sal_uLong,
- const SalPoint*,
- SalInvert )
+void PspGraphics::invert( sal_uInt32, const SalPoint*, SalInvert )
{
DBG_ASSERT( 0, "Error: PrinterGfx::Invert() not implemented" );
}
+
sal_Bool PspGraphics::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 );
Modified: openoffice/trunk/main/vcl/unx/generic/gdi/salgdi.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/unx/generic/gdi/salgdi.cxx?rev=1551617&r1=1551616&r2=1551617&view=diff
==============================================================================
--- openoffice/trunk/main/vcl/unx/generic/gdi/salgdi.cxx (original)
+++ openoffice/trunk/main/vcl/unx/generic/gdi/salgdi.cxx Tue Dec 17 16:47:23
2013
@@ -843,13 +843,13 @@ void X11SalGraphics::drawRect( long nX,
}
// -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-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)
{
@@ -860,7 +860,7 @@ void X11SalGraphics::drawPolyLine( sal_u
}
// -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-void X11SalGraphics::drawPolygon( sal_uLong nPoints, const SalPoint* pPtAry )
+void X11SalGraphics::drawPolygon( sal_uInt32 nPoints, const SalPoint* pPtAry )
{
if( nPoints == 0 )
return;
@@ -927,7 +927,7 @@ void X11SalGraphics::drawPolygon( sal_uL
}
// -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-void X11SalGraphics::drawPolyPolygon( sal_uInt32 nPoly,
+void X11SalGraphics::drawPolyPolygon( sal_uInt32 nPoly,
const
sal_uInt32 *pPoints,
PCONSTSALPOINT *pPtAry )
{
@@ -976,14 +976,14 @@ void X11SalGraphics::drawPolyPolygon( sa
// -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-sal_Bool X11SalGraphics::drawPolyLineBezier( sal_uLong, const SalPoint*, const
BYTE* )
+sal_Bool X11SalGraphics::drawPolyLineBezier( sal_uInt32, const SalPoint*,
const BYTE* )
{
return sal_False;
}
// -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-sal_Bool X11SalGraphics::drawPolygonBezier( sal_uLong, const SalPoint*, const
BYTE* )
+sal_Bool X11SalGraphics::drawPolygonBezier( sal_uInt32, const SalPoint*, const
BYTE* )
{
return sal_False;
}
@@ -998,7 +998,7 @@ sal_Bool X11SalGraphics::drawPolyPolygon
// -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-void X11SalGraphics::invert( sal_uLong nPoints,
+void X11SalGraphics::invert( sal_uInt32 nPoints,
const SalPoint* pPtAry,
SalInvert nFlags )
{
Modified: openoffice/trunk/main/vcl/unx/headless/svpgdi.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/unx/headless/svpgdi.cxx?rev=1551617&r1=1551616&r2=1551617&view=diff
==============================================================================
--- openoffice/trunk/main/vcl/unx/headless/svpgdi.cxx (original)
+++ openoffice/trunk/main/vcl/unx/headless/svpgdi.cxx Tue Dec 17 16:47:23 2013
@@ -341,7 +341,7 @@ void SvpSalGraphics::drawRect( long nX,
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 )
{
@@ -355,7 +355,7 @@ void SvpSalGraphics::drawPolyLine( sal_u
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 )
{
@@ -377,7 +377,7 @@ void SvpSalGraphics::drawPolygon( sal_uL
dbgOut( m_aDevice );
}
-void SvpSalGraphics::drawPolyPolygon( sal_uInt32 nPoly,
+void SvpSalGraphics::drawPolyPolygon( sal_uInt32 nPoly,
const sal_uInt32* pPointCounts,
PCONSTSALPOINT* pPtAry )
{
@@ -425,14 +425,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* )
{
@@ -574,7 +574,7 @@ void SvpSalGraphics::invert( long nX, lo
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
B2DPolygon aPoly;
Modified: openoffice/trunk/main/vcl/unx/headless/svpgdi.hxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/unx/headless/svpgdi.hxx?rev=1551617&r1=1551616&r2=1551617&view=diff
==============================================================================
--- openoffice/trunk/main/vcl/unx/headless/svpgdi.hxx (original)
+++ openoffice/trunk/main/vcl/unx/headless/svpgdi.hxx Tue Dec 17 16:47:23 2013
@@ -127,15 +127,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,
@@ -166,7 +166,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 );
Modified: openoffice/trunk/main/vcl/unx/headless/svppspgraphics.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/unx/headless/svppspgraphics.cxx?rev=1551617&r1=1551616&r2=1551617&view=diff
==============================================================================
--- openoffice/trunk/main/vcl/unx/headless/svppspgraphics.cxx (original)
+++ openoffice/trunk/main/vcl/unx/headless/svppspgraphics.cxx Tue Dec 17
16:47:23 2013
@@ -335,20 +335,18 @@ void PspGraphics::drawRect( long nX, lon
m_pPrinterGfx->DrawRect (Rectangle(Point(nX, nY), Size(nDX, nDY)));
}
-void PspGraphics::drawPolyLine( sal_uLong nPoints, const SalPoint *pPtAry )
+void PspGraphics::drawPolyLine( sal_uInt32 nPoints, const SalPoint* pPtAry )
{
m_pPrinterGfx->DrawPolyLine (nPoints, (Point*)pPtAry);
}
-void PspGraphics::drawPolygon( sal_uLong nPoints, const SalPoint* pPtAry )
+void PspGraphics::drawPolygon( sal_uInt32 nPoints, const SalPoint* pPtAry )
{
// Point must be equal to SalPoint! see vcl/inc/salgtype.hxx
m_pPrinterGfx->DrawPolygon (nPoints, (Point*)pPtAry);
}
-void PspGraphics::drawPolyPolygon( sal_uInt32 nPoly,
- const
sal_uInt32 *pPoints,
-
PCONSTSALPOINT *pPtAry )
+void PspGraphics::drawPolyPolygon( sal_uInt32 nPoly, const sal_uInt32*
pPoints, PCONSTSALPOINT* pPtAry )
{
m_pPrinterGfx->DrawPolyPolygon (nPoly, pPoints, (const Point**)pPtAry);
}
@@ -364,13 +362,13 @@ bool PspGraphics::drawPolyLine(
return false;
}
-sal_Bool PspGraphics::drawPolyLineBezier( sal_uLong nPoints, const SalPoint*
pPtAry, const sal_uInt8* pFlgAry )
+sal_Bool PspGraphics::drawPolyLineBezier( sal_uInt32 nPoints, const SalPoint*
pPtAry, const sal_uInt8* pFlgAry )
{
m_pPrinterGfx->DrawPolyLineBezier (nPoints, (Point*)pPtAry, pFlgAry);
return sal_True;
}
-sal_Bool PspGraphics::drawPolygonBezier( sal_uLong nPoints, const SalPoint*
pPtAry, const sal_uInt8* pFlgAry )
+sal_Bool PspGraphics::drawPolygonBezier( sal_uInt32 nPoints, const SalPoint*
pPtAry, const sal_uInt8* pFlgAry )
{
m_pPrinterGfx->DrawPolygonBezier (nPoints, (Point*)pPtAry, pFlgAry);
return sal_True;
@@ -392,7 +390,7 @@ bool PspGraphics::drawPolyPolygon( const
return false;
}
-void PspGraphics::invert( sal_uLong /*nPoints*/,
+void PspGraphics::invert( sal_uInt32 /*nPoints*/,
const SalPoint* /*pPtAry*/,
SalInvert /*nFlags*/ )
{
Modified: openoffice/trunk/main/vcl/unx/headless/svppspgraphics.hxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/unx/headless/svppspgraphics.hxx?rev=1551617&r1=1551616&r2=1551617&view=diff
==============================================================================
--- openoffice/trunk/main/vcl/unx/headless/svppspgraphics.hxx (original)
+++ openoffice/trunk/main/vcl/unx/headless/svppspgraphics.hxx Tue Dec 17
16:47:23 2013
@@ -139,8 +139,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_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 bool drawPolyPolygon( const ::basegfx::B2DPolyPolygon&,
double fTransparency );
virtual bool drawPolyLine(
const ::basegfx::B2DPolygon&,
@@ -151,10 +151,10 @@ public:
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,
@@ -185,7 +185,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 );
virtual bool filterText( const String& rOrigText, String&
rNewText, xub_StrLen nIndex, xub_StrLen& rLen, xub_StrLen& rCutStart,
xub_StrLen& rCutStop );
Modified: openoffice/trunk/main/vcl/win/source/gdi/salgdi.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/win/source/gdi/salgdi.cxx?rev=1551617&r1=1551616&r2=1551617&view=diff
==============================================================================
--- openoffice/trunk/main/vcl/win/source/gdi/salgdi.cxx (original)
+++ openoffice/trunk/main/vcl/win/source/gdi/salgdi.cxx Tue Dec 17 16:47:23 2013
@@ -1409,7 +1409,7 @@ void WinSalGraphics::drawRect( long nX,
// -----------------------------------------------------------------------
-void WinSalGraphics::drawPolyLine( sal_uLong nPoints, const SalPoint* pPtAry )
+void WinSalGraphics::drawPolyLine( sal_uInt32 nPoints, const SalPoint* pPtAry )
{
// Unter NT koennen wir das Array direkt weiterreichen
DBG_ASSERT( sizeof( POINT ) == sizeof( SalPoint ),
@@ -1424,7 +1424,7 @@ void WinSalGraphics::drawPolyLine( sal_u
// -----------------------------------------------------------------------
-void WinSalGraphics::drawPolygon( sal_uLong nPoints, const SalPoint* pPtAry )
+void WinSalGraphics::drawPolygon( sal_uInt32 nPoints, const SalPoint* pPtAry )
{
// Unter NT koennen wir das Array direkt weiterreichen
DBG_ASSERT( sizeof( POINT ) == sizeof( SalPoint ),
@@ -1512,7 +1512,7 @@ void WinSalGraphics::drawPolyPolygon( sa
// -----------------------------------------------------------------------
-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
// Unter NT koennen wir das Array direkt weiterreichen
@@ -1529,7 +1529,7 @@ sal_Bool WinSalGraphics::drawPolyLineBez
// -----------------------------------------------------------------------
-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
// Unter NT koennen wir das Array direkt weiterreichen
Modified: openoffice/trunk/main/vcl/win/source/gdi/salgdi2.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/win/source/gdi/salgdi2.cxx?rev=1551617&r1=1551616&r2=1551617&view=diff
==============================================================================
--- openoffice/trunk/main/vcl/win/source/gdi/salgdi2.cxx (original)
+++ openoffice/trunk/main/vcl/win/source/gdi/salgdi2.cxx Tue Dec 17 16:47:23
2013
@@ -777,7 +777,7 @@ void WinSalGraphics::invert( long nX, lo
// -----------------------------------------------------------------------
-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;
