1 files changed, 15 insertions, 15 deletions

diff --git a/vcl/unx/headless/svpinst.cxx b/vcl/unx/headless/svpinst.cxx
index d53ed5cf202d..ebd0ee457bd5 100644
--- a/vcl/unx/headless/svpinst.cxx
+++ b/vcl/unx/headless/svpinst.cxx
@@ -124,7 +124,7 @@ SvpSalInstance::~SvpSalInstance()
     osl_destroyMutex( m_aEventGuard );
 }
 
-void SvpSalInstance::PostEvent( const SalFrame* pFrame, void* pData, USHORT nEvent )
+void SvpSalInstance::PostEvent( const SalFrame* pFrame, void* pData, sal_uInt16 nEvent )
 {
     if( osl_acquireMutex( m_aEventGuard ) )
     {
@@ -134,7 +134,7 @@ void SvpSalInstance::PostEvent( const SalFrame* pFrame, void* pData, USHORT nEve
     Wakeup();
 }
 
-void SvpSalInstance::CancelEvent( const SalFrame* pFrame, void* pData, USHORT nEvent )
+void SvpSalInstance::CancelEvent( const SalFrame* pFrame, void* pData, sal_uInt16 nEvent )
 {
     if( osl_acquireMutex( m_aEventGuard ) )
     {
@@ -194,7 +194,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, ULONG t2 )
+inline timeval &operator += ( timeval &t1, sal_uLong t2 )
 {
     t1.tv_sec  += t2 / 1000;
     t1.tv_usec += t2 ? (t2 % 1000) * 1000 : 500;
@@ -237,12 +237,12 @@ bool SvpSalInstance::CheckTimeout( bool bExecuteTimers )
     return bRet;
 }
 
-SalFrame* SvpSalInstance::CreateChildFrame( SystemParentData* pParent, ULONG nStyle )
+SalFrame* SvpSalInstance::CreateChildFrame( SystemParentData* pParent, sal_uLong nStyle )
 {
     return new SvpSalFrame( this, NULL, nStyle, pParent );
 }
 
-SalFrame* SvpSalInstance::CreateFrame( SalFrame* pParent, ULONG nStyle )
+SalFrame* SvpSalInstance::CreateFrame( SalFrame* pParent, sal_uLong nStyle )
 {
     return new SvpSalFrame( this, pParent, nStyle );
 }
@@ -252,7 +252,7 @@ void SvpSalInstance::DestroyFrame( SalFrame* pFrame )
     delete pFrame;
 }
 
-SalObject* SvpSalInstance::CreateObject( SalFrame*, SystemWindowData*, BOOL )
+SalObject* SvpSalInstance::CreateObject( SalFrame*, SystemWindowData*, sal_Bool )
 {
     return new SvpSalObject();
 }
@@ -264,7 +264,7 @@ void SvpSalInstance::DestroyObject( SalObject* pObject )
 
 SalVirtualDevice* SvpSalInstance::CreateVirtualDevice( SalGraphics*,
                                                        long nDX, long nDY,
-                                                       USHORT nBitCount, const SystemGraphicsData* )
+                                                       sal_uInt16 nBitCount, const SystemGraphicsData* )
 {
     SvpSalVirtualDevice* pNew = new SvpSalVirtualDevice( nBitCount );
     pNew->SetSize( nDX, nDY );
@@ -301,13 +301,13 @@ vos::IMutex* SvpSalInstance::GetYieldMutex()
     return &m_aYieldMutex;
 }
 
-ULONG SvpSalInstance::ReleaseYieldMutex()
+sal_uLong SvpSalInstance::ReleaseYieldMutex()
 {
     if ( m_aYieldMutex.GetThreadId() ==
          vos::OThread::getCurrentIdentifier() )
     {
-        ULONG nCount = m_aYieldMutex.GetAcquireCount();
-        ULONG n = nCount;
+        sal_uLong nCount = m_aYieldMutex.GetAcquireCount();
+        sal_uLong n = nCount;
         while ( n )
         {
             m_aYieldMutex.release();
@@ -320,7 +320,7 @@ ULONG SvpSalInstance::ReleaseYieldMutex()
         return 0;
 }
 
-void SvpSalInstance::AcquireYieldMutex( ULONG nCount )
+void SvpSalInstance::AcquireYieldMutex( sal_uLong nCount )
 {
     while ( nCount )
     {
@@ -348,7 +348,7 @@ void SvpSalInstance::Yield( bool bWait, bool bHandleAllCurrentEvents )
 
     // release yield mutex
     std::list< SalUserEvent > aEvents;
-    ULONG nAcquireCount = ReleaseYieldMutex();
+    sal_uLong nAcquireCount = ReleaseYieldMutex();
     if( osl_acquireMutex( m_aEventGuard ) )
     {
         if( ! m_aUserEvents.empty() )
@@ -427,7 +427,7 @@ void SvpSalInstance::Yield( bool bWait, bool bHandleAllCurrentEvents )
     }
 }
 
-bool SvpSalInstance::AnyInput( USHORT nType )
+bool SvpSalInstance::AnyInput( sal_uInt16 nType )
 {
     if( (nType & INPUT_TIMER) != 0 )
         return CheckTimeout( false );
@@ -499,7 +499,7 @@ void SvpSalInstance::StopTimer()
     m_nTimeoutMS        = 0;
 }
 
-void SvpSalInstance::StartTimer( ULONG nMS )
+void SvpSalInstance::StartTimer( sal_uLong nMS )
 {
     timeval Timeout (m_aTimeout); // previous timeout.
     gettimeofday (&m_aTimeout, 0);
@@ -527,7 +527,7 @@ void SvpSalTimer::Stop()
     m_pInstance->StopTimer();
 }
 
-void SvpSalTimer::Start( ULONG nMS )
+void SvpSalTimer::Start( sal_uLong nMS )
 {
     m_pInstance->StartTimer( nMS );
 }