1 files changed, 20 insertions, 20 deletions

diff --git a/vcl/source/window/scrwnd.cxx b/vcl/source/window/scrwnd.cxx
index ab4068ac6e3d..588f4d4fa1fa 100644
--- a/vcl/source/window/scrwnd.cxx
+++ b/vcl/source/window/scrwnd.cxx
@@ -69,12 +69,12 @@ ImplWheelWindow::ImplWheelWindow( Window* pParent ) :
     DBG_ASSERT( pParent, "ImplWheelWindow::ImplWheelWindow(): Parent not set!" );
 
     const Size      aSize( pParent->GetOutputSizePixel() );
-    const USHORT    nFlags = ImplGetSVData()->maWinData.mnAutoScrollFlags;
-    const BOOL      bHorz = ( nFlags & AUTOSCROLL_HORZ ) != 0;
-    const BOOL      bVert = ( nFlags & AUTOSCROLL_VERT ) != 0;
+    const sal_uInt16    nFlags = ImplGetSVData()->maWinData.mnAutoScrollFlags;
+    const sal_Bool      bHorz = ( nFlags & AUTOSCROLL_HORZ ) != 0;
+    const sal_Bool      bVert = ( nFlags & AUTOSCROLL_VERT ) != 0;
 
     // calculate maximum speed distance
-    mnMaxWidth = (ULONG) ( 0.4 * hypot( (double) aSize.Width(), aSize.Height() ) );
+    mnMaxWidth = (sal_uLong) ( 0.4 * hypot( (double) aSize.Width(), aSize.Height() ) );
 
     // create wheel window
     SetTitleType( FLOATWIN_TITLE_NONE );
@@ -116,7 +116,7 @@ void ImplWheelWindow::ImplStop()
 {
     ReleaseMouse();
     mpTimer->Stop();
-    Show(FALSE);
+    Show(sal_False);
 }
 
 // ------------------------------------------------------------------------
@@ -148,7 +148,7 @@ void ImplWheelWindow::ImplCreateImageList()
 
 // ------------------------------------------------------------------------
 
-void ImplWheelWindow::ImplSetWheelMode( ULONG nWheelMode )
+void ImplWheelWindow::ImplSetWheelMode( sal_uLong nWheelMode )
 {
     if( nWheelMode != mnWheelMode )
     {
@@ -173,7 +173,7 @@ void ImplWheelWindow::ImplSetWheelMode( ULONG nWheelMode )
 
 void ImplWheelWindow::ImplDrawWheel()
 {
-    USHORT nId;
+    sal_uInt16 nId;
 
     switch( mnWheelMode )
     {
@@ -201,13 +201,13 @@ void ImplWheelWindow::ImplRecalcScrollValues()
     }
     else
     {
-        ULONG nCurTime;
+        sal_uLong nCurTime;
 
         // calc current time
         if( mnMaxWidth )
         {
             const double fExp = ( (double) mnActDist / mnMaxWidth ) * log10( (double) MAX_TIME / MIN_TIME );
-            nCurTime = (ULONG) ( MAX_TIME / pow( 10., fExp ) );
+            nCurTime = (sal_uLong) ( MAX_TIME / pow( 10., fExp ) );
         }
         else
             nCurTime = MAX_TIME;
@@ -251,9 +251,9 @@ void ImplWheelWindow::ImplRecalcScrollValues()
 PointerStyle ImplWheelWindow::ImplGetMousePointer( long nDistX, long nDistY )
 {
     PointerStyle    eStyle;
-    const USHORT    nFlags = ImplGetSVData()->maWinData.mnAutoScrollFlags;
-    const BOOL      bHorz = ( nFlags & AUTOSCROLL_HORZ ) != 0;
-    const BOOL      bVert = ( nFlags & AUTOSCROLL_VERT ) != 0;
+    const sal_uInt16    nFlags = ImplGetSVData()->maWinData.mnAutoScrollFlags;
+    const sal_Bool      bHorz = ( nFlags & AUTOSCROLL_HORZ ) != 0;
+    const sal_Bool      bVert = ( nFlags & AUTOSCROLL_VERT ) != 0;
 
     if( bHorz || bVert )
     {
@@ -331,13 +331,13 @@ void ImplWheelWindow::MouseMove( const MouseEvent& rMEvt )
     const long  nDistX = aMousePos.X() - maCenter.X();
     const long  nDistY = aMousePos.Y() - maCenter.Y();
 
-    mnActDist = (ULONG) hypot( (double) nDistX, nDistY );
+    mnActDist = (sal_uLong) hypot( (double) nDistX, nDistY );
 
     const PointerStyle  eActStyle = ImplGetMousePointer( nDistX, nDistY );
-    const USHORT        nFlags = ImplGetSVData()->maWinData.mnAutoScrollFlags;
-    const BOOL          bHorz = ( nFlags & AUTOSCROLL_HORZ ) != 0;
-    const BOOL          bVert = ( nFlags & AUTOSCROLL_VERT ) != 0;
-    const BOOL          bOuter = mnActDist > WHEEL_RADIUS;
+    const sal_uInt16        nFlags = ImplGetSVData()->maWinData.mnAutoScrollFlags;
+    const sal_Bool          bHorz = ( nFlags & AUTOSCROLL_HORZ ) != 0;
+    const sal_Bool          bVert = ( nFlags & AUTOSCROLL_VERT ) != 0;
+    const sal_Bool          bOuter = mnActDist > WHEEL_RADIUS;
 
     if( bOuter && ( maLastMousePos != aMousePos ) )
     {
@@ -389,17 +389,17 @@ IMPL_LINK( ImplWheelWindow, ImplScrollHdl, Timer*, EMPTYARG )
         const Point         aMousePos( pWindow->OutputToScreenPixel( pWindow->GetPointerPosPixel() ) );
         Point               aCmdMousePos( pWindow->ImplFrameToOutput( aMousePos ) );
         CommandScrollData   aScrollData( mnActDeltaX, mnActDeltaY );
-        CommandEvent        aCEvt( aCmdMousePos, COMMAND_AUTOSCROLL, TRUE, &aScrollData );
+        CommandEvent        aCEvt( aCmdMousePos, COMMAND_AUTOSCROLL, sal_True, &aScrollData );
         NotifyEvent         aNCmdEvt( EVENT_COMMAND, pWindow, &aCEvt );
 
         if ( !ImplCallPreNotify( aNCmdEvt ) )
         {
-            const ULONG nTime = Time::GetSystemTicks();
+            const sal_uLong nTime = Time::GetSystemTicks();
             ImplDelData aDel( this );
             pWindow->Command( aCEvt );
             if( aDel.IsDead() )
                 return 0;
-            mnRepaintTime = Max( Time::GetSystemTicks() - nTime, (ULONG)1 );
+            mnRepaintTime = Max( Time::GetSystemTicks() - nTime, (sal_uLong)1 );
             ImplRecalcScrollValues();
         }
     }