diff options
author | Carsten Driesner <cd@openoffice.org> | 2011-01-11 11:10:11 +0100 |
---|---|---|
committer | Carsten Driesner <cd@openoffice.org> | 2011-01-11 11:10:11 +0100 |
commit | 322a75edf8bad6616b1543a6b81972f4c3765ee2 (patch) | |
tree | 727d1f3bfc1d951d13a2f461410f6549070b31d3 /vcl/unx | |
parent | 1c6de4e777704030c332e40ffc1d06765d469919 (diff) |
removetootypes01: #i112600# Use correct conversion ULONG => sal_uIntPtr
Diffstat (limited to 'vcl/unx')
45 files changed, 222 insertions, 222 deletions
diff --git a/vcl/unx/gtk/app/gtkdata.cxx b/vcl/unx/gtk/app/gtkdata.cxx index de3d46733bfd..104aa2e80dd3 100644 --- a/vcl/unx/gtk/app/gtkdata.cxx +++ b/vcl/unx/gtk/app/gtkdata.cxx @@ -527,7 +527,7 @@ public: YieldFunc handle ); virtual void Remove( int fd ); - virtual void StartTimer( sal_uInt32 nMS ); + virtual void StartTimer( sal_uIntPtr nMS ); virtual void StopTimer(); virtual void Wakeup(); virtual void PostUserEvent(); @@ -727,7 +727,7 @@ gboolean GtkXLib::timeoutFn(gpointer data) return FALSE; } -void GtkXLib::StartTimer( sal_uInt32 nMS ) +void GtkXLib::StartTimer( sal_uIntPtr nMS ) { m_nTimeoutMS = nMS; // for restarting diff --git a/vcl/unx/gtk/app/gtkinst.cxx b/vcl/unx/gtk/app/gtkinst.cxx index f58f49865f7c..df7ce072bde7 100644 --- a/vcl/unx/gtk/app/gtkinst.cxx +++ b/vcl/unx/gtk/app/gtkinst.cxx @@ -65,7 +65,7 @@ void GtkHookedYieldMutex::ThreadsEnter() acquire(); if( !aYieldStack.empty() ) { /* Previously called ThreadsLeave() */ - sal_uInt32 nCount = aYieldStack.front(); + sal_uIntPtr nCount = aYieldStack.front(); aYieldStack.pop_front(); while( nCount-- > 1 ) acquire(); @@ -188,12 +188,12 @@ GtkInstance::~GtkInstance() DeInitAtkBridge(); } -SalFrame* GtkInstance::CreateFrame( SalFrame* pParent, sal_uInt32 nStyle ) +SalFrame* GtkInstance::CreateFrame( SalFrame* pParent, sal_uIntPtr nStyle ) { return new GtkSalFrame( pParent, nStyle ); } -SalFrame* GtkInstance::CreateChildFrame( SystemParentData* pParentData, sal_uInt32 ) +SalFrame* GtkInstance::CreateChildFrame( SystemParentData* pParentData, sal_uIntPtr ) { SalFrame* pFrame = new GtkSalFrame( pParentData ); diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx index f3026be3dbb1..dfb311fa9c8d 100644 --- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx +++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx @@ -479,7 +479,7 @@ void GtkSalGraphics::ResetClipRegion() X11SalGraphics::ResetClipRegion(); } -void GtkSalGraphics::BeginSetClipRegion( sal_uInt32 nCount ) +void GtkSalGraphics::BeginSetClipRegion( sal_uIntPtr nCount ) { m_aClipRegion.SetNull(); X11SalGraphics::BeginSetClipRegion( nCount ); diff --git a/vcl/unx/gtk/window/gtkframe.cxx b/vcl/unx/gtk/window/gtkframe.cxx index 2b6cf8dc4484..4ef66f746b49 100644 --- a/vcl/unx/gtk/window/gtkframe.cxx +++ b/vcl/unx/gtk/window/gtkframe.cxx @@ -392,7 +392,7 @@ GtkSalFrame::GraphicsHolder::~GraphicsHolder() delete pGraphics; } -GtkSalFrame::GtkSalFrame( SalFrame* pParent, sal_uInt32 nStyle ) +GtkSalFrame::GtkSalFrame( SalFrame* pParent, sal_uIntPtr nStyle ) { m_nScreen = getDisplay()->GetDefaultScreenNumber(); getDisplay()->registerFrame( this ); @@ -755,7 +755,7 @@ GtkSalFrame *GtkSalFrame::getFromWindow( GtkWindow *pWindow ) return (GtkSalFrame *) g_object_get_data( G_OBJECT( pWindow ), "SalFrame" ); } -void GtkSalFrame::Init( SalFrame* pParent, sal_uInt32 nStyle ) +void GtkSalFrame::Init( SalFrame* pParent, sal_uIntPtr nStyle ) { if( nStyle & SAL_FRAME_STYLE_DEFAULT ) // ensure default style { @@ -1043,7 +1043,7 @@ void GtkSalFrame::SetTitle( const String& rTitle ) } static inline sal_uInt8 * -getRow( BitmapBuffer *pBuffer, sal_uInt32 nRow ) +getRow( BitmapBuffer *pBuffer, sal_uIntPtr nRow ) { if( BMP_SCANLINE_ADJUSTMENT( pBuffer->mnFormat ) == BMP_FORMAT_TOP_DOWN ) return pBuffer->mpBits + nRow * pBuffer->mnScanlineSize; @@ -1602,7 +1602,7 @@ void GtkSalFrame::SetWindowState( const SalFrameState* pState ) if( ! m_pWindow || ! pState || isChild( true, false ) ) return; - const sal_uInt32 nMaxGeometryMask = + const sal_uIntPtr nMaxGeometryMask = SAL_FRAMESTATE_MASK_X | SAL_FRAMESTATE_MASK_Y | SAL_FRAMESTATE_MASK_WIDTH | SAL_FRAMESTATE_MASK_HEIGHT | SAL_FRAMESTATE_MASK_MAXIMIZED_X | SAL_FRAMESTATE_MASK_MAXIMIZED_Y | @@ -2462,7 +2462,7 @@ void GtkSalFrame::ResetClipRegion() gdk_window_shape_combine_region( m_pWindow->window, NULL, 0, 0 ); } -void GtkSalFrame::BeginSetClipRegion( sal_uInt32 ) +void GtkSalFrame::BeginSetClipRegion( sal_uIntPtr ) { if( m_pRegion ) gdk_region_destroy( m_pRegion ); @@ -2702,7 +2702,7 @@ gboolean GtkSalFrame::signalScroll( GtkWidget*, GdkEvent* pEvent, gpointer frame GtkSalFrame* pThis = (GtkSalFrame*)frame; GdkEventScroll* pSEvent = (GdkEventScroll*)pEvent; - static sal_uInt32 nLines = 0; + static sal_uIntPtr nLines = 0; if( ! nLines ) { char* pEnv = getenv( "SAL_WHEELLINES" ); @@ -2714,8 +2714,8 @@ gboolean GtkSalFrame::signalScroll( GtkWidget*, GdkEvent* pEvent, gpointer frame bool bNeg = (pSEvent->direction == GDK_SCROLL_DOWN || pSEvent->direction == GDK_SCROLL_RIGHT ); SalWheelMouseEvent aEvent; aEvent.mnTime = pSEvent->time; - aEvent.mnX = (sal_uInt32)pSEvent->x; - aEvent.mnY = (sal_uInt32)pSEvent->y; + aEvent.mnX = (sal_uIntPtr)pSEvent->x; + aEvent.mnY = (sal_uIntPtr)pSEvent->y; aEvent.mnDelta = bNeg ? -120 : 120; aEvent.mnNotchDelta = bNeg ? -1 : 1; aEvent.mnScrollLines = nLines; diff --git a/vcl/unx/gtk/window/gtkobject.cxx b/vcl/unx/gtk/window/gtkobject.cxx index f8cb73c16c15..96648ce02d30 100644 --- a/vcl/unx/gtk/window/gtkobject.cxx +++ b/vcl/unx/gtk/window/gtkobject.cxx @@ -109,7 +109,7 @@ sal_uInt16 GtkSalObject::GetClipRegionType() return SAL_OBJECT_CLIP_INCLUDERECTS; } -void GtkSalObject::BeginSetClipRegion( sal_uInt32 ) +void GtkSalObject::BeginSetClipRegion( sal_uIntPtr ) { if( m_pRegion ) gdk_region_destroy( m_pRegion ); diff --git a/vcl/unx/headless/svpdummies.hxx b/vcl/unx/headless/svpdummies.hxx index 090f7c2af288..48b3ffc5de19 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_uInt32 nRects ); + virtual void BeginSetClipRegion( sal_uIntPtr 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 4360012351f7..b4835dbcf133 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_uInt32 nSalFrameStyle, + sal_uIntPtr nSalFrameStyle, SystemParentData* ) : m_pInstance( pInstance ), m_pParent( static_cast<SvpSalFrame*>(pParent) ), @@ -435,7 +435,7 @@ void SvpSalFrame::ResetClipRegion() { } -void SvpSalFrame::BeginSetClipRegion( sal_uInt32 ) +void SvpSalFrame::BeginSetClipRegion( sal_uIntPtr ) { } diff --git a/vcl/unx/headless/svpframe.hxx b/vcl/unx/headless/svpframe.hxx index b472a3e10103..37a9a02cde4e 100644 --- a/vcl/unx/headless/svpframe.hxx +++ b/vcl/unx/headless/svpframe.hxx @@ -40,9 +40,9 @@ class SvpSalGraphics; class SvpSalFrame : public SalFrame, public SvpElement { SvpSalInstance* m_pInstance; - SvpSalFrame* m_pParent; // pointer to parent frame + SvpSalFrame* m_pParent; // pointer to parent frame std::list< SvpSalFrame* > m_aChildren; // List of child frames - sal_uInt32 m_nStyle; + sal_uIntPtr 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_uInt32 nSalFrameStyle, + sal_uIntPtr 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_uInt32 nRects ); + virtual void BeginSetClipRegion( sal_uIntPtr 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 aa7f70ee1741..5485347213f3 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_uInt32 n ) +void SvpSalGraphics::BeginSetClipRegion( sal_uIntPtr 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_uInt32 nPoints, const SalPoint* pPtAry ) +void SvpSalGraphics::drawPolyLine( sal_uIntPtr nPoints, const SalPoint* pPtAry ) { if( m_bUseLineColor && nPoints ) { B2DPolygon aPoly; aPoly.append( B2DPoint( pPtAry->mnX, pPtAry->mnY ), nPoints ); - for( sal_uInt32 i = 1; i < nPoints; i++ ) + for( sal_uIntPtr 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_uInt32 nPoints, const SalPoint* pPtAry ) dbgOut( m_aDevice ); } -void SvpSalGraphics::drawPolygon( sal_uInt32 nPoints, const SalPoint* pPtAry ) +void SvpSalGraphics::drawPolygon( sal_uIntPtr nPoints, const SalPoint* pPtAry ) { if( ( m_bUseLineColor || m_bUseFillColor ) && nPoints ) { B2DPolygon aPoly; aPoly.append( B2DPoint( pPtAry->mnX, pPtAry->mnY ), nPoints ); - for( sal_uInt32 i = 1; i < nPoints; i++ ) + for( sal_uIntPtr 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_uInt32, +sal_Bool SvpSalGraphics::drawPolyLineBezier( sal_uIntPtr, const SalPoint*, const sal_uInt8* ) { return sal_False; } -sal_Bool SvpSalGraphics::drawPolygonBezier( sal_uInt32, +sal_Bool SvpSalGraphics::drawPolygonBezier( sal_uIntPtr, 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_uInt32 nPoints, const SalPoint* pPtAry, SalInvert /*nFlags*/ ) +void SvpSalGraphics::invert( sal_uIntPtr 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_uInt32 i = 1; i < nPoints; i++ ) + for( sal_uIntPtr 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_uInt32 ) +sal_Bool SvpSalGraphics::drawEPS( long, long, long, long, void*, sal_uIntPtr ) { return sal_False; } diff --git a/vcl/unx/headless/svpgdi.hxx b/vcl/unx/headless/svpgdi.hxx index 08efc7e846c1..2510d505f6b1 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_uInt32 nCount ); + virtual void BeginSetClipRegion( sal_uIntPtr 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_uInt32 GetKernPairs( sal_uInt32 nPairs, ImplKernPairData* pKernPairs ); + virtual sal_uIntPtr GetKernPairs( sal_uIntPtr 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_uInt32 nPoints, const SalPoint* pPtAry ); - virtual void drawPolygon( sal_uInt32 nPoints, const SalPoint* pPtAry ); + virtual void drawPolyLine( sal_uIntPtr nPoints, const SalPoint* pPtAry ); + virtual void drawPolygon( sal_uIntPtr nPoints, const SalPoint* pPtAry ); virtual void drawPolyPolygon( sal_uInt32 nPoly, const sal_uInt32* pPoints, PCONSTSALPOINT* pPtAry ); - virtual sal_Bool drawPolyLineBezier( sal_uInt32 nPoints, + virtual sal_Bool drawPolyLineBezier( sal_uIntPtr nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry ); - virtual sal_Bool drawPolygonBezier( sal_uInt32 nPoints, + virtual sal_Bool drawPolygonBezier( sal_uIntPtr 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_uInt32 nPoints, const SalPoint* pPtAry, SalInvert nFlags ); + virtual void invert( sal_uIntPtr nPoints, const SalPoint* pPtAry, SalInvert nFlags ); - virtual sal_Bool drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, sal_uInt32 nSize ); + virtual sal_Bool drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, sal_uIntPtr 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 f2c3f671c4fd..b6665550563d 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_uInt32 t2 ) +inline timeval &operator += ( timeval &t1, sal_uIntPtr 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_uInt32 nStyle ) +SalFrame* SvpSalInstance::CreateChildFrame( SystemParentData* pParent, sal_uIntPtr nStyle ) { return new SvpSalFrame( this, NULL, nStyle, pParent ); } -SalFrame* SvpSalInstance::CreateFrame( SalFrame* pParent, sal_uInt32 nStyle ) +SalFrame* SvpSalInstance::CreateFrame( SalFrame* pParent, sal_uIntPtr nStyle ) { return new SvpSalFrame( this, pParent, nStyle ); } @@ -299,13 +299,13 @@ vos::IMutex* SvpSalInstance::GetYieldMutex() return &m_aYieldMutex; } -sal_uInt32 SvpSalInstance::ReleaseYieldMutex() +sal_uIntPtr SvpSalInstance::ReleaseYieldMutex() { if ( m_aYieldMutex.GetThreadId() == vos::OThread::getCurrentIdentifier() ) { - sal_uInt32 nCount = m_aYieldMutex.GetAcquireCount(); - sal_uInt32 n = nCount; + sal_uIntPtr nCount = m_aYieldMutex.GetAcquireCount(); + sal_uIntPtr n = nCount; while ( n ) { m_aYieldMutex.release(); @@ -318,7 +318,7 @@ sal_uInt32 SvpSalInstance::ReleaseYieldMutex() return 0; } -void SvpSalInstance::AcquireYieldMutex( sal_uInt32 nCount ) +void SvpSalInstance::AcquireYieldMutex( sal_uIntPtr nCount ) { while ( nCount ) { @@ -346,7 +346,7 @@ void SvpSalInstance::Yield( bool bWait, bool bHandleAllCurrentEvents ) // release yield mutex std::list< SalUserEvent > aEvents; - sal_uInt32 nAcquireCount = ReleaseYieldMutex(); + sal_uIntPtr 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_uInt32 nMS ) +void SvpSalInstance::StartTimer( sal_uIntPtr 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_uInt32 nMS ) +void SvpSalTimer::Start( sal_uIntPtr nMS ) { m_pInstance->StartTimer( nMS ); } diff --git a/vcl/unx/headless/svpinst.hxx b/vcl/unx/headless/svpinst.hxx index b7b311b2e32d..05f3c01f5bb5 100644 --- a/vcl/unx/headless/svpinst.hxx +++ b/vcl/unx/headless/svpinst.hxx @@ -49,7 +49,7 @@ class SvpSalYieldMutex : public vos::OMutex { protected: - sal_uInt32 mnCount; + sal_uIntPtr mnCount; vos::OThread::TThreadIdentifier mnThreadId; public: @@ -59,7 +59,7 @@ public: virtual void release(); virtual sal_Bool tryToAcquire(); - sal_uInt32 GetAcquireCount() const { return mnCount; } + sal_uIntPtr 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_uInt32 nMS ); + virtual void Start( sal_uIntPtr nMS ); virtual void Stop(); }; @@ -86,7 +86,7 @@ class SvpSalFrame; class SvpSalInstance : public SalInstance { timeval m_aTimeout; - sal_uInt32 m_nTimeoutMS; + sal_uIntPtr 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_uInt32 nMS ); + void StartTimer( sal_uIntPtr nMS ); void StopTimer(); void Wakeup(); @@ -131,8 +131,8 @@ public: bool CheckTimeout( bool bExecuteTimers = true ); // Frame - virtual SalFrame* CreateChildFrame( SystemParentData* pParent, sal_uInt32 nStyle ); - virtual SalFrame* CreateFrame( SalFrame* pParent, sal_uInt32 nStyle ); + virtual SalFrame* CreateChildFrame( SystemParentData* pParent, sal_uIntPtr nStyle ); + virtual SalFrame* CreateFrame( SalFrame* pParent, sal_uIntPtr nStyle ); virtual void DestroyFrame( SalFrame* pFrame ); // Object (System Child Window) @@ -174,8 +174,8 @@ public: // YieldMutex virtual vos::IMutex* GetYieldMutex(); - virtual sal_uInt32 ReleaseYieldMutex(); - virtual void AcquireYieldMutex( sal_uInt32 nCount ); + virtual sal_uIntPtr ReleaseYieldMutex(); + virtual void AcquireYieldMutex( sal_uIntPtr nCount ); virtual bool CheckYieldMutex(); // wait next event and dispatch diff --git a/vcl/unx/headless/svpprn.cxx b/vcl/unx/headless/svpprn.cxx index 21b5e20af51d..a81f894e4505 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_uInt32 nSetDataFlags, + sal_uIntPtr nSetDataFlags, ImplJobSetup* pJobSetup ) { JobData aData; @@ -707,7 +707,7 @@ void PspSalInfoPrinter::GetPageInfo( // ----------------------------------------------------------------------- -sal_uInt32 PspSalInfoPrinter::GetPaperBinCount( const ImplJobSetup* pJobSetup ) +sal_uIntPtr PspSalInfoPrinter::GetPaperBinCount( const ImplJobSetup* pJobSetup ) { if( ! pJobSetup ) return 0; @@ -721,7 +721,7 @@ sal_uInt32 PspSalInfoPrinter::GetPaperBinCount( const ImplJobSetup* pJobSetup ) // ----------------------------------------------------------------------- -String PspSalInfoPrinter::GetPaperBinName( const ImplJobSetup* pJobSetup, sal_uInt32 nPaperBin ) +String PspSalInfoPrinter::GetPaperBinName( const ImplJobSetup* pJobSetup, sal_uIntPtr nPaperBin ) { JobData aData; JobData::constructFromStreamBuffer( pJobSetup->mpDriverData, pJobSetup->mnDriverDataLen, aData ); @@ -745,7 +745,7 @@ String PspSalInfoPrinter::GetPaperBinName( const ImplJobSetup* pJobSetup, sal_uI // ----------------------------------------------------------------------- -sal_uInt32 PspSalInfoPrinter::GetCapabilities( const ImplJobSetup* pJobSetup, sal_uInt16 nType ) +sal_uIntPtr 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_uInt32 nCopies, + sal_uIntPtr nCopies, bool bCollate, bool /*bDirect*/, ImplJobSetup* pJobSetup ) @@ -990,7 +990,7 @@ sal_Bool PspSalPrinter::EndPage() // ----------------------------------------------------------------------- -sal_uInt32 PspSalPrinter::GetErrorCode() +sal_uIntPtr PspSalPrinter::GetErrorCode() { return 0; } diff --git a/vcl/unx/headless/svpprn.hxx b/vcl/unx/headless/svpprn.hxx index 440c5b31cd52..8c7372115cde 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_uInt32 nFlags, ImplJobSetup* pSetupData ); + virtual sal_Bool SetData( sal_uIntPtr nFlags, ImplJobSetup* pSetupData ); virtual void GetPageInfo( const ImplJobSetup* pSetupData, long& rOutWidth, long& rOutHeight, long& rPageOffX, long& rPageOffY, long& rPageWidth, long& rPageHeight ); - virtual sal_uInt32 GetCapabilities( const ImplJobSetup* pSetupData, sal_uInt16 nType ); - virtual sal_uInt32 GetPaperBinCount( const ImplJobSetup* pSetupData ); - virtual String GetPaperBinName( const ImplJobSetup* pSetupData, sal_uInt32 nPaperBin ); + 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 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_uInt32 m_nCopies; + sal_uIntPtr 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_uInt32 nCopies, + sal_uIntPtr 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_uInt32 GetErrorCode(); + virtual sal_uIntPtr GetErrorCode(); }; class Timer; diff --git a/vcl/unx/headless/svppspgraphics.cxx b/vcl/unx/headless/svppspgraphics.cxx index f0067f1677f3..fe9a883fa583 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_uInt32 n ) +void PspGraphics::BeginSetClipRegion( sal_uIntPtr 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_uInt32 nPoints, const SalPoint *pPtAry ) +void PspGraphics::drawPolyLine( sal_uIntPtr nPoints, const SalPoint *pPtAry ) { m_pPrinterGfx->DrawPolyLine (nPoints, (Point*)pPtAry); } -void PspGraphics::drawPolygon( sal_uInt32 nPoints, const SalPoint* pPtAry ) +void PspGraphics::drawPolygon( sal_uIntPtr 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_uInt32 nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry ) +sal_Bool PspGraphics::drawPolyLineBezier( sal_uIntPtr nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry ) { m_pPrinterGfx->DrawPolyLineBezier (nPoints, (Point*)pPtAry, pFlgAry); return sal_True; } -sal_Bool PspGraphics::drawPolygonBezier( sal_uInt32 nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry ) +sal_Bool PspGraphics::drawPolygonBezier( sal_uIntPtr 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_uInt32 /*nPoints*/, +void PspGraphics::invert( sal_uIntPtr /*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_uInt32 nSize ) +sal_Bool PspGraphics::drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, sal_uIntPtr 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_uInt32 nPairs, ImplKernPairData *pKernPairs ) +sal_uInt32 PspGraphics::GetKernPairs( sal_uIntPtr nPairs, ImplKernPairData *pKernPairs ) { const ::std::list< ::psp::KernPair >& rPairs( m_pPrinterGfx->getKernPairs() ); - sal_uInt32 nHavePairs = rPairs.size(); + sal_uIntPtr 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 666dc942739a..ee6f5bc25570 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_uInt32 nCount ); + virtual void BeginSetClipRegion( sal_uIntPtr 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_uInt32 GetKernPairs( sal_uInt32 nPairs, ImplKernPairData* pKernPairs ); + virtual sal_uIntPtr GetKernPairs( sal_uIntPtr 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_uInt32 nPoints, const SalPoint* pPtAry ); - virtual void drawPolygon( sal_uInt32 nPoints, const SalPoint* pPtAry ); + virtual void drawPolyLine( sal_uIntPtr nPoints, const SalPoint* pPtAry ); + virtual void drawPolygon( sal_uIntPtr 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_uInt32 nPoints, + virtual sal_Bool drawPolyLineBezier( sal_uIntPtr nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry ); - virtual sal_Bool drawPolygonBezier( sal_uInt32 nPoints, + virtual sal_Bool drawPolygonBezier( sal_uIntPtr 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_uInt32 nPoints, const SalPoint* pPtAry, SalInvert nFlags ); + virtual void invert( sal_uIntPtr nPoints, const SalPoint* pPtAry, SalInvert nFlags ); - virtual sal_Bool drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, sal_uInt32 nSize ); + 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 ); virtual SystemGraphicsData GetGraphicsData() const; diff --git a/vcl/unx/headless/svptext.cxx b/vcl/unx/headless/svptext.cxx index 1ceba05bf87b..dbe1b2c4dc32 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_uInt32 SvpSalGraphics::GetKernPairs( sal_uInt32 nPairs, ImplKernPairData* pKernPairs ) +sal_uIntPtr SvpSalGraphics::GetKernPairs( sal_uIntPtr nPairs, ImplKernPairData* pKernPairs ) { - sal_uInt32 nGotPairs = 0; + sal_uIntPtr nGotPairs = 0; if( m_pServerFont[0] != NULL ) { ImplKernPairData* pTmpKernPairs = NULL; nGotPairs = m_pServerFont[0]->GetKernPairs( &pTmpKernPairs ); - for( sal_uInt32 i = 0; i < nPairs && i < nGotPairs; ++i ) + for( sal_uIntPtr i = 0; i < nPairs && i < nGotPairs; ++i ) pKernPairs[ i ] = pTmpKernPairs[ i ]; delete[] pTmpKernPairs; } diff --git a/vcl/unx/inc/plugins/gtk/gtkframe.hxx b/vcl/unx/inc/plugins/gtk/gtkframe.hxx index a623472df797..528b08925ad4 100644 --- a/vcl/unx/inc/plugins/gtk/gtkframe.hxx +++ b/vcl/unx/inc/plugins/gtk/gtkframe.hxx @@ -167,7 +167,7 @@ class GtkSalFrame : public SalFrame GdkWindow* m_pForeignTopLevel; GdkNativeWindow m_aForeignTopLevelWindow; Pixmap m_hBackgroundPixmap; - sal_uInt32 m_nStyle; + sal_uIntPtr m_nStyle; SalExtStyle m_nExtStyle; GtkFixed* m_pFixedContainer; GtkSalFrame* m_pParent; @@ -199,7 +199,7 @@ class GtkSalFrame : public SalFrame GdkRegion* m_pRegion; - void Init( SalFrame* pParent, sal_uInt32 nStyle ); + void Init( SalFrame* pParent, sal_uIntPtr nStyle ); void Init( SystemParentData* pSysData ); void InitCommon(); @@ -251,7 +251,7 @@ class GtkSalFrame : public SalFrame bool isChild( bool bPlug = true, bool bSysChild = true ) { - sal_uInt32 nMask = 0; + sal_uIntPtr nMask = 0; if( bPlug ) nMask |= SAL_FRAME_STYLE_PLUG; if( bSysChild ) @@ -270,7 +270,7 @@ class GtkSalFrame : public SalFrame DECL_LINK( ImplDelayedFullScreenHdl, void* ); public: - GtkSalFrame( SalFrame* pParent, sal_uInt32 nStyle ); + GtkSalFrame( SalFrame* pParent, sal_uIntPtr nStyle ); GtkSalFrame( SystemParentData* pSysData ); // dispatches an event, returns true if dispatched @@ -386,7 +386,7 @@ public: // set clip region to none (-> rectangular windows, normal state) virtual void ResetClipRegion(); // start setting the clipregion consisting of nRects rectangles - virtual void BeginSetClipRegion( sal_uInt32 nRects ); + virtual void BeginSetClipRegion( sal_uIntPtr nRects ); // add a rectangle to the clip region virtual void UnionClipRegion( long nX, long nY, long nWidth, long nHeight ); // done setting up the clipregion diff --git a/vcl/unx/inc/plugins/gtk/gtkgdi.hxx b/vcl/unx/inc/plugins/gtk/gtkgdi.hxx index 8fb17371d90c..57e36ca5a2ed 100644 --- a/vcl/unx/inc/plugins/gtk/gtkgdi.hxx +++ b/vcl/unx/inc/plugins/gtk/gtkgdi.hxx @@ -79,7 +79,7 @@ public: void updateSettings( AllSettings& rSettings ); virtual void ResetClipRegion(); - virtual void BeginSetClipRegion( sal_uInt32 nCount ); + virtual void BeginSetClipRegion( sal_uIntPtr nCount ); virtual sal_Bool unionClipRegion( long nX, long nY, long nWidth, long nHeight ); virtual bool unionClipRegion( const ::basegfx::B2DPolyPolygon& ); virtual void EndSetClipRegion(); diff --git a/vcl/unx/inc/plugins/gtk/gtkinst.hxx b/vcl/unx/inc/plugins/gtk/gtkinst.hxx index a6a508118865..58c485ce6e20 100644 --- a/vcl/unx/inc/plugins/gtk/gtkinst.hxx +++ b/vcl/unx/inc/plugins/gtk/gtkinst.hxx @@ -63,7 +63,7 @@ class GtkHookedYieldMutex : public GtkYieldMutex { virtual int Grab() { return 0; }; virtual void Ungrab(int ) {}; - std::list<sal_uInt32> aYieldStack; + std::list<sal_uIntPtr> aYieldStack; public: GtkHookedYieldMutex(); virtual void acquire(); @@ -84,8 +84,8 @@ public: {} virtual ~GtkInstance(); - virtual SalFrame* CreateFrame( SalFrame* pParent, sal_uInt32 nStyle ); - virtual SalFrame* CreateChildFrame( SystemParentData* pParent, sal_uInt32 nStyle ); + virtual SalFrame* CreateFrame( SalFrame* pParent, sal_uIntPtr nStyle ); + virtual SalFrame* CreateChildFrame( SystemParentData* pParent, sal_uIntPtr nStyle ); virtual SalObject* CreateObject( SalFrame* pParent, SystemWindowData* pWindowData, sal_Bool bShow = sal_True ); virtual SalSystem* CreateSalSystem(); virtual void AddToRecentDocumentList(const rtl::OUString& rFileUrl, const rtl::OUString& rMimeType); diff --git a/vcl/unx/inc/plugins/gtk/gtkobject.hxx b/vcl/unx/inc/plugins/gtk/gtkobject.hxx index 8188fcfd4b88..fdba1bb9fd38 100644 --- a/vcl/unx/inc/plugins/gtk/gtkobject.hxx +++ b/vcl/unx/inc/plugins/gtk/gtkobject.hxx @@ -50,7 +50,7 @@ public: // overload all pure virtual methods virtual void ResetClipRegion(); virtual sal_uInt16 GetClipRegionType(); - virtual void BeginSetClipRegion( sal_uInt32 nRects ); + virtual void BeginSetClipRegion( sal_uIntPtr nRects ); virtual void UnionClipRegion( long nX, long nY, long nWidth, long nHeight ); virtual void EndSetClipRegion(); diff --git a/vcl/unx/inc/plugins/kde/kdedata.hxx b/vcl/unx/inc/plugins/kde/kdedata.hxx index 501dbfbbb616..e31c4b7cc8e7 100644 --- a/vcl/unx/inc/plugins/kde/kdedata.hxx +++ b/vcl/unx/inc/plugins/kde/kdedata.hxx @@ -67,7 +67,7 @@ class KDESalFrame : public X11SalFrame GraphicsHolder m_aGraphics[ nMaxGraphics ]; public: - KDESalFrame( SalFrame* pParent, sal_uInt32 ); + KDESalFrame( SalFrame* pParent, sal_uIntPtr ); virtual ~KDESalFrame(); virtual SalGraphics* GetGraphics(); @@ -83,7 +83,7 @@ public: KDESalInstance( SalYieldMutex* pMutex ) : X11SalInstance( pMutex ) {} virtual ~KDESalInstance() {} - virtual SalFrame* CreateFrame( SalFrame* pParent, sal_uInt32 nStyle ); + virtual SalFrame* CreateFrame( SalFrame* pParent, sal_uIntPtr nStyle ); }; class KDEXLib : public SalXLib diff --git a/vcl/unx/inc/pspgraphics.h b/vcl/unx/inc/pspgraphics.h index f9c988dda908..08d5918cf7bd 100644 --- a/vcl/unx/inc/pspgraphics.h +++ b/vcl/unx/inc/pspgraphics.h @@ -87,7 +87,7 @@ public: virtual long GetGraphicsWidth() const; virtual void ResetClipRegion(); - virtual void BeginSetClipRegion( sal_uInt32 nCount ); + virtual void BeginSetClipRegion( sal_uIntPtr nCount ); virtual sal_Bool unionClipRegion( long nX, long nY, long nWidth, long nHeight ); virtual bool unionClipRegion( const ::basegfx::B2DPolyPolygon& ); virtual void EndSetClipRegion(); @@ -103,7 +103,7 @@ public: virtual void SetTextColor( SalColor nSalColor ); virtual sal_uInt16 SetFont( ImplFontSelectData*, int nFallbackLevel ); virtual void GetFontMetric( ImplFontMetricData*, int nFallbackLevel ); - virtual sal_uInt32 GetKernPairs( sal_uInt32 nMaxPairs, ImplKernPairData* ); + virtual sal_uIntPtr GetKernPairs( sal_uIntPtr nMaxPairs, ImplKernPairData* ); virtual const ImplFontCharMap* GetImplFontCharMap() const; virtual void GetDevFontList( ImplDevFontList* ); virtual void GetDevFontSubstList( OutputDevice* ); @@ -136,17 +136,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_uInt32 nPoints, const SalPoint* pPtAry ); - virtual void drawPolygon( sal_uInt32 nPoints, const SalPoint* pPtAry ); + virtual void drawPolyLine( sal_uIntPtr nPoints, const SalPoint* pPtAry ); + virtual void drawPolygon( sal_uIntPtr 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&, double fTransparency, const basegfx::B2DVector& rLineWidths, basegfx::B2DLineJoin); - virtual sal_Bool drawPolyLineBezier( sal_uInt32 nPoints, + virtual sal_Bool drawPolyLineBezier( sal_uIntPtr nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry ); - virtual sal_Bool drawPolygonBezier( sal_uInt32 nPoints, + virtual sal_Bool drawPolygonBezier( sal_uIntPtr nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry ); virtual sal_Bool drawPolyPolygonBezier( sal_uInt32 nPoly, @@ -176,9 +176,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_uInt32 nPoints, const SalPoint* pPtAry, SalInvert nFlags ); + virtual void invert( sal_uIntPtr nPoints, const SalPoint* pPtAry, SalInvert nFlags ); - virtual sal_Bool drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, sal_uInt32 nSize ); + 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 ); virtual bool drawAlphaBitmap( const SalTwoRect&, diff --git a/vcl/unx/inc/salbmp.h b/vcl/unx/inc/salbmp.h index c0b5854e5c51..121966345f75 100644 --- a/vcl/unx/inc/salbmp.h +++ b/vcl/unx/inc/salbmp.h @@ -62,7 +62,7 @@ private: public: static ImplSalBitmapCache* mpCache; - static sal_uInt32 mnCacheInstCount; + static sal_uIntPtr mnCacheInstCount; static void ImplCreateCache(); static void ImplDestroyCache(); @@ -161,7 +161,7 @@ public: long ImplGetWidth() const { return maTwoRect.mnDestWidth; } long ImplGetHeight() const { return maTwoRect.mnDestHeight; } long ImplGetDepth() const { return mnDepth; } - sal_uInt32 ImplGetMemSize() const { return( ( maTwoRect.mnDestWidth * maTwoRect.mnDestHeight * mnDepth ) >> 3 ); } + sal_uIntPtr ImplGetMemSize() const { return( ( maTwoRect.mnDestWidth * maTwoRect.mnDestHeight * mnDepth ) >> 3 ); } int ImplGetScreen() const { return mnScreen; } bool ImplMatches( int nScreen, long nDepth, const SalTwoRect& rTwoRect ) const; @@ -178,14 +178,14 @@ class ImplSalBitmapCache private: List maBmpList; - sal_uInt32 mnTotalSize; + sal_uIntPtr mnTotalSize; public: ImplSalBitmapCache(); ~ImplSalBitmapCache(); - void ImplAdd( X11SalBitmap* pBmp, sal_uInt32 nMemSize = 0UL, sal_uInt32 nFlags = 0UL ); + void ImplAdd( X11SalBitmap* pBmp, sal_uIntPtr nMemSize = 0UL, sal_uIntPtr nFlags = 0UL ); void ImplRemove( X11SalBitmap* pBmp ); void ImplClear(); }; diff --git a/vcl/unx/inc/saldata.hxx b/vcl/unx/inc/saldata.hxx index 79c7ca277e82..34180474e256 100644 --- a/vcl/unx/inc/saldata.hxx +++ b/vcl/unx/inc/saldata.hxx @@ -85,7 +85,7 @@ public: inline SalXLib* GetLib() const { return pXLib_; } inline pthread_t GetMainThread() const { return hMainThread_; } - void StartTimer( sal_uInt32 nMS ); + void StartTimer( sal_uIntPtr nMS ); inline void StopTimer(); void Timeout() const; @@ -114,7 +114,7 @@ inline void X11SalData::XError( Display *pDisplay, XErrorEvent *pEvent ) const class YieldMutexReleaser { - sal_uInt32 m_nYieldCount; + sal_uIntPtr m_nYieldCount; public: inline YieldMutexReleaser(); inline ~YieldMutexReleaser(); diff --git a/vcl/unx/inc/saldisp.hxx b/vcl/unx/inc/saldisp.hxx index daff940b1f4e..2c35ce4445ed 100644 --- a/vcl/unx/inc/saldisp.hxx +++ b/vcl/unx/inc/saldisp.hxx @@ -212,7 +212,7 @@ class VCL_DLLPUBLIC SalXLib { protected: timeval m_aTimeout; - sal_uInt32 m_nTimeoutMS; + sal_uIntPtr m_nTimeoutMS; int m_pTimeoutFDS[2]; bool m_bHaveSystemChildFrames; @@ -254,7 +254,7 @@ public: void PushXErrorLevel( bool bIgnore ); void PopXErrorLevel(); - virtual void StartTimer( sal_uInt32 nMS ); + virtual void StartTimer( sal_uIntPtr nMS ); virtual void StopTimer(); bool CheckTimeout( bool bExecuteTimers = true ); @@ -358,11 +358,11 @@ protected: ScreenData m_aInvalidScreenData; Pair aResolution_; // [dpi] bool mbExactResolution; - sal_uInt32 nMaxRequestSize_; // [byte] + sal_uIntPtr nMaxRequestSize_; // [byte] srv_vendor_t meServerVendor; SalWM eWindowManager_; - sal_uInt32 nProperties_; // PROPERTY_SUPPORT, BUG, FEATURE + sal_uIntPtr nProperties_; // PROPERTY_SUPPORT, BUG, FEATURE sal_Bool bLocal_; // Server==Client? Init // in SalDisplay::IsLocal() sal_Bool mbLocalIsValid; // bLocal_ is valid ? @@ -493,8 +493,8 @@ public: RenderEntryMap& GetRenderEntries( int nScreen ) const { return getDataForScreen(nScreen).m_aRenderData; } const Pair &GetResolution() const { return aResolution_; } bool GetExactResolution() const { return mbExactResolution; } - sal_uInt32 GetProperties() const { return nProperties_; } - sal_uInt32 GetMaxRequestSize() const { return nMaxRequestSize_; } + sal_uIntPtr GetProperties() const { return nProperties_; } + sal_uIntPtr GetMaxRequestSize() const { return nMaxRequestSize_; } XLIB_Time GetLastUserEventTime( bool bAlwaysReget = false ) const; bool XIfEventWithTimeout( XEvent*, XPointer, X_if_predicate, long i_nTimeout = 1000 ) const; diff --git a/vcl/unx/inc/salframe.h b/vcl/unx/inc/salframe.h index 076755cde8e8..dde04b79f3ac 100644 --- a/vcl/unx/inc/salframe.h +++ b/vcl/unx/inc/salframe.h @@ -98,7 +98,7 @@ class VCL_DLLPUBLIC X11SalFrame : public SalFrame int nWidth_; // client width int nHeight_; // client height Rectangle maRestorePosSize; - sal_uInt32 nStyle_; + sal_uIntPtr nStyle_; SalExtStyle mnExtStyle; sal_Bool bAlwaysOnTop_; sal_Bool bViewable_; @@ -172,11 +172,11 @@ class VCL_DLLPUBLIC X11SalFrame : public SalFrame void setXEmbedInfo(); void askForXEmbedFocus( sal_Int32 i_nTimeCode ); public: - X11SalFrame( SalFrame* pParent, sal_uInt32 nSalFrameStyle, SystemParentData* pSystemParent = NULL ); + X11SalFrame( SalFrame* pParent, sal_uIntPtr nSalFrameStyle, SystemParentData* pSystemParent = NULL ); virtual ~X11SalFrame(); long Dispatch( XEvent *pEvent ); - void Init( sal_uInt32 nSalFrameStyle, int nScreen = -1, + void Init( sal_uIntPtr nSalFrameStyle, int nScreen = -1, SystemParentData* pParentData = NULL, bool bUseGeometry = false ); SalDisplay* GetDisplay() const { return pDisplay_; } @@ -189,7 +189,7 @@ public: XLIB_Window GetStackingWindow() const { return mhStackingWindow; } long ShutDown() const { return CallCallback( SALEVENT_SHUTDOWN, 0 ); } long Close() const { return CallCallback( SALEVENT_CLOSE, 0 ); } - sal_uInt32 GetStyle() const { return nStyle_; } + sal_uIntPtr GetStyle() const { return nStyle_; } inline XLIB_Cursor GetCursor() const { return hCursor_; } inline sal_Bool IsCaptured() const { return nCaptured_ == 1; } @@ -268,7 +268,7 @@ public: // set clip region to none (-> rectangular windows, normal state) virtual void ResetClipRegion(); // start setting the clipregion consisting of nRects rectangles - virtual void BeginSetClipRegion( sal_uInt32 nRects ); + virtual void BeginSetClipRegion( sal_uIntPtr nRects ); // add a rectangle to the clip region virtual void UnionClipRegion( long nX, long nY, long nWidth, long nHeight ); // done setting up the clipregion diff --git a/vcl/unx/inc/salgdi.h b/vcl/unx/inc/salgdi.h index 08da57182ac9..bb606b08bdf9 100644 --- a/vcl/unx/inc/salgdi.h +++ b/vcl/unx/inc/salgdi.h @@ -147,7 +147,7 @@ protected: unsigned long nMask = GCGraphicsExposures ); GC SelectPen(); GC SelectBrush(); - void DrawLines( sal_uInt32 nPoints, + void DrawLines( sal_uIntPtr nPoints, const SalPolyLine &rPoints, GC pGC, bool bClose @@ -235,7 +235,7 @@ public: virtual long GetGraphicsHeight() const; virtual void ResetClipRegion(); - virtual void BeginSetClipRegion( sal_uInt32 nCount ); + virtual void BeginSetClipRegion( sal_uIntPtr nCount ); virtual sal_Bool unionClipRegion( long nX, long nY, long nWidth, long nHeight ); virtual bool unionClipRegion( const ::basegfx::B2DPolyPolygon& ); virtual void EndSetClipRegion(); @@ -254,7 +254,7 @@ public: virtual void SetTextColor( SalColor nSalColor ); virtual sal_uInt16 SetFont( ImplFontSelectData*, int nFallbackLevel ); virtual void GetFontMetric( ImplFontMetricData*, int nFallbackLevel ); - virtual sal_uInt32 GetKernPairs( sal_uInt32 nMaxPairs, ImplKernPairData* ); + virtual sal_uIntPtr GetKernPairs( sal_uIntPtr nMaxPairs, ImplKernPairData* ); virtual const ImplFontCharMap* GetImplFontCharMap() const; virtual void GetDevFontList( ImplDevFontList* ); virtual void GetDevFontSubstList( OutputDevice* ); @@ -287,9 +287,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_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 ); + 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 ); virtual void drawPolyPolygon( sal_uInt32 nPoly, const sal_uInt32* pPoints, PCONSTSALPOINT* pPtAry ); @@ -298,10 +298,10 @@ public: virtual bool drawFilledTrapezoids( const ::basegfx::B2DTrapezoid*, int nTrapCount, double fTransparency ); #if 1 // TODO: remove these obselete methods - virtual sal_Bool drawPolyLineBezier( sal_uInt32 nPoints, + virtual sal_Bool drawPolyLineBezier( sal_uIntPtr nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry ); - virtual sal_Bool drawPolygonBezier( sal_uInt32 nPoints, + virtual sal_Bool drawPolygonBezier( sal_uIntPtr nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry ); virtual sal_Bool drawPolyPolygonBezier( sal_uInt32 nPoly, @@ -333,9 +333,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_uInt32 nPoints, const SalPoint* pPtAry, SalInvert nFlags ); + virtual void invert( sal_uIntPtr nPoints, const SalPoint* pPtAry, SalInvert nFlags ); - virtual sal_Bool drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, sal_uInt32 nSize ); + virtual sal_Bool drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, sal_uIntPtr nSize ); virtual bool drawAlphaBitmap( const SalTwoRect&, const SalBitmap& rSourceBitmap, diff --git a/vcl/unx/inc/salinst.h b/vcl/unx/inc/salinst.h index fab34429afb2..2f53a979a485 100644 --- a/vcl/unx/inc/salinst.h +++ b/vcl/unx/inc/salinst.h @@ -42,7 +42,7 @@ class VCL_DLLPUBLIC SalYieldMutex : public vos::OMutex { protected: - sal_uInt32 mnCount; + sal_uIntPtr mnCount; vos::OThread::TThreadIdentifier mnThreadId; public: @@ -52,7 +52,7 @@ public: virtual void release(); virtual sal_Bool tryToAcquire(); - sal_uInt32 GetAcquireCount() const { return mnCount; } + sal_uIntPtr GetAcquireCount() const { return mnCount; } vos::OThread::TThreadIdentifier GetThreadId() const { return mnThreadId; } }; @@ -70,8 +70,8 @@ public: {} virtual ~X11SalInstance(); - virtual SalFrame* CreateChildFrame( SystemParentData* pParent, sal_uInt32 nStyle ); - virtual SalFrame* CreateFrame( SalFrame* pParent, sal_uInt32 nStyle ); + virtual SalFrame* CreateChildFrame( SystemParentData* pParent, sal_uIntPtr nStyle ); + virtual SalFrame* CreateFrame( SalFrame* pParent, sal_uIntPtr nStyle ); virtual void DestroyFrame( SalFrame* pFrame ); virtual SalObject* CreateObject( SalFrame* pParent, SystemWindowData* pWindowData, sal_Bool bShow = sal_True ); @@ -100,8 +100,8 @@ public: virtual SalSession* CreateSalSession(); virtual vos::IMutex* GetYieldMutex(); - virtual sal_uInt32 ReleaseYieldMutex(); - virtual void AcquireYieldMutex( sal_uInt32 nCount ); + virtual sal_uIntPtr ReleaseYieldMutex(); + virtual void AcquireYieldMutex( sal_uIntPtr nCount ); virtual bool CheckYieldMutex(); virtual void Yield( bool bWait, bool bHandleAllCurrentEvents ); diff --git a/vcl/unx/inc/salobj.h b/vcl/unx/inc/salobj.h index 865b09f39a04..c843708f0c2e 100644 --- a/vcl/unx/inc/salobj.h +++ b/vcl/unx/inc/salobj.h @@ -41,7 +41,7 @@ public: SalClipRegion(); ~SalClipRegion(); - void BeginSetClipRegion( sal_uInt32 nRects ); + void BeginSetClipRegion( sal_uIntPtr nRects ); void UnionClipRegion( long nX, long nY, long nWidth, long nHeight ); XRectangle *EndSetClipRegion() { @@ -84,7 +84,7 @@ public: // overload all pure virtual methods virtual void ResetClipRegion(); virtual sal_uInt16 GetClipRegionType(); - virtual void BeginSetClipRegion( sal_uInt32 nRects ); + virtual void BeginSetClipRegion( sal_uIntPtr nRects ); virtual void UnionClipRegion( long nX, long nY, long nWidth, long nHeight ); virtual void EndSetClipRegion(); diff --git a/vcl/unx/inc/salprn.h b/vcl/unx/inc/salprn.h index 8902f2efd497..7b42ad74c923 100644 --- a/vcl/unx/inc/salprn.h +++ b/vcl/unx/inc/salprn.h @@ -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_uInt32 nFlags, ImplJobSetup* pSetupData ); + virtual sal_Bool SetData( sal_uIntPtr nFlags, ImplJobSetup* pSetupData ); virtual void GetPageInfo( const ImplJobSetup* pSetupData, long& rOutWidth, long& rOutHeight, long& rPageOffX, long& rPageOffY, long& rPageWidth, long& rPageHeight ); - virtual sal_uInt32 GetCapabilities( const ImplJobSetup* pSetupData, sal_uInt16 nType ); - virtual sal_uInt32 GetPaperBinCount( const ImplJobSetup* pSetupData ); - virtual String GetPaperBinName( const ImplJobSetup* pSetupData, sal_uInt32 nPaperBin ); + 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 void InitPaperFormats( const ImplJobSetup* pSetupData ); virtual int GetLandscapeAngle( const ImplJobSetup* pSetupData ); }; @@ -76,7 +76,7 @@ public: psp::PrinterJob m_aPrintJob; psp::JobData m_aJobData; psp::PrinterGfx m_aPrinterGfx; - sal_uInt32 m_nCopies; + sal_uIntPtr m_nCopies; bool m_bCollate; SalInfoPrinter* m_pInfoPrinter; @@ -88,7 +88,7 @@ public: virtual sal_Bool StartJob( const XubString* pFileName, const XubString& rJobName, const XubString& rAppName, - sal_uInt32 nCopies, + sal_uIntPtr nCopies, bool bCollate, bool bDirect, ImplJobSetup* pSetupData ); @@ -101,7 +101,7 @@ public: virtual sal_Bool AbortJob(); virtual SalGraphics* StartPage( ImplJobSetup* pSetupData, sal_Bool bNewJobData ); virtual sal_Bool EndPage(); - virtual sal_uInt32 GetErrorCode(); + virtual sal_uIntPtr GetErrorCode(); }; class Timer; diff --git a/vcl/unx/inc/saltimer.h b/vcl/unx/inc/saltimer.h index 8f0512d47468..ba52b96c073a 100644 --- a/vcl/unx/inc/saltimer.h +++ b/vcl/unx/inc/saltimer.h @@ -37,7 +37,7 @@ public: virtual ~X11SalTimer(); // overload all pure virtual methods - void Start( sal_uInt32 nMS ); + void Start( sal_uIntPtr nMS ); void Stop(); }; diff --git a/vcl/unx/inc/salunx.h b/vcl/unx/inc/salunx.h index 8c543af39f29..8be91cbd3bce 100644 --- a/vcl/unx/inc/salunx.h +++ b/vcl/unx/inc/salunx.h @@ -95,7 +95,7 @@ inline timeval &operator += ( timeval &t1, const timeval &t2 ) return t1; } -inline timeval &operator += ( timeval &t1, sal_uInt32 t2 ) +inline timeval &operator += ( timeval &t1, sal_uIntPtr t2 ) { t1.tv_sec += t2 / 1000; t1.tv_usec += t2 ? (t2 % 1000) * 1000 : 500; @@ -113,7 +113,7 @@ inline timeval operator + ( const timeval &t1, const timeval &t2 ) return t0 += t2; } -inline timeval operator + ( const timeval &t1, sal_uInt32 t2 ) +inline timeval operator + ( const timeval &t1, sal_uIntPtr t2 ) { timeval t0 = t1; return t0 += t2; diff --git a/vcl/unx/kde/salnativewidgets-kde.cxx b/vcl/unx/kde/salnativewidgets-kde.cxx index b92b05abc653..9d3dd511de19 100644 --- a/vcl/unx/kde/salnativewidgets-kde.cxx +++ b/vcl/unx/kde/salnativewidgets-kde.cxx @@ -1710,7 +1710,7 @@ sal_Bool KDESalGraphics::getNativeControlRegion( ControlType nType, ControlPart // KDESalFrame implementation // ----------------------------------------------------------------------- -KDESalFrame::KDESalFrame( SalFrame* pParent, sal_uInt32 nStyle ) : +KDESalFrame::KDESalFrame( SalFrame* pParent, sal_uIntPtr nStyle ) : X11SalFrame( pParent, nStyle ) { } @@ -2083,7 +2083,7 @@ KDESalFrame::GraphicsHolder::~GraphicsHolder() // ----------------------------------------------------------------------- SalFrame * -KDESalInstance::CreateFrame( SalFrame *pParent, sal_uInt32 nStyle ) +KDESalInstance::CreateFrame( SalFrame *pParent, sal_uIntPtr nStyle ) { return new KDESalFrame( pParent, nStyle ); } diff --git a/vcl/unx/source/app/i18n_status.cxx b/vcl/unx/source/app/i18n_status.cxx index 8937a71c905f..594cdf9c89de 100644 --- a/vcl/unx/source/app/i18n_status.cxx +++ b/vcl/unx/source/app/i18n_status.cxx @@ -102,7 +102,7 @@ class XIMStatusWindow : public StatusWindow // for delayed showing bool m_bDelayedShow; I18NStatus::ShowReason m_eDelayedReason; - sal_uInt32 m_nDelayedEvent; + sal_uIntPtr m_nDelayedEvent; // for toggling bool m_bOn; diff --git a/vcl/unx/source/app/salinst.cxx b/vcl/unx/source/app/salinst.cxx index 9284f6aaa293..431367deeef1 100644 --- a/vcl/unx/source/app/salinst.cxx +++ b/vcl/unx/source/app/salinst.cxx @@ -227,14 +227,14 @@ vos::IMutex* X11SalInstance::GetYieldMutex() // ----------------------------------------------------------------------- -sal_uInt32 X11SalInstance::ReleaseYieldMutex() +sal_uIntPtr X11SalInstance::ReleaseYieldMutex() { SalYieldMutex* pYieldMutex = mpSalYieldMutex; if ( pYieldMutex->GetThreadId() == vos::OThread::getCurrentIdentifier() ) { - sal_uInt32 nCount = pYieldMutex->GetAcquireCount(); - sal_uInt32 n = nCount; + sal_uIntPtr nCount = pYieldMutex->GetAcquireCount(); + sal_uIntPtr n = nCount; while ( n ) { pYieldMutex->release(); @@ -249,7 +249,7 @@ sal_uInt32 X11SalInstance::ReleaseYieldMutex() // ----------------------------------------------------------------------- -void X11SalInstance::AcquireYieldMutex( sal_uInt32 nCount ) +void X11SalInstance::AcquireYieldMutex( sal_uIntPtr nCount ) { SalYieldMutex* pYieldMutex = mpSalYieldMutex; while ( nCount ) @@ -288,14 +288,14 @@ void* X11SalInstance::GetConnectionIdentifier( ConnectionIdentifierType& rReturn return pDisplay ? (void*)pDisplay : (void*)""; } -SalFrame *X11SalInstance::CreateFrame( SalFrame *pParent, sal_uInt32 nSalFrameStyle ) +SalFrame *X11SalInstance::CreateFrame( SalFrame *pParent, sal_uIntPtr nSalFrameStyle ) { SalFrame *pFrame = new X11SalFrame( pParent, nSalFrameStyle ); return pFrame; } -SalFrame* X11SalInstance::CreateChildFrame( SystemParentData* pParentData, sal_uInt32 nStyle ) +SalFrame* X11SalInstance::CreateChildFrame( SystemParentData* pParentData, sal_uIntPtr nStyle ) { SalFrame* pFrame = new X11SalFrame( NULL, nStyle, pParentData ); diff --git a/vcl/unx/source/app/saltimer.cxx b/vcl/unx/source/app/saltimer.cxx index 7c4ec0676428..cb8f7d06f64e 100644 --- a/vcl/unx/source/app/saltimer.cxx +++ b/vcl/unx/source/app/saltimer.cxx @@ -58,7 +58,7 @@ void SalXLib::StopTimer() m_nTimeoutMS = 0; } -void SalXLib::StartTimer( sal_uInt32 nMS ) +void SalXLib::StartTimer( sal_uIntPtr nMS ) { timeval Timeout (m_aTimeout); // previous timeout. gettimeofday (&m_aTimeout, 0); @@ -89,7 +89,7 @@ void X11SalTimer::Stop() GetX11SalData()->GetLib()->StopTimer(); } -void X11SalTimer::Start( sal_uInt32 nMS ) +void X11SalTimer::Start( sal_uIntPtr nMS ) { GetX11SalData()->GetLib()->StartTimer( nMS ); } diff --git a/vcl/unx/source/gdi/gcach_xpeer.cxx b/vcl/unx/source/gdi/gcach_xpeer.cxx index 3d2af898c7e2..c3ff95b99082 100644 --- a/vcl/unx/source/gdi/gcach_xpeer.cxx +++ b/vcl/unx/source/gdi/gcach_xpeer.cxx @@ -465,13 +465,13 @@ Pixmap X11GlyphPeer::GetPixmap( ServerFont& rServerFont, int nGlyphIndex, int nR if( rServerFont.GetGlyphBitmap1( nGlyphIndex, maRawBitmap ) ) { // #94666# circumvent bug in some X11 systems, e.g. XF410.LynxEM.v163 - sal_uInt32 nPixmapWidth = 8 * maRawBitmap.mnScanlineSize - 1; + sal_uIntPtr nPixmapWidth = 8 * maRawBitmap.mnScanlineSize - 1; nPixmapWidth = Max( nPixmapWidth, maRawBitmap.mnWidth ); rGlyphData.SetSize( Size( nPixmapWidth, maRawBitmap.mnHeight ) ); rGlyphData.SetOffset( +maRawBitmap.mnXOffset, +maRawBitmap.mnYOffset ); - const sal_uInt32 nBytes = maRawBitmap.mnHeight * maRawBitmap.mnScanlineSize; + const sal_uIntPtr nBytes = maRawBitmap.mnHeight * maRawBitmap.mnScanlineSize; if( nBytes > 0 ) { // conversion table LSB<->MSB (for XCreatePixmapFromData) @@ -621,7 +621,7 @@ Glyph X11GlyphPeer::GetGlyphId( ServerFont& rServerFont, int nGlyphIndex ) GlyphSet aGlyphSet = GetGlyphSet( rServerFont, -1 ); aGlyphId = nGlyphIndex & 0x00FFFFFF; - const sal_uInt32 nBytes = maRawBitmap.mnScanlineSize * maRawBitmap.mnHeight; + const sal_uIntPtr nBytes = maRawBitmap.mnScanlineSize * maRawBitmap.mnHeight; XRenderPeer::GetInstance().AddGlyph( aGlyphSet, aGlyphId, aGlyphInfo, (char*)maRawBitmap.mpBits, nBytes ); mnBytesUsed += nBytes; diff --git a/vcl/unx/source/gdi/pspgraphics.cxx b/vcl/unx/source/gdi/pspgraphics.cxx index c7727dade852..57cbca3f1ae8 100644 --- a/vcl/unx/source/gdi/pspgraphics.cxx +++ b/vcl/unx/source/gdi/pspgraphics.cxx @@ -293,7 +293,7 @@ void PspGraphics::ResetClipRegion() m_pPrinterGfx->ResetClipRegion (); } -void PspGraphics::BeginSetClipRegion( sal_uInt32 n ) +void PspGraphics::BeginSetClipRegion( sal_uIntPtr n ) { m_pPrinterGfx->BeginSetClipRegion(n); } @@ -379,12 +379,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_uInt32 nPoints, const SalPoint *pPtAry ) +void PspGraphics::drawPolyLine( sal_uIntPtr nPoints, const SalPoint *pPtAry ) { m_pPrinterGfx->DrawPolyLine (nPoints, (Point*)pPtAry); } -void PspGraphics::drawPolygon( sal_uInt32 nPoints, const SalPoint* pPtAry ) +void PspGraphics::drawPolygon( sal_uIntPtr nPoints, const SalPoint* pPtAry ) { // Point must be equal to SalPoint! see vcl/inc/salgtype.hxx m_pPrinterGfx->DrawPolygon (nPoints, (Point*)pPtAry); @@ -409,13 +409,13 @@ bool PspGraphics::drawPolyLine( const basegfx::B2DPolygon&, double /*fTransparen return false; } -sal_Bool PspGraphics::drawPolyLineBezier( sal_uInt32 nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry ) +sal_Bool PspGraphics::drawPolyLineBezier( sal_uIntPtr nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry ) { m_pPrinterGfx->DrawPolyLineBezier (nPoints, (Point*)pPtAry, pFlgAry); return sal_True; } -sal_Bool PspGraphics::drawPolygonBezier( sal_uInt32 nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry ) +sal_Bool PspGraphics::drawPolygonBezier( sal_uIntPtr nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry ) { m_pPrinterGfx->DrawPolygonBezier (nPoints, (Point*)pPtAry, pFlgAry); return sal_True; @@ -431,13 +431,13 @@ sal_Bool PspGraphics::drawPolyPolygonBezier( sal_uInt32 nPoly, return sal_True; } -void PspGraphics::invert( sal_uInt32, +void PspGraphics::invert( sal_uIntPtr, 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_uInt32 nSize ) +sal_Bool PspGraphics::drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, sal_uIntPtr nSize ) { return m_pPrinterGfx->DrawEPS( Rectangle( Point( nX, nY ), Size( nWidth, nHeight ) ), pPtr, nSize ); } @@ -915,10 +915,10 @@ void PspGraphics::GetFontMetric( ImplFontMetricData *pMetric, int ) } } -sal_uInt32 PspGraphics::GetKernPairs( sal_uInt32 nPairs, ImplKernPairData *pKernPairs ) +sal_uInt32 PspGraphics::GetKernPairs( sal_uIntPtr nPairs, ImplKernPairData *pKernPairs ) { const ::std::list< ::psp::KernPair >& rPairs( m_pPrinterGfx->getKernPairs() ); - sal_uInt32 nHavePairs = rPairs.size(); + sal_uIntPtr nHavePairs = rPairs.size(); if( pKernPairs && nPairs ) { ::std::list< ::psp::KernPair >::const_iterator it; diff --git a/vcl/unx/source/gdi/salbmp.cxx b/vcl/unx/source/gdi/salbmp.cxx index 0b93333b91c3..5ddcd7d311b9 100644 --- a/vcl/unx/source/gdi/salbmp.cxx +++ b/vcl/unx/source/gdi/salbmp.cxx @@ -64,7 +64,7 @@ SalBitmap* X11SalInstance::CreateSalBitmap() } ImplSalBitmapCache* X11SalBitmap::mpCache = NULL; -sal_uInt32 X11SalBitmap::mnCacheInstCount = 0; +sal_uIntPtr X11SalBitmap::mnCacheInstCount = 0; // ----------------------------------------------------------------------------- @@ -214,7 +214,7 @@ BitmapBuffer* X11SalBitmap::ImplCreateDIB( Drawable aDrawable, { const SalTwoRect aTwoRect = { 0, 0, nWidth, nHeight, 0, 0, nWidth, nHeight }; BitmapBuffer aSrcBuf; - sal_uInt32 nDstFormat = BMP_FORMAT_BOTTOM_UP; + sal_uIntPtr nDstFormat = BMP_FORMAT_BOTTOM_UP; const BitmapPalette* pDstPal = NULL; aSrcBuf.mnFormat = BMP_FORMAT_TOP_DOWN; @@ -304,7 +304,7 @@ BitmapBuffer* X11SalBitmap::ImplCreateDIB( Drawable aDrawable, else if( aSrcBuf.mnBitCount <= 8 ) { const SalColormap& rColMap = pSalDisp->GetColormap( nScreen ); - const sal_uInt16 nCols = Min( (sal_uInt32)rColMap.GetUsed(), (sal_uInt32)(1 << nDrawableDepth) ); + const sal_uInt16 nCols = Min( (sal_uIntPtr)rColMap.GetUsed(), (sal_uIntPtr)(1 << nDrawableDepth) ); rPal.SetEntryCount( nCols ); pDstPal = &rPal; @@ -363,7 +363,7 @@ XImage* X11SalBitmap::ImplCreateXImage( SalDisplay *pSalDisp, int nScreen, long if( pImage ) { BitmapBuffer* pDstBuf; - sal_uInt32 nDstFormat = BMP_FORMAT_TOP_DOWN; + sal_uIntPtr nDstFormat = BMP_FORMAT_TOP_DOWN; BitmapPalette* pPal = NULL; ColorMask* pMask = NULL; @@ -430,7 +430,7 @@ XImage* X11SalBitmap::ImplCreateXImage( SalDisplay *pSalDisp, int nScreen, long else if( pImage->depth <= 8 ) { const SalColormap& rColMap = pSalDisp->GetColormap( nScreen ); - const sal_uInt16 nCols = Min( (sal_uInt32)rColMap.GetUsed(), (sal_uInt32)(1 << pImage->depth) ); + const sal_uInt16 nCols = Min( (sal_uIntPtr)rColMap.GetUsed(), (sal_uIntPtr)(1 << pImage->depth) ); pPal = new BitmapPalette( nCols ); @@ -1018,10 +1018,10 @@ void ImplSalDDB::ImplDraw( Drawable aSrcDrawable, long nSrcDrawableDepth, struct ImplBmpObj { X11SalBitmap* mpBmp; - sal_uInt32 mnMemSize; - sal_uInt32 mnFlags; + sal_uIntPtr mnMemSize; + sal_uIntPtr mnFlags; - ImplBmpObj( X11SalBitmap* pBmp, sal_uInt32 nMemSize, sal_uInt32 nFlags ) : + ImplBmpObj( X11SalBitmap* pBmp, sal_uIntPtr nMemSize, sal_uIntPtr nFlags ) : mpBmp( pBmp ), mnMemSize( nMemSize ), mnFlags( nFlags ) {} }; @@ -1041,7 +1041,7 @@ ImplSalBitmapCache::~ImplSalBitmapCache() // ----------------------------------------------------------------------------- -void ImplSalBitmapCache::ImplAdd( X11SalBitmap* pBmp, sal_uInt32 nMemSize, sal_uInt32 nFlags ) +void ImplSalBitmapCache::ImplAdd( X11SalBitmap* pBmp, sal_uIntPtr nMemSize, sal_uIntPtr nFlags ) { ImplBmpObj* pObj; bool bFound = sal_False; diff --git a/vcl/unx/source/gdi/salgdi.cxx b/vcl/unx/source/gdi/salgdi.cxx index 3802f4f394ac..1b350e3460b8 100644 --- a/vcl/unx/source/gdi/salgdi.cxx +++ b/vcl/unx/source/gdi/salgdi.cxx @@ -67,21 +67,21 @@ class SalPolyLine XPoint Points_[STATIC_POINTS]; XPoint *pFirst_; public: - inline SalPolyLine( sal_uInt32 nPoints ); - inline SalPolyLine( sal_uInt32 nPoints, const SalPoint *p ); + inline SalPolyLine( sal_uIntPtr nPoints ); + inline SalPolyLine( sal_uIntPtr nPoints, const SalPoint *p ); inline ~SalPolyLine(); - inline XPoint &operator [] ( sal_uInt32 n ) const + inline XPoint &operator [] ( sal_uIntPtr n ) const { return pFirst_[n]; } }; -inline SalPolyLine::SalPolyLine( sal_uInt32 nPoints ) +inline SalPolyLine::SalPolyLine( sal_uIntPtr nPoints ) : pFirst_( nPoints+1 > STATIC_POINTS ? new XPoint[nPoints+1] : Points_ ) {} -inline SalPolyLine::SalPolyLine( sal_uInt32 nPoints, const SalPoint *p ) +inline SalPolyLine::SalPolyLine( sal_uIntPtr nPoints, const SalPoint *p ) : pFirst_( nPoints+1 > STATIC_POINTS ? new XPoint[nPoints+1] : Points_ ) { - for( sal_uInt32 i = 0; i < nPoints; i++ ) + for( sal_uIntPtr i = 0; i < nPoints; i++ ) { pFirst_[i].x = (short)p[i].mnX; pFirst_[i].y = (short)p[i].mnY; @@ -398,19 +398,19 @@ GC X11SalGraphics::GetTrackingGC() } // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= -void X11SalGraphics::DrawLines( sal_uInt32 nPoints, +void X11SalGraphics::DrawLines( sal_uIntPtr nPoints, const SalPolyLine &rPoints, GC pGC, bool bClose ) { // errechne wie viele Linien XWindow auf einmal zeichnen kann - sal_uInt32 nMaxLines = (GetDisplay()->GetMaxRequestSize() - sizeof(xPolyPointReq)) + sal_uIntPtr nMaxLines = (GetDisplay()->GetMaxRequestSize() - sizeof(xPolyPointReq)) / sizeof(xPoint); if( nMaxLines > nPoints ) nMaxLines = nPoints; // gebe alle Linien aus, die XWindows zeichnen kann. - sal_uInt32 n; + sal_uIntPtr n; for( n = 0; nPoints - n > nMaxLines; n += nMaxLines - 1 ) XDrawLines( GetXDisplay(), GetDrawable(), @@ -597,7 +597,7 @@ void X11SalGraphics::ResetClipRegion() } // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= -void X11SalGraphics::BeginSetClipRegion( sal_uInt32 ) +void X11SalGraphics::BeginSetClipRegion( sal_uIntPtr ) { if( pClipRegion_ ) XDestroyRegion( pClipRegion_ ); @@ -839,13 +839,13 @@ void X11SalGraphics::drawRect( long nX, long nY, long nDX, long nDY ) } // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= -void X11SalGraphics::drawPolyLine( sal_uInt32 nPoints, const SalPoint *pPtAry ) +void X11SalGraphics::drawPolyLine( sal_uIntPtr nPoints, const SalPoint *pPtAry ) { drawPolyLine( nPoints, pPtAry, false ); } // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= -void X11SalGraphics::drawPolyLine( sal_uInt32 nPoints, const SalPoint *pPtAry, bool bClose ) +void X11SalGraphics::drawPolyLine( sal_uIntPtr nPoints, const SalPoint *pPtAry, bool bClose ) { if( nPenColor_ != 0xFFFFFFFF ) { @@ -856,7 +856,7 @@ void X11SalGraphics::drawPolyLine( sal_uInt32 nPoints, const SalPoint *pPtAry, b } // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= -void X11SalGraphics::drawPolygon( sal_uInt32 nPoints, const SalPoint* pPtAry ) +void X11SalGraphics::drawPolygon( sal_uIntPtr nPoints, const SalPoint* pPtAry ) { if( nPoints == 0 ) return; @@ -972,14 +972,14 @@ void X11SalGraphics::drawPolyPolygon( sal_uInt32 nPoly, // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= -sal_Bool X11SalGraphics::drawPolyLineBezier( sal_uInt32, const SalPoint*, const BYTE* ) +sal_Bool X11SalGraphics::drawPolyLineBezier( sal_uIntPtr, const SalPoint*, const BYTE* ) { return sal_False; } // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= -sal_Bool X11SalGraphics::drawPolygonBezier( sal_uInt32, const SalPoint*, const BYTE* ) +sal_Bool X11SalGraphics::drawPolygonBezier( sal_uIntPtr, const SalPoint*, const BYTE* ) { return sal_False; } @@ -994,7 +994,7 @@ sal_Bool X11SalGraphics::drawPolyPolygonBezier( sal_uInt32, const sal_uInt32*, // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= -void X11SalGraphics::invert( sal_uInt32 nPoints, +void X11SalGraphics::invert( sal_uIntPtr nPoints, const SalPoint* pPtAry, SalInvert nFlags ) { @@ -1021,7 +1021,7 @@ void X11SalGraphics::invert( sal_uInt32 nPoints, // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= -BOOL X11SalGraphics::drawEPS( long,long,long,long,void*,sal_uInt32 ) +BOOL X11SalGraphics::drawEPS( long,long,long,long,void*,sal_uIntPtr ) { return sal_False; } diff --git a/vcl/unx/source/gdi/salgdi3.cxx b/vcl/unx/source/gdi/salgdi3.cxx index e570e0e02bc6..a80f9e7ef011 100644 --- a/vcl/unx/source/gdi/salgdi3.cxx +++ b/vcl/unx/source/gdi/salgdi3.cxx @@ -1777,14 +1777,14 @@ X11SalGraphics::GetFontMetric( ImplFontMetricData *pMetric, int nFallbackLevel ) // --------------------------------------------------------------------------- sal_uInt32 -X11SalGraphics::GetKernPairs( sal_uInt32 nPairs, ImplKernPairData *pKernPairs ) +X11SalGraphics::GetKernPairs( sal_uIntPtr nPairs, ImplKernPairData *pKernPairs ) { if( ! bPrinter_ ) { if( mpServerFont[0] != NULL ) { ImplKernPairData* pTmpKernPairs; - sal_uInt32 nGotPairs = mpServerFont[0]->GetKernPairs( &pTmpKernPairs ); + sal_uIntPtr nGotPairs = mpServerFont[0]->GetKernPairs( &pTmpKernPairs ); for( unsigned int i = 0; i < nPairs && i < nGotPairs; ++i ) pKernPairs[ i ] = pTmpKernPairs[ i ]; delete[] pTmpKernPairs; diff --git a/vcl/unx/source/gdi/salprnpsp.cxx b/vcl/unx/source/gdi/salprnpsp.cxx index c8a0f6532133..35d01e7cb5ca 100644 --- a/vcl/unx/source/gdi/salprnpsp.cxx +++ b/vcl/unx/source/gdi/salprnpsp.cxx @@ -662,7 +662,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_uInt32 nSetDataFlags, + sal_uIntPtr nSetDataFlags, ImplJobSetup* pJobSetup ) { JobData aData; @@ -823,7 +823,7 @@ void PspSalInfoPrinter::GetPageInfo( // ----------------------------------------------------------------------- -sal_uInt32 PspSalInfoPrinter::GetPaperBinCount( const ImplJobSetup* pJobSetup ) +sal_uIntPtr PspSalInfoPrinter::GetPaperBinCount( const ImplJobSetup* pJobSetup ) { if( ! pJobSetup ) return 0; @@ -837,7 +837,7 @@ sal_uInt32 PspSalInfoPrinter::GetPaperBinCount( const ImplJobSetup* pJobSetup ) // ----------------------------------------------------------------------- -String PspSalInfoPrinter::GetPaperBinName( const ImplJobSetup* pJobSetup, sal_uInt32 nPaperBin ) +String PspSalInfoPrinter::GetPaperBinName( const ImplJobSetup* pJobSetup, sal_uIntPtr nPaperBin ) { JobData aData; JobData::constructFromStreamBuffer( pJobSetup->mpDriverData, pJobSetup->mnDriverDataLen, aData ); @@ -846,7 +846,7 @@ String PspSalInfoPrinter::GetPaperBinName( const ImplJobSetup* pJobSetup, sal_uI if( aData.m_pParser ) { const PPDKey* pKey = aData.m_pParser ? aData.m_pParser->getKey( String( RTL_CONSTASCII_USTRINGPARAM( "InputSlot" ) ) ): NULL; - if( ! pKey || nPaperBin >= (sal_uInt32)pKey->countValues() ) + if( ! pKey || nPaperBin >= (sal_uIntPtr)pKey->countValues() ) aRet = aData.m_pParser->getDefaultInputSlot(); else { @@ -861,7 +861,7 @@ String PspSalInfoPrinter::GetPaperBinName( const ImplJobSetup* pJobSetup, sal_uI // ----------------------------------------------------------------------- -sal_uInt32 PspSalInfoPrinter::GetCapabilities( const ImplJobSetup* pJobSetup, sal_uInt16 nType ) +sal_uIntPtr PspSalInfoPrinter::GetCapabilities( const ImplJobSetup* pJobSetup, sal_uInt16 nType ) { switch( nType ) { @@ -959,7 +959,7 @@ sal_Bool PspSalPrinter::StartJob( const XubString* pFileName, const XubString& rJobName, const XubString& rAppName, - sal_uInt32 nCopies, + sal_uIntPtr nCopies, bool bCollate, bool bDirect, ImplJobSetup* pJobSetup ) @@ -1111,7 +1111,7 @@ sal_Bool PspSalPrinter::EndPage() // ----------------------------------------------------------------------- -sal_uInt32 PspSalPrinter::GetErrorCode() +sal_uIntPtr PspSalPrinter::GetErrorCode() { return 0; } diff --git a/vcl/unx/source/window/salframe.cxx b/vcl/unx/source/window/salframe.cxx index 0e0c5f6c03c7..64ea220a6cde 100644 --- a/vcl/unx/source/window/salframe.cxx +++ b/vcl/unx/source/window/salframe.cxx @@ -209,7 +209,7 @@ void X11SalFrame::askForXEmbedFocus( sal_Int32 i_nTimeCode ) // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= -void X11SalFrame::Init( sal_uInt32 nSalFrameStyle, int nScreen, SystemParentData* pParentData, bool bUseGeometry ) +void X11SalFrame::Init( sal_uIntPtr nSalFrameStyle, int nScreen, SystemParentData* pParentData, bool bUseGeometry ) { if( nScreen < 0 || nScreen >= GetDisplay()->GetScreenCount() ) nScreen = GetDisplay()->GetDefaultScreenNumber(); @@ -645,7 +645,7 @@ void X11SalFrame::Init( sal_uInt32 nSalFrameStyle, int nScreen, SystemParentData } // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= -X11SalFrame::X11SalFrame( SalFrame *pParent, sal_uInt32 nSalFrameStyle, SystemParentData* pSystemParent ) +X11SalFrame::X11SalFrame( SalFrame *pParent, sal_uIntPtr nSalFrameStyle, SystemParentData* pSystemParent ) { X11SalData* pSalData = GetX11SalData(); @@ -3062,7 +3062,7 @@ long X11SalFrame::HandleMouseEvent( XEvent *pEvent ) if( pEvent->type == ButtonRelease ) return 0; - static sal_uInt32 nLines = 0; + static sal_uIntPtr nLines = 0; if( ! nLines ) { char* pEnv = getenv( "SAL_WHEELLINES" ); @@ -3600,7 +3600,7 @@ long X11SalFrame::HandleFocusEvent( XFocusChangeEvent *pEvent ) if ((mpParent != NULL && nStyle_ == 0) && pSVData->maWinData.mpFirstFloat ) { - sal_uInt32 nMode = pSVData->maWinData.mpFirstFloat->GetPopupModeFlags(); + sal_uIntPtr nMode = pSVData->maWinData.mpFirstFloat->GetPopupModeFlags(); pSVData->maWinData.mpFirstFloat->SetPopupModeFlags( nMode & ~(FLOATWIN_POPUPMODE_NOAPPFOCUSCLOSE)); } @@ -4477,7 +4477,7 @@ void X11SalFrame::ResetClipRegion() op, ordering ); } -void X11SalFrame::BeginSetClipRegion( sal_uInt32 nRects ) +void X11SalFrame::BeginSetClipRegion( sal_uIntPtr nRects ) { if( m_pClipRectangles ) delete [] m_pClipRectangles; diff --git a/vcl/unx/source/window/salobj.cxx b/vcl/unx/source/window/salobj.cxx index 730eab142415..782b4aae897f 100644 --- a/vcl/unx/source/window/salobj.cxx +++ b/vcl/unx/source/window/salobj.cxx @@ -219,7 +219,7 @@ SalClipRegion::~SalClipRegion() void -SalClipRegion::BeginSetClipRegion( sal_uInt32 nRects ) +SalClipRegion::BeginSetClipRegion( sal_uIntPtr nRects ) { if (ClipRectangleList) delete [] ClipRectangleList; @@ -324,7 +324,7 @@ X11SalObject::ResetClipRegion() void -X11SalObject::BeginSetClipRegion( sal_uInt32 nRectCount ) +X11SalObject::BeginSetClipRegion( sal_uIntPtr nRectCount ) { maClipRegion.BeginSetClipRegion ( nRectCount ); } |