removetooltypes01: Exchange misleading type sal_uIntPtr with sal_uLong

13 files changed, 77 insertions, 77 deletions

diff --git a/vcl/unx/headless/svpdummies.cxx b/vcl/unx/headless/svpdummies.cxx
index 6aed05bf135b..162b3c5f755c 100644
--- a/vcl/unx/headless/svpdummies.cxx
+++ b/vcl/unx/headless/svpdummies.cxx
@@ -51,7 +51,7 @@ SvpSalObject::~SvpSalObject()
 
 void SvpSalObject::ResetClipRegion() {}
 sal_uInt16 SvpSalObject::GetClipRegionType() { return 0; }
-void SvpSalObject::BeginSetClipRegion( sal_uIntPtr ) {}
+void SvpSalObject::BeginSetClipRegion( sal_uLong ) {}
 void SvpSalObject::UnionClipRegion( long, long, long, long ) {}
 void SvpSalObject::EndSetClipRegion() {}
 void SvpSalObject::SetPosSize( long, long, long, long ) {}
diff --git a/vcl/unx/headless/svpdummies.hxx b/vcl/unx/headless/svpdummies.hxx
index 48b3ffc5de19..a72ba11e5c12 100644
--- a/vcl/unx/headless/svpdummies.hxx
+++ b/vcl/unx/headless/svpdummies.hxx
@@ -45,7 +45,7 @@ public:
     // overload all pure virtual methods
      virtual void                   ResetClipRegion();
     virtual sal_uInt16              GetClipRegionType();
-    virtual void                    BeginSetClipRegion( sal_uIntPtr nRects );
+    virtual void                    BeginSetClipRegion( sal_uLong nRects );
     virtual void                    UnionClipRegion( long nX, long nY, long nWidth, long nHeight );
     virtual void                    EndSetClipRegion();
 
diff --git a/vcl/unx/headless/svpframe.cxx b/vcl/unx/headless/svpframe.cxx
index b4835dbcf133..9fb54cf29ef1 100644
--- a/vcl/unx/headless/svpframe.cxx
+++ b/vcl/unx/headless/svpframe.cxx
@@ -39,7 +39,7 @@ SvpSalFrame* SvpSalFrame::s_pFocusFrame = NULL;
 
 SvpSalFrame::SvpSalFrame( SvpSalInstance* pInstance,
                           SalFrame* pParent,
-                          sal_uIntPtr nSalFrameStyle,
+                          sal_uLong nSalFrameStyle,
                           SystemParentData* ) :
     m_pInstance( pInstance ),
     m_pParent( static_cast<SvpSalFrame*>(pParent) ),
@@ -435,7 +435,7 @@ void SvpSalFrame::ResetClipRegion()
 {
 }
 
-void SvpSalFrame::BeginSetClipRegion( sal_uIntPtr )
+void SvpSalFrame::BeginSetClipRegion( sal_uLong )
 {
 }
 
diff --git a/vcl/unx/headless/svpframe.hxx b/vcl/unx/headless/svpframe.hxx
index 37a9a02cde4e..af40fb66fb7f 100644
--- a/vcl/unx/headless/svpframe.hxx
+++ b/vcl/unx/headless/svpframe.hxx
@@ -42,7 +42,7 @@ class SvpSalFrame : public SalFrame, public SvpElement
     SvpSalInstance*                     m_pInstance;
     SvpSalFrame*                    m_pParent;       // pointer to parent frame
     std::list< SvpSalFrame* >           m_aChildren;     // List of child frames
-    sal_uIntPtr                         m_nStyle;
+    sal_uLong                         m_nStyle;
     bool                                m_bVisible;
     long                                m_nMinWidth;
     long                                m_nMinHeight;
@@ -58,7 +58,7 @@ class SvpSalFrame : public SalFrame, public SvpElement
 public:
     SvpSalFrame( SvpSalInstance* pInstance,
                  SalFrame* pParent,
-                 sal_uIntPtr nSalFrameStyle,
+                 sal_uLong nSalFrameStyle,
                  SystemParentData* pSystemParent = NULL );
     virtual ~SvpSalFrame();
 
@@ -116,7 +116,7 @@ public:
     virtual bool                SetPluginParent( SystemParentData* pNewParent );
     virtual void                SetBackgroundBitmap( SalBitmap* pBitmap );
     virtual void                ResetClipRegion();
-    virtual void                BeginSetClipRegion( sal_uIntPtr nRects );
+    virtual void                BeginSetClipRegion( sal_uLong nRects );
     virtual void                UnionClipRegion( long nX, long nY, long nWidth, long nHeight );
     virtual void                EndSetClipRegion();
 
diff --git a/vcl/unx/headless/svpgdi.cxx b/vcl/unx/headless/svpgdi.cxx
index 5485347213f3..95ce1bb45a1d 100644
--- a/vcl/unx/headless/svpgdi.cxx
+++ b/vcl/unx/headless/svpgdi.cxx
@@ -152,7 +152,7 @@ void SvpSalGraphics::ResetClipRegion()
     m_aClipMap.reset();
 }
 
-void SvpSalGraphics::BeginSetClipRegion( sal_uIntPtr n )
+void SvpSalGraphics::BeginSetClipRegion( sal_uLong n )
 {
     if( n <= 1 )
     {
@@ -309,13 +309,13 @@ void SvpSalGraphics::drawRect( long nX, long nY, long nWidth, long nHeight )
     dbgOut( m_aDevice );
 }
 
-void SvpSalGraphics::drawPolyLine( sal_uIntPtr nPoints, const SalPoint* pPtAry )
+void SvpSalGraphics::drawPolyLine( sal_uLong nPoints, const SalPoint* pPtAry )
 {
     if( m_bUseLineColor && nPoints )
     {
         B2DPolygon aPoly;
         aPoly.append( B2DPoint( pPtAry->mnX, pPtAry->mnY ), nPoints );
-        for( sal_uIntPtr i = 1; i < nPoints; i++ )
+        for( sal_uLong i = 1; i < nPoints; i++ )
             aPoly.setB2DPoint( i, B2DPoint( pPtAry[i].mnX, pPtAry[i].mnY ) );
         aPoly.setClosed( false );
         m_aDevice->drawPolygon( aPoly, m_aLineColor, m_aDrawMode, m_aClipMap );
@@ -323,13 +323,13 @@ void SvpSalGraphics::drawPolyLine( sal_uIntPtr nPoints, const SalPoint* pPtAry )
     dbgOut( m_aDevice );
 }
 
-void SvpSalGraphics::drawPolygon( sal_uIntPtr nPoints, const SalPoint* pPtAry )
+void SvpSalGraphics::drawPolygon( sal_uLong nPoints, const SalPoint* pPtAry )
 {
     if( ( m_bUseLineColor || m_bUseFillColor ) && nPoints )
     {
         B2DPolygon aPoly;
         aPoly.append( B2DPoint( pPtAry->mnX, pPtAry->mnY ), nPoints );
-        for( sal_uIntPtr i = 1; i < nPoints; i++ )
+        for( sal_uLong i = 1; i < nPoints; i++ )
             aPoly.setB2DPoint( i, B2DPoint( pPtAry[i].mnX, pPtAry[i].mnY ) );
         if( m_bUseFillColor )
         {
@@ -388,14 +388,14 @@ bool SvpSalGraphics::drawPolyLine( const ::basegfx::B2DPolygon&, double /*fTrans
         return false;
 }
 
-sal_Bool SvpSalGraphics::drawPolyLineBezier( sal_uIntPtr,
+sal_Bool SvpSalGraphics::drawPolyLineBezier( sal_uLong,
                                              const SalPoint*,
                                              const sal_uInt8* )
 {
     return sal_False;
 }
 
-sal_Bool SvpSalGraphics::drawPolygonBezier( sal_uIntPtr,
+sal_Bool SvpSalGraphics::drawPolygonBezier( sal_uLong,
                                             const SalPoint*,
                                             const sal_uInt8* )
 {
@@ -538,19 +538,19 @@ void SvpSalGraphics::invert( long nX, long nY, long nWidth, long nHeight, SalInv
     dbgOut( m_aDevice );
 }
 
-void SvpSalGraphics::invert( sal_uIntPtr nPoints, const SalPoint* pPtAry, SalInvert /*nFlags*/ )
+void SvpSalGraphics::invert( sal_uLong nPoints, const SalPoint* pPtAry, SalInvert /*nFlags*/ )
 {
     // FIXME: handle SAL_INVERT_50 and SAL_INVERT_TRACKFRAME
     B2DPolygon aPoly;
     aPoly.append( B2DPoint( pPtAry->mnX, pPtAry->mnY ), nPoints );
-    for( sal_uIntPtr i = 1; i < nPoints; i++ )
+    for( sal_uLong i = 1; i < nPoints; i++ )
         aPoly.setB2DPoint( i, B2DPoint( pPtAry[i].mnX, pPtAry[i].mnY ) );
     aPoly.setClosed( true );
     m_aDevice->fillPolyPolygon( B2DPolyPolygon(aPoly), basebmp::Color( 0xffffff ), DrawMode_XOR, m_aClipMap );
     dbgOut( m_aDevice );
 }
 
-sal_Bool SvpSalGraphics::drawEPS( long, long, long, long, void*, sal_uIntPtr )
+sal_Bool SvpSalGraphics::drawEPS( long, long, long, long, void*, sal_uLong )
 {
     return sal_False;
 }
diff --git a/vcl/unx/headless/svpgdi.hxx b/vcl/unx/headless/svpgdi.hxx
index 2510d505f6b1..a7486a55198f 100644
--- a/vcl/unx/headless/svpgdi.hxx
+++ b/vcl/unx/headless/svpgdi.hxx
@@ -68,7 +68,7 @@ public:
     virtual long            GetGraphicsWidth() const;
 
     virtual void            ResetClipRegion();
-    virtual void            BeginSetClipRegion( sal_uIntPtr nCount );
+    virtual void            BeginSetClipRegion( sal_uLong nCount );
     virtual sal_Bool            unionClipRegion( long nX, long nY, long nWidth, long nHeight );
     virtual bool            unionClipRegion(  const ::basegfx::B2DPolyPolygon& );
     virtual void            EndSetClipRegion();
@@ -87,7 +87,7 @@ public:
     virtual void            SetTextColor( SalColor nSalColor );
     virtual sal_uInt16                  SetFont( ImplFontSelectData*, int nFallbackLevel );
     virtual void            GetFontMetric( ImplFontMetricData*, int nFallbackLevel );
-    virtual sal_uIntPtr         GetKernPairs( sal_uIntPtr nPairs, ImplKernPairData* pKernPairs );
+    virtual sal_uLong           GetKernPairs( sal_uLong nPairs, ImplKernPairData* pKernPairs );
     virtual const ImplFontCharMap* GetImplFontCharMap() const;
     virtual void            GetDevFontList( ImplDevFontList* );
     virtual void            GetDevFontSubstList( OutputDevice* );
@@ -122,15 +122,15 @@ public:
     virtual void            drawRect( long nX, long nY, long nWidth, long nHeight );
     virtual bool            drawPolyPolygon( const ::basegfx::B2DPolyPolygon&, double fTransparency );
     virtual bool            drawPolyLine( const ::basegfx::B2DPolygon&, double fTransparency, const ::basegfx::B2DVector& rLineWidths, basegfx::B2DLineJoin );
-    virtual void            drawPolyLine( sal_uIntPtr nPoints, const SalPoint* pPtAry );
-    virtual void            drawPolygon( sal_uIntPtr nPoints, const SalPoint* pPtAry );
+    virtual void            drawPolyLine( sal_uLong nPoints, const SalPoint* pPtAry );
+    virtual void            drawPolygon( sal_uLong nPoints, const SalPoint* pPtAry );
     virtual void            drawPolyPolygon( sal_uInt32 nPoly,
                                              const sal_uInt32* pPoints,
                                              PCONSTSALPOINT* pPtAry );
-    virtual sal_Bool        drawPolyLineBezier( sal_uIntPtr nPoints,
+    virtual sal_Bool        drawPolyLineBezier( sal_uLong nPoints,
                                                 const SalPoint* pPtAry,
                                                 const sal_uInt8* pFlgAry );
-    virtual sal_Bool        drawPolygonBezier( sal_uIntPtr nPoints,
+    virtual sal_Bool        drawPolygonBezier( sal_uLong nPoints,
                                                const SalPoint* pPtAry,
                                                const sal_uInt8* pFlgAry );
     virtual sal_Bool        drawPolyPolygonBezier( sal_uInt32 nPoly,
@@ -161,9 +161,9 @@ 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_uLong nPoints, const SalPoint* pPtAry, SalInvert nFlags );
 
-    virtual sal_Bool            drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, sal_uIntPtr nSize );
+    virtual sal_Bool            drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, sal_uLong nSize );
 
     virtual SystemGraphicsData GetGraphicsData() const;
     virtual SystemFontData     GetSysFontData( int nFallbacklevel ) const;
diff --git a/vcl/unx/headless/svpinst.cxx b/vcl/unx/headless/svpinst.cxx
index b6665550563d..f9ac7e7e2a1e 100644
--- a/vcl/unx/headless/svpinst.cxx
+++ b/vcl/unx/headless/svpinst.cxx
@@ -192,7 +192,7 @@ inline int operator >= ( const timeval &t1, const timeval &t2 )
         return t1.tv_usec >= t2.tv_usec;
     return t1.tv_sec > t2.tv_sec;
 }
-inline timeval &operator += ( timeval &t1, sal_uIntPtr t2 )
+inline timeval &operator += ( timeval &t1, sal_uLong t2 )
 {
     t1.tv_sec  += t2 / 1000;
     t1.tv_usec += t2 ? (t2 % 1000) * 1000 : 500;
@@ -235,12 +235,12 @@ bool SvpSalInstance::CheckTimeout( bool bExecuteTimers )
     return bRet;
 }
 
-SalFrame* SvpSalInstance::CreateChildFrame( SystemParentData* pParent, sal_uIntPtr nStyle )
+SalFrame* SvpSalInstance::CreateChildFrame( SystemParentData* pParent, sal_uLong nStyle )
 {
     return new SvpSalFrame( this, NULL, nStyle, pParent );
 }
 
-SalFrame* SvpSalInstance::CreateFrame( SalFrame* pParent, sal_uIntPtr nStyle )
+SalFrame* SvpSalInstance::CreateFrame( SalFrame* pParent, sal_uLong nStyle )
 {
     return new SvpSalFrame( this, pParent, nStyle );
 }
@@ -299,13 +299,13 @@ vos::IMutex* SvpSalInstance::GetYieldMutex()
     return &m_aYieldMutex;
 }
 
-sal_uIntPtr SvpSalInstance::ReleaseYieldMutex()
+sal_uLong SvpSalInstance::ReleaseYieldMutex()
 {
     if ( m_aYieldMutex.GetThreadId() ==
          vos::OThread::getCurrentIdentifier() )
     {
-        sal_uIntPtr nCount = m_aYieldMutex.GetAcquireCount();
-        sal_uIntPtr n = nCount;
+        sal_uLong nCount = m_aYieldMutex.GetAcquireCount();
+        sal_uLong n = nCount;
         while ( n )
         {
             m_aYieldMutex.release();
@@ -318,7 +318,7 @@ sal_uIntPtr SvpSalInstance::ReleaseYieldMutex()
         return 0;
 }
 
-void SvpSalInstance::AcquireYieldMutex( sal_uIntPtr nCount )
+void SvpSalInstance::AcquireYieldMutex( sal_uLong nCount )
 {
     while ( nCount )
     {
@@ -346,7 +346,7 @@ void SvpSalInstance::Yield( bool bWait, bool bHandleAllCurrentEvents )
 
     // release yield mutex
     std::list< SalUserEvent > aEvents;
-    sal_uIntPtr nAcquireCount = ReleaseYieldMutex();
+    sal_uLong nAcquireCount = ReleaseYieldMutex();
     if( osl_acquireMutex( m_aEventGuard ) )
     {
         if( ! m_aUserEvents.empty() )
@@ -497,7 +497,7 @@ void SvpSalInstance::StopTimer()
     m_nTimeoutMS        = 0;
 }
 
-void SvpSalInstance::StartTimer( sal_uIntPtr nMS )
+void SvpSalInstance::StartTimer( sal_uLong nMS )
 {
     timeval Timeout (m_aTimeout); // previous timeout.
     gettimeofday (&m_aTimeout, 0);
@@ -525,7 +525,7 @@ void SvpSalTimer::Stop()
     m_pInstance->StopTimer();
 }
 
-void SvpSalTimer::Start( sal_uIntPtr nMS )
+void SvpSalTimer::Start( sal_uLong nMS )
 {
     m_pInstance->StartTimer( nMS );
 }
diff --git a/vcl/unx/headless/svpinst.hxx b/vcl/unx/headless/svpinst.hxx
index 05f3c01f5bb5..736916bbaced 100644
--- a/vcl/unx/headless/svpinst.hxx
+++ b/vcl/unx/headless/svpinst.hxx
@@ -49,7 +49,7 @@
 class SvpSalYieldMutex : public vos::OMutex
 {
 protected:
-    sal_uIntPtr                                     mnCount;
+    sal_uLong                                       mnCount;
     vos::OThread::TThreadIdentifier mnThreadId;
 
 public:
@@ -59,7 +59,7 @@ public:
     virtual void                                release();
     virtual sal_Bool                            tryToAcquire();
 
-    sal_uIntPtr                                     GetAcquireCount() const { return mnCount; }
+    sal_uLong                                       GetAcquireCount() const { return mnCount; }
     vos::OThread::TThreadIdentifier GetThreadId() const { return mnThreadId; }
 };
 
@@ -75,7 +75,7 @@ public:
     virtual ~SvpSalTimer();
 
     // overload all pure virtual methods
-    virtual void Start( sal_uIntPtr nMS );
+    virtual void Start( sal_uLong nMS );
     virtual void Stop();
 };
 
@@ -86,7 +86,7 @@ class SvpSalFrame;
 class SvpSalInstance : public SalInstance
 {
     timeval             m_aTimeout;
-    sal_uIntPtr               m_nTimeoutMS;
+    sal_uLong               m_nTimeoutMS;
     int                 m_pTimeoutFDS[2];
     SvpSalYieldMutex    m_aYieldMutex;
 
@@ -120,7 +120,7 @@ public:
     void PostEvent( const SalFrame* pFrame, void* pData, sal_uInt16 nEvent );
     void CancelEvent( const SalFrame* pFrame, void* pData, sal_uInt16 nEvent );
 
-    void StartTimer( sal_uIntPtr nMS );
+    void StartTimer( sal_uLong nMS );
     void StopTimer();
     void Wakeup();
 
@@ -131,8 +131,8 @@ public:
     bool            CheckTimeout( bool bExecuteTimers = true );
 
     // Frame
-    virtual SalFrame*       CreateChildFrame( SystemParentData* pParent, sal_uIntPtr nStyle );
-    virtual SalFrame*       CreateFrame( SalFrame* pParent, sal_uIntPtr nStyle );
+    virtual SalFrame*       CreateChildFrame( SystemParentData* pParent, sal_uLong nStyle );
+    virtual SalFrame*       CreateFrame( SalFrame* pParent, sal_uLong nStyle );
     virtual void            DestroyFrame( SalFrame* pFrame );
 
     // Object (System Child Window)
@@ -174,8 +174,8 @@ public:
 
     // YieldMutex
     virtual vos::IMutex*    GetYieldMutex();
-    virtual sal_uIntPtr         ReleaseYieldMutex();
-    virtual void            AcquireYieldMutex( sal_uIntPtr nCount );
+    virtual sal_uLong           ReleaseYieldMutex();
+    virtual void            AcquireYieldMutex( sal_uLong nCount );
     virtual bool            CheckYieldMutex();
 
     // wait next event and dispatch
diff --git a/vcl/unx/headless/svpprn.cxx b/vcl/unx/headless/svpprn.cxx
index a81f894e4505..0c8a119806af 100644
--- a/vcl/unx/headless/svpprn.cxx
+++ b/vcl/unx/headless/svpprn.cxx
@@ -558,7 +558,7 @@ sal_Bool PspSalInfoPrinter::SetPrinterData( ImplJobSetup* pJobSetup )
 // Only the data must be changed, where the bit
 // in nGetDataFlags is set
 sal_Bool PspSalInfoPrinter::SetData(
-    sal_uIntPtr nSetDataFlags,
+    sal_uLong nSetDataFlags,
     ImplJobSetup* pJobSetup )
 {
     JobData aData;
@@ -707,7 +707,7 @@ void PspSalInfoPrinter::GetPageInfo(
 
 // -----------------------------------------------------------------------
 
-sal_uIntPtr PspSalInfoPrinter::GetPaperBinCount( const ImplJobSetup* pJobSetup )
+sal_uLong PspSalInfoPrinter::GetPaperBinCount( const ImplJobSetup* pJobSetup )
 {
     if( ! pJobSetup )
         return 0;
@@ -721,7 +721,7 @@ sal_uIntPtr PspSalInfoPrinter::GetPaperBinCount( const ImplJobSetup* pJobSetup )
 
 // -----------------------------------------------------------------------
 
-String PspSalInfoPrinter::GetPaperBinName( const ImplJobSetup* pJobSetup, sal_uIntPtr nPaperBin )
+String PspSalInfoPrinter::GetPaperBinName( const ImplJobSetup* pJobSetup, sal_uLong nPaperBin )
 {
     JobData aData;
     JobData::constructFromStreamBuffer( pJobSetup->mpDriverData, pJobSetup->mnDriverDataLen, aData );
@@ -745,7 +745,7 @@ String PspSalInfoPrinter::GetPaperBinName( const ImplJobSetup* pJobSetup, sal_uI
 
 // -----------------------------------------------------------------------
 
-sal_uIntPtr PspSalInfoPrinter::GetCapabilities( const ImplJobSetup* pJobSetup, sal_uInt16 nType )
+sal_uLong PspSalInfoPrinter::GetCapabilities( const ImplJobSetup* pJobSetup, sal_uInt16 nType )
 {
     switch( nType )
     {
@@ -845,7 +845,7 @@ sal_Bool PspSalPrinter::StartJob(
     const XubString* pFileName,
     const XubString& rJobName,
     const XubString& rAppName,
-    sal_uIntPtr nCopies,
+    sal_uLong nCopies,
     bool bCollate,
     bool /*bDirect*/,
     ImplJobSetup* pJobSetup )
@@ -990,7 +990,7 @@ sal_Bool PspSalPrinter::EndPage()
 
 // -----------------------------------------------------------------------
 
-sal_uIntPtr PspSalPrinter::GetErrorCode()
+sal_uLong PspSalPrinter::GetErrorCode()
 {
     return 0;
 }
diff --git a/vcl/unx/headless/svpprn.hxx b/vcl/unx/headless/svpprn.hxx
index 8c7372115cde..84dbf8277054 100644
--- a/vcl/unx/headless/svpprn.hxx
+++ b/vcl/unx/headless/svpprn.hxx
@@ -50,14 +50,14 @@ public:
     virtual void                    ReleaseGraphics( SalGraphics* pGraphics );
     virtual sal_Bool                    Setup( SalFrame* pFrame, ImplJobSetup* pSetupData );
     virtual sal_Bool                    SetPrinterData( ImplJobSetup* pSetupData );
-    virtual sal_Bool                    SetData( sal_uIntPtr nFlags, ImplJobSetup* pSetupData );
+    virtual sal_Bool                    SetData( sal_uLong nFlags, ImplJobSetup* pSetupData );
     virtual void                    GetPageInfo( const ImplJobSetup* pSetupData,
                                                  long& rOutWidth, long& rOutHeight,
                                                  long& rPageOffX, long& rPageOffY,
                                                  long& rPageWidth, long& rPageHeight );
-    virtual sal_uIntPtr                 GetCapabilities( const ImplJobSetup* pSetupData, sal_uInt16 nType );
-    virtual sal_uIntPtr                 GetPaperBinCount( const ImplJobSetup* pSetupData );
-    virtual String                  GetPaperBinName( const ImplJobSetup* pSetupData, sal_uIntPtr nPaperBin );
+    virtual sal_uLong                   GetCapabilities( const ImplJobSetup* pSetupData, sal_uInt16 nType );
+    virtual sal_uLong                   GetPaperBinCount( const ImplJobSetup* pSetupData );
+    virtual String                  GetPaperBinName( const ImplJobSetup* pSetupData, sal_uLong nPaperBin );
     virtual void                    InitPaperFormats( const ImplJobSetup* pSetupData );
     virtual int                 GetLandscapeAngle( const ImplJobSetup* pSetupData );
 };
@@ -75,7 +75,7 @@ public:
     psp::PrinterJob         m_aPrintJob;
     psp::JobData            m_aJobData;
     psp::PrinterGfx         m_aPrinterGfx;
-    sal_uIntPtr                 m_nCopies;
+    sal_uLong                   m_nCopies;
     bool                    m_bCollate;
     SalInfoPrinter*         m_pInfoPrinter;
 
@@ -87,7 +87,7 @@ public:
     virtual sal_Bool                    StartJob( const XubString* pFileName,
                                               const XubString& rJobName,
                                               const XubString& rAppName,
-                                              sal_uIntPtr nCopies,
+                                              sal_uLong nCopies,
                                               bool bCollate,
                                               bool bDirect,
                                               ImplJobSetup* pSetupData );
@@ -95,7 +95,7 @@ public:
     virtual sal_Bool                    AbortJob();
     virtual SalGraphics*            StartPage( ImplJobSetup* pSetupData, sal_Bool bNewJobData );
     virtual sal_Bool                    EndPage();
-    virtual sal_uIntPtr                 GetErrorCode();
+    virtual sal_uLong                   GetErrorCode();
 };
 
 class Timer;
diff --git a/vcl/unx/headless/svppspgraphics.cxx b/vcl/unx/headless/svppspgraphics.cxx
index fe9a883fa583..fda458c5c73e 100644
--- a/vcl/unx/headless/svppspgraphics.cxx
+++ b/vcl/unx/headless/svppspgraphics.cxx
@@ -219,7 +219,7 @@ void PspGraphics::ResetClipRegion()
     m_pPrinterGfx->ResetClipRegion ();
 }
 
-void PspGraphics::BeginSetClipRegion( sal_uIntPtr n )
+void PspGraphics::BeginSetClipRegion( sal_uLong n )
 {
     m_pPrinterGfx->BeginSetClipRegion(n);
 }
@@ -305,12 +305,12 @@ void PspGraphics::drawRect( long nX, long nY, long nDX, long nDY )
     m_pPrinterGfx->DrawRect (Rectangle(Point(nX, nY), Size(nDX, nDY)));
 }
 
-void PspGraphics::drawPolyLine( sal_uIntPtr nPoints, const SalPoint *pPtAry )
+void PspGraphics::drawPolyLine( sal_uLong nPoints, const SalPoint *pPtAry )
 {
     m_pPrinterGfx->DrawPolyLine (nPoints, (Point*)pPtAry);
 }
 
-void PspGraphics::drawPolygon( sal_uIntPtr nPoints, const SalPoint* pPtAry )
+void PspGraphics::drawPolygon( sal_uLong nPoints, const SalPoint* pPtAry )
 {
     // Point must be equal to SalPoint! see vcl/inc/salgtype.hxx
     m_pPrinterGfx->DrawPolygon (nPoints, (Point*)pPtAry);
@@ -329,13 +329,13 @@ bool PspGraphics::drawPolyLine( const ::basegfx::B2DPolygon&, double /*fTranspar
         return false;
 }
 
-sal_Bool PspGraphics::drawPolyLineBezier( sal_uIntPtr nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry )
+sal_Bool PspGraphics::drawPolyLineBezier( sal_uLong nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry )
 {
     m_pPrinterGfx->DrawPolyLineBezier (nPoints, (Point*)pPtAry, pFlgAry);
     return sal_True;
 }
 
-sal_Bool PspGraphics::drawPolygonBezier( sal_uIntPtr nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry )
+sal_Bool PspGraphics::drawPolygonBezier( sal_uLong nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry )
 {
     m_pPrinterGfx->DrawPolygonBezier (nPoints, (Point*)pPtAry, pFlgAry);
     return sal_True;
@@ -357,13 +357,13 @@ bool PspGraphics::drawPolyPolygon( const basegfx::B2DPolyPolygon&, double /*fTra
     return false;
 }
 
-void PspGraphics::invert( sal_uIntPtr /*nPoints*/,
+void PspGraphics::invert( sal_uLong /*nPoints*/,
                           const SalPoint* /*pPtAry*/,
                           SalInvert /*nFlags*/ )
 {
     DBG_ASSERT( 0, "Error: PrinterGfx::Invert() not implemented" );
 }
-sal_Bool PspGraphics::drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, sal_uIntPtr nSize )
+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 );
 }
@@ -817,10 +817,10 @@ void PspGraphics::GetFontMetric( ImplFontMetricData *pMetric, int )
     }
 }
 
-sal_uInt32 PspGraphics::GetKernPairs( sal_uIntPtr nPairs, ImplKernPairData *pKernPairs )
+sal_uInt32 PspGraphics::GetKernPairs( sal_uLong nPairs, ImplKernPairData *pKernPairs )
 {
     const ::std::list< ::psp::KernPair >& rPairs( m_pPrinterGfx->getKernPairs() );
-    sal_uIntPtr nHavePairs = rPairs.size();
+    sal_uLong nHavePairs = rPairs.size();
     if( pKernPairs && nPairs )
     {
         ::std::list< ::psp::KernPair >::const_iterator it;
diff --git a/vcl/unx/headless/svppspgraphics.hxx b/vcl/unx/headless/svppspgraphics.hxx
index ee6f5bc25570..fe9352c1fd8b 100644
--- a/vcl/unx/headless/svppspgraphics.hxx
+++ b/vcl/unx/headless/svppspgraphics.hxx
@@ -90,7 +90,7 @@ public:
     virtual long            GetGraphicsWidth() const;
 
     virtual void            ResetClipRegion();
-    virtual void            BeginSetClipRegion( sal_uIntPtr nCount );
+    virtual void            BeginSetClipRegion( sal_uLong nCount );
     virtual sal_Bool            unionClipRegion( long nX, long nY, long nWidth, long nHeight );
     virtual bool                        unionClipRegion(  const ::basegfx::B2DPolyPolygon& );
     virtual void            EndSetClipRegion();
@@ -106,7 +106,7 @@ public:
     virtual void            SetTextColor( SalColor nSalColor );
     virtual sal_uInt16          SetFont( ImplFontSelectData*, int nFallbackLevel );
     virtual void            GetFontMetric( ImplFontMetricData*, int nFallbackLevel );
-    virtual sal_uIntPtr         GetKernPairs( sal_uIntPtr nPairs, ImplKernPairData* pKernPairs );
+    virtual sal_uLong           GetKernPairs( sal_uLong nPairs, ImplKernPairData* pKernPairs );
     virtual const ImplFontCharMap* GetImplFontCharMap() const;
     virtual void            GetDevFontList( ImplDevFontList* );
     virtual void            GetDevFontSubstList( OutputDevice* );
@@ -139,17 +139,17 @@ 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_uLong nPoints, const SalPoint* pPtAry );
+    virtual void            drawPolygon( sal_uLong nPoints, const SalPoint* pPtAry );
     virtual bool            drawPolyPolygon( const ::basegfx::B2DPolyPolygon&, double fTransparency );
     virtual bool            drawPolyLine( const ::basegfx::B2DPolygon&, double fTransparency, const ::basegfx::B2DVector& rLineWidths, basegfx::B2DLineJoin );
     virtual void            drawPolyPolygon( sal_uInt32 nPoly,
                                              const sal_uInt32* pPoints,
                                              PCONSTSALPOINT* pPtAry );
-    virtual sal_Bool        drawPolyLineBezier( sal_uIntPtr nPoints,
+    virtual sal_Bool        drawPolyLineBezier( sal_uLong nPoints,
                                                 const SalPoint* pPtAry,
                                                 const sal_uInt8* pFlgAry );
-    virtual sal_Bool        drawPolygonBezier( sal_uIntPtr nPoints,
+    virtual sal_Bool        drawPolygonBezier( sal_uLong nPoints,
                                                const SalPoint* pPtAry,
                                                const sal_uInt8* pFlgAry );
     virtual sal_Bool        drawPolyPolygonBezier( sal_uInt32 nPoly,
@@ -180,9 +180,9 @@ 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_uLong nPoints, const SalPoint* pPtAry, SalInvert nFlags );
 
-    virtual sal_Bool            drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, sal_uIntPtr nSize );
+    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 );
 
     virtual SystemGraphicsData      GetGraphicsData() const;
diff --git a/vcl/unx/headless/svptext.cxx b/vcl/unx/headless/svptext.cxx
index dbe1b2c4dc32..fba7fe4bf31d 100644
--- a/vcl/unx/headless/svptext.cxx
+++ b/vcl/unx/headless/svptext.cxx
@@ -254,15 +254,15 @@ void SvpSalGraphics::GetFontMetric( ImplFontMetricData* pMetric, int nFallbackLe
 
 // ---------------------------------------------------------------------------
 
-sal_uIntPtr SvpSalGraphics::GetKernPairs( sal_uIntPtr nPairs, ImplKernPairData* pKernPairs )
+sal_uLong SvpSalGraphics::GetKernPairs( sal_uLong nPairs, ImplKernPairData* pKernPairs )
 {
-    sal_uIntPtr nGotPairs = 0;
+    sal_uLong nGotPairs = 0;
 
     if( m_pServerFont[0] != NULL )
     {
         ImplKernPairData* pTmpKernPairs = NULL;
         nGotPairs = m_pServerFont[0]->GetKernPairs( &pTmpKernPairs );
-        for( sal_uIntPtr i = 0; i < nPairs && i < nGotPairs; ++i )
+        for( sal_uLong i = 0; i < nPairs && i < nGotPairs; ++i )
             pKernPairs[ i ] = pTmpKernPairs[ i ];
         delete[] pTmpKernPairs;
     }