diff options
Diffstat (limited to 'vcl/unx/source/app')
-rw-r--r-- | vcl/unx/source/app/i18n_status.cxx | 2 | ||||
-rw-r--r-- | vcl/unx/source/app/salinst.cxx | 12 | ||||
-rw-r--r-- | vcl/unx/source/app/saltimer.cxx | 4 |
3 files changed, 9 insertions, 9 deletions
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 ); } |