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/inc/saldisp.hxx | |
parent | removetooltypes01: #i112600# Use correct conversion for ULONG => sal_uIntPtr (diff) | |
download | core-322a75edf8bad6616b1543a6b81972f4c3765ee2.tar.gz core-322a75edf8bad6616b1543a6b81972f4c3765ee2.zip |
removetootypes01: #i112600# Use correct conversion ULONG => sal_uIntPtr
Diffstat (limited to 'vcl/unx/inc/saldisp.hxx')
-rw-r--r-- | vcl/unx/inc/saldisp.hxx | 12 |
1 files changed, 6 insertions, 6 deletions
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; |